Merge "[SDNC] Change sdnc to single startup script solution"

diff --combined kubernetes/sdnc/templates/statefulset.yaml
index 137d94f,80ca6a4..98ad43e
--- 1/kubernetes/sdnc/templates/statefulset.yaml
--- 2/kubernetes/sdnc/templates/statefulset.yaml
+++ b/kubernetes/sdnc/templates/statefulset.yaml
@@@ -62,11 -62,6 +62,11 @@@ spec
            {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "db-secret" "key" "login") | indent 10 }}
          - name: SDNC_DB_PASSWORD
            {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "db-secret" "key" "password") | indent 10 }}
 +        - name: ODL_ADMIN_USERNAME
 +          {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "odl-creds" "key" "login") | indent 10 }}
 +        - name: ODL_ADMIN_PASSWORD
 +          {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "odl-creds" "key" "password") | indent 10 }}
 +
          volumeMounts:
          - mountPath: /config-input
            name: config-input
@@@ -159,13 -154,8 +159,8 @@@
          - name: {{ include "common.name" . }}
            image: "{{ include "common.repository" . }}/{{ .Values.image }}"
            imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-           {{- if not .Values.config.sdnr.enabled }}
            command: ["/bin/bash"]
            args: ["-c", "/opt/onap/sdnc/bin/startODL.sh"]
-           {{ else }}
-           command: ["/bin/bash"]
-           args: ["-c", "{{ .Values.config.binDir }}/startODL.oom.sh"]
-           {{ end }}
            ports:
            - containerPort: {{ .Values.service.internalPort }}
            - containerPort: {{ .Values.service.internalPort2 }}
@@@ -235,12 -225,6 +230,6 @@@
            - mountPath: /opt/opendaylight/current/etc/org.ops4j.pax.logging.cfg
              name: sdnc-logging-cfg-config
              subPath: org.ops4j.pax.logging.cfg
-           - mountPath: {{ .Values.config.binDir }}/startODL.sh
-             name: bin
-             subPath: startODL.sh
-           - mountPath: {{ .Values.config.binDir }}/startODL.oom.sh
-             name: bin
-             subPath: startODL.oom.sh
            - mountPath: {{ .Values.config.binDir }}/installSdncDb.sh
              name: bin
              subPath: installSdncDb.sh

diff --combined kubernetes/sdnc/values.yaml
index 9554d82,09d469b..4ba41f1
--- 1/kubernetes/sdnc/values.yaml
--- 2/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@@ -39,7 -39,7 +39,7 @@@ global
    cmpv2Enabled: true
    platform:
      certServiceClient:
 -      image: onap/org.onap.oom.platform.cert-service.oom-certservice-client:2.0.0
 +      image: onap/org.onap.oom.platform.cert-service.oom-certservice-client:2.1.0
        secret:
          name: oom-cert-service-client-tls-secret
          mountPath: /etc/onap/oom/certservice/certs/
@@@ -133,9 -133,10 +133,10 @@@ secrets
  # Application configuration defaults.
  #################################################################
  # application images
+ 
  repository: nexus3.onap.org:10001
  pullPolicy: Always
- image: onap/sdnc-image:2.0.2
+ image: onap/sdnc-image:2.0.3
  busyboxRepository: docker.io
  busyboxImage: busybox:1.30