Merge "[SDNC] Fix dependencies for SDNRONLY mode"

diff --combined kubernetes/sdnc/templates/statefulset.yaml
index 06b8649,0c932a8..fc584d8
--- 1/kubernetes/sdnc/templates/statefulset.yaml
--- 2/kubernetes/sdnc/templates/statefulset.yaml
+++ b/kubernetes/sdnc/templates/statefulset.yaml
@@@ -130,11 -130,11 +130,11 @@@ spec
          image: {{ include "repositoryGenerator.image.envsubst" . }}
          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
          name: {{ include "common.name" . }}-update-config
-       {{ if .Values.dgbuilder.enabled -}}
+       {{ if or .Values.dgbuilder.enabled .Values.config.sdnr.enabled -}}
        - command:
          - /app/ready.py
          args:
-         {{ if or .Values.dgbuilder.enabled .Values.config.sdnr.enabled -}}
+         {{ if .Values.dgbuilder.enabled -}}
          - --container-name
          - {{ include "common.mariadbService" . }}
          - --job-name
@@@ -200,8 -200,10 +200,10 @@@
              initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
              periodSeconds: {{ .Values.readiness.periodSeconds }}
            env:
+           {{ if and .Values.config.sdnr.enabled .Values.config.sdnr.sdnronly -}}
            - name: MYSQL_ROOT_PASSWORD
              {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "db-root-password" "key" "password") | indent 12 }}
+           {{ end -}}
            - name: ODL_ADMIN_USERNAME
              {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "odl-creds" "key" "login") | indent 12 }}
            - name: ODL_USER
@@@ -352,7 -354,7 +354,7 @@@
              subPath: blueprints-processor-adaptor.properties
            - mountPath: {{ .Values.persistence.mdsalPath }}
              name: {{ include "common.fullname" . }}-data
 -          - mountPath: /var/log/onap
 +          - mountPath: {{ .Values.log.path }}
              name: logs
            - mountPath: {{ .Values.config.odl.salConfigDir }}/{{ .Values.config.odl.salConfigVersion}}/sal-clustering-config-{{ .Values.config.odl.salConfigVersion}}-akkaconf.xml
              name: properties
@@@ -382,7 -384,17 +384,7 @@@
            {{ end }}
            resources: {{ include "common.resources" . | nindent 12 }}
          # side car containers
 -        - name: filebeat-onap
 -          image: {{ include "repositoryGenerator.image.logging" . }}
 -          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
 -          volumeMounts:
 -          - mountPath: /usr/share/filebeat/filebeat.yml
 -            name: filebeat-conf
 -            subPath: filebeat.yml
 -          - mountPath: /var/log/onap
 -            name: logs
 -          - mountPath: /usr/share/filebeat/data
 -            name: data-filebeat
 +        {{ include "common.log.sidecar" . | nindent 8 }}
        {{- if .Values.nodeSelector }}
        nodeSelector: {{ toYaml .Values.nodeSelector | nindent 8 }}
        {{- end }}
@@@ -398,7 -410,11 +400,7 @@@
              path: /etc/localtime
          - name: logs
            emptyDir: {}
 -        - name: data-filebeat
 -          emptyDir: {}
 -        - name: filebeat-conf
 -          configMap:
 -            name: {{ include "common.fullname" . }}-filebeat-configmap
 +        {{ include "common.log.volumes" . | nindent 8 }}
          - name: sdnc-logging-cfg-config
            configMap:
              name: {{ include "common.fullname" . }}-log-configmap