Merge "[GENERAL] Use readiness container v3.0.1"

diff --combined kubernetes/cds/charts/cds-blueprints-processor/values.yaml
index 933c56d,8f65732..f1b00c0
--- 1/kubernetes/cds/charts/cds-blueprints-processor/values.yaml
--- 2/kubernetes/cds/charts/cds-blueprints-processor/values.yaml
+++ b/kubernetes/cds/charts/cds-blueprints-processor/values.yaml
@@@ -25,8 -25,7 +25,7 @@@ global
    repository: nexus3.onap.org:10001
  
    # readiness check
-   readinessRepository: oomk8s
-   readinessImage: readiness-check:2.0.0
+   readinessImage: onap/oom/readiness:3.0.1
  
    # image pull policy
    pullPolicy: Always
@@@ -159,15 -158,6 +158,15 @@@ ingress
    config:
      ssl: "none"
  
 +logback:
 +  rootLogLevel: INFO
 +  logger:
 +    springframework: INFO
 +    springframeworkWeb: INFO
 +    springframeworkSecurityWebauthentication: INFO
 +    hibernate: INFO
 +    onapCcsdkCds: INFO
 +
  resources: {}
    # We usually recommend not to specify default resources and to leave this as a conscious
    # choice for the user. This also increases chances charts run on environments with little

diff --combined kubernetes/cds/charts/cds-sdc-listener/values.yaml
index a5da627,afea8ea..50462bb
--- 1/kubernetes/cds/charts/cds-sdc-listener/values.yaml
--- 2/kubernetes/cds/charts/cds-sdc-listener/values.yaml
+++ b/kubernetes/cds/charts/cds-sdc-listener/values.yaml
@@@ -23,8 -23,7 +23,7 @@@ global
    repository: nexus3.onap.org:10001
  
    # readiness check
-   readinessRepository: oomk8s
-   readinessImage: readiness-check:2.0.0
+   readinessImage: onap/oom/readiness:3.0.1
  
    # image pull policy
    pullPolicy: Always
@@@ -80,15 -79,6 +79,15 @@@ persistence
  ingress:
    enabled: false
  
 +logback:
 +  rootLogLevel: INFO
 +  logger:
 +    springframework: INFO
 +    springframeworkWeb: INFO
 +    springframeworkSecurityWebauthentication: INFO
 +    hibernate: INFO
 +    onapCcsdkCds: INFO
 +
  resources: {}
    # We usually recommend not to specify default resources and to leave this as a conscious
    # choice for the user. This also increases chances charts run on environments with little

diff --combined kubernetes/sdnc/templates/sdnrdb-init-job.yaml
index d5d6383,007a797..aa156b5
--- 1/kubernetes/sdnc/templates/sdnrdb-init-job.yaml
--- 2/kubernetes/sdnc/templates/sdnrdb-init-job.yaml
+++ b/kubernetes/sdnc/templates/sdnrdb-init-job.yaml
@@@ -24,13 -24,13 +24,13 @@@ spec
        {{ include "common.certInitializer.initContainer" . | indent 6 }}
        {{ if .Values.global.aafEnabled }}
        - name: {{ include "common.name" . }}-chown
 -        image: "busybox"
 +        image: {{ .Values.global.busyboxRepository | default .Values.busyboxRepository }}/{{ .Values.global.busyboxImage | default .Values.busyboxImage }}
          command: ["sh", "-c", "chown -R {{ .Values.config.odlUid }}:{{ .Values.config.odlGid}} {{ .Values.certInitializer.credsPath }}"]
          volumeMounts: {{ include "common.certInitializer.volumeMount" . | nindent 10 }}
        {{ end }}
        - name: {{ include "common.name" . }}-readiness
          command:
-         - /root/ready.py
+         - /app/ready.py
          args:
          - --container-name
          - {{.Values.elasticsearch.nameOverride}}-elasticsearch
@@@ -44,7 -44,7 +44,7 @@@
              fieldRef:
                apiVersion: v1
                fieldPath: metadata.namespace
-         image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+         image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}"
          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
        containers:
        - name: {{ include "common.name" . }}-sdnrdb-init-job
@@@ -99,4 -99,4 +99,4 @@@
        imagePullSecrets:
        - name: "{{ include "common.namespace" . }}-docker-registry-key"
  
- {{ end -}}
+ {{ end -}}

diff --combined kubernetes/sdnc/templates/statefulset.yaml
index e5956c6,f20701b..d765197
--- 1/kubernetes/sdnc/templates/statefulset.yaml
--- 2/kubernetes/sdnc/templates/statefulset.yaml
+++ b/kubernetes/sdnc/templates/statefulset.yaml
@@@ -72,7 -72,7 +72,7 @@@ spec
          name: {{ include "common.name" . }}-update-config
        {{ if .Values.dgbuilder.enabled -}}
        - command:
-         - /root/ready.py
+         - /app/ready.py
          args:
          {{ if or .Values.dgbuilder.enabled .Values.config.sdnr.enabled -}}
          - --container-name
@@@ -88,14 -88,14 +88,14 @@@
              fieldRef:
                apiVersion: v1
                fieldPath: metadata.namespace
-         image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+         image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}"
          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
          name: {{ include "common.name" . }}-readiness
          {{ end -}}
  {{ include "common.certInitializer.initContainer" . | indent 6 }}
  
        - name: {{ include "common.name" . }}-chown
 -        image: "busybox"
 +        image: {{ .Values.global.busyboxRepository | default .Values.busyboxRepository }}/{{ .Values.global.busyboxImage | default .Values.busyboxImage }}
          command:
          - sh
          args:

diff --combined kubernetes/sdnc/values.yaml
index a84bfc2,44584fa..be4adf4
--- 1/kubernetes/sdnc/values.yaml
--- 2/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@@ -20,8 -20,7 +20,7 @@@ global
    nodePortPrefix: 302
    nodePortPrefixExt: 304
    repository: nexus3.onap.org:10001
-   readinessRepository: oomk8s
-   readinessImage: readiness-check:2.0.2
+   readinessImage: onap/oom/readiness:3.0.1
    loggingRepository: docker.elastic.co
    loggingImage: beats/filebeat:5.5.0
    persistence:
@@@ -112,8 -111,7 +111,8 @@@ secrets
  repository: nexus3.onap.org:10001
  pullPolicy: Always
  image: onap/sdnc-image:1.8.4
 -
 +busyboxRepository: docker.io
 +busyboxImage: busybox:1.30
  
  # flag to enable debugging - application support required
  debugEnabled: false

diff --combined kubernetes/so/charts/so-mariadb/templates/job.yaml
index f1081ad,838c10f..f24ec25
--- 1/kubernetes/so/charts/so-mariadb/templates/job.yaml
--- 2/kubernetes/so/charts/so-mariadb/templates/job.yaml
+++ b/kubernetes/so/charts/so-mariadb/templates/job.yaml
@@@ -51,7 -51,7 +51,7 @@@ spec
          command:
          - /bin/bash
          - -c
 -        - mysqldump -vv --user=${DB_USER} --password=${DB_PASS} --host=${DB_HOST} --port=${DB_PORT} --databases --single-transaction --quick --lock-tables=false catalogdb requestdb > /var/data/mariadb/backup-`date +%s`.sql
 +        - mysqldump -vv --user=${DB_USER} --password=${DB_PASS} --host=${DB_HOST} --port=${DB_PORT} --databases --single-transaction --quick --lock-tables=false catalogdb requestdb nfvo > /var/data/mariadb/backup-`date +%s`.sql
          volumeMounts:
          - mountPath: /etc/localtime
            name: localtime
@@@ -96,7 -96,7 +96,7 @@@ spec
        initContainers:
        - name: {{ include "common.name" . }}-readiness
          command:
-         - /root/ready.py
+         - /app/ready.py
          args:
          - --container-name
          - {{ .Values.global.mariadbGalera.nameOverride }}
@@@ -106,7 -106,7 +106,7 @@@
              fieldRef:
                apiVersion: v1
                fieldPath: metadata.namespace
-         image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+         image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}"
          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
        containers:
        - name: {{ include "common.name" . }}
@@@ -156,10 -156,6 +156,10 @@@
            {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "catalog-db-creds" "key" "login") | indent 10 }}
          - name: CATALOG_DB_PASSWORD
            {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "catalog-db-creds" "key" "password") | indent 10 }}
 +        - name: NFVO_DB_USER
 +          {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "nfvo-db-creds" "key" "login") | indent 10 }}
 +        - name: NFVO_DB_PASSWORD
 +          {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "nfvo-db-creds" "key" "password") | indent 10 }}
          volumeMounts:
          - mountPath: /etc/localtime
            name: localtime

diff --combined kubernetes/so/charts/so-mariadb/values.yaml
index 37f5f65,5bca4da..0a5a056
--- 1/kubernetes/so/charts/so-mariadb/values.yaml
--- 2/kubernetes/so/charts/so-mariadb/values.yaml
+++ b/kubernetes/so/charts/so-mariadb/values.yaml
@@@ -21,8 -21,7 +21,7 @@@ global
    nodePortPrefix: 302
    nodePortPrefixExt: 304
    repository: nexus3.onap.org:10001
-   readinessRepository: oomk8s
-   readinessImage: readiness-check:2.0.2
+   readinessImage: onap/oom/readiness:3.0.1
    ubuntuInitRepository: registry.hub.docker.com
  
  #################################################################
@@@ -71,11 -70,8 +70,11 @@@ secrets
      externalSecret: '{{ tpl (default "" .Values.db.catalog.dbCredsExternalSecret) . }}'
      login: '{{ .Values.db.catalog.userName }}'
      password: '{{ .Values.db.catalog.password }}'
 -
 -
 +  - uid: nfvo-db-creds
 +    type: basicAuth
 +    externalSecret: '{{ tpl (default "" .Values.db.nfvo.dbCredsExternalSecret) . }}'
 +    login: '{{ .Values.db.nfvo.userName }}'
 +    password: '{{ .Values.db.nfvo.password }}'
  
  #################################################################
  # Application configuration defaults.
@@@ -111,9 -107,6 +110,9 @@@ db
      userName: cataloguser
      password: catalog123
      # dbCredsExternalSecret: some secret
 +  nfvo:
 +    userName: nfvouser
 +    # dbCredsExternalSecret: some secret
  
  # application configuration
  config:

diff --combined kubernetes/so/values.yaml
index 2338bac,328f4f2..8d03786
--- 1/kubernetes/so/values.yaml
--- 2/kubernetes/so/values.yaml
+++ b/kubernetes/so/values.yaml
@@@ -18,8 -18,7 +18,7 @@@ global
    nodePortPrefix: 302
    nodePortPrefixExt: 304
    repository: nexus3.onap.org:10001
-   readinessRepository: oomk8s
-   readinessImage: readiness-check:2.0.2
+   readinessImage: onap/oom/readiness:3.0.1
    loggingRepository: docker.elastic.co
    loggingImage: beats/filebeat:5.5.0
    soBaseImage: onap/so/base-image:1.0
@@@ -450,17 -449,6 +449,17 @@@ so-vnfm-adapter
          apiEnforcement: org.onap.so.vnfmAdapterPerm
          noAuthn: /manage/health
  
 +so-etsi-nfvo-ns-lcm:
 +  certSecret: *so-certs
 +  aai:
 +    auth: 2A11B07DB6214A839394AA1EC5844695F5114FC407FF5422625FB00175A3DCB8A1FF745F22867EFA72D5369D599BBD88DA8BED4233CF5586
 +  mso:
 +    key: 07a7159d3bf51a0e53be7a8f89699be7
 +  so:
 +    sol003:
 +      adapter:
 +        auth: Basic dm5mbTpwYXNzd29yZDEk
 +
  so-mariadb:
    db:
      rootPasswordExternalSecretLocalDb: *dbRootPassSecretName