Merge "Bump version of readiness image"

diff --combined kubernetes/onap/values.yaml
index 9e593c2,a782cc6..973613b
--- 1/kubernetes/onap/values.yaml
--- 2/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@@ -46,20 -46,21 +46,25 @@@ global
    repositoryCred:
      user: docker
      password: docker
+   dockerHubRepository: docker.io
  
    # readiness check - temporary repo until images migrated to nexus3
    readinessRepository: oomk8s
-   readinessImage: readiness-check:2.0.2
+   readinessImage: readiness-check:2.2.1
+ 
+   # curl image
+   curlImage: curlimages/curl:7.69.1
+ 
    # logging agent - temporary repo until images migrated to nexus3
    loggingRepository: docker.elastic.co
  
    # image pull policy
    pullPolicy: Always
  
 +  # default clusterName
 +  # {{ template "common.fullname" . }}.{{ template "common.namespace" . }}.svc.{{ .Values.global.clusterName }}
 +  clusterName: cluster.local
 +
    # default mount path root directory referenced
    # by persistent volumes and log files
    persistence:
@@@ -103,11 -104,6 +108,11 @@@
    # if set this element will force or not tls even if serviceMesh.tls is set.
    # tlsEnabled: false
  
 +  # Logging
 +  # Currently, centralized logging is not in best shape so it's disabled by
 +  # default
 +  centralizedLoggingEnabled: &centralizedLogging false
 +
  
  # Example of specific for the components where you want to disable TLS only for
  # it:
@@@ -147,7 -143,7 +152,7 @@@
  # to customize the ONAP deployment.
  #################################################################
  aaf:
 -  enabled: true
 +  enabled: false
  aai:
    enabled: false
  appc:
@@@ -185,11 -181,8 +190,11 @@@ dmaap
    enabled: false
  esr:
    enabled: false
 +# Today, "logging" chart that perform the central part of logging must also be
 +# enabled in order to make it work. So `logging.enabled` must have the same
 +# value than centralizedLoggingEnabled
  log:
 -  enabled: false
 +  enabled: *centralizedLogging
  sniro-emulator:
    enabled: false
  oof:

diff --combined kubernetes/oof/charts/oof-has/charts/oof-has-controller/templates/deployment.yaml
index 3dac478,b31d039..73c8e81
--- 1/kubernetes/oof/charts/oof-has/charts/oof-has-controller/templates/deployment.yaml
--- 2/kubernetes/oof/charts/oof-has/charts/oof-has-controller/templates/deployment.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-controller/templates/deployment.yaml
@@@ -37,7 -37,7 +37,7 @@@ spec
          - /root/ready.py
          args:
          - --container-name
 -        - music-tomcat
 +        - music-springboot
          - --container-name
          - aaf-sms
          env:
@@@ -80,7 -80,7 +80,7 @@@
              fieldRef:
                apiVersion: v1
                fieldPath: metadata.namespace
-         image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+         image: "{{ .Values.global.dockerHubRepository }}/{{ .Values.global.curlImage }}"
          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
        containers:
          - name: {{ include "common.name" . }}

diff --combined kubernetes/oof/charts/oof-has/charts/oof-has-data/templates/deployment.yaml
index 85fbd96,80992f1..054d181
--- 1/kubernetes/oof/charts/oof-has/charts/oof-has-data/templates/deployment.yaml
--- 2/kubernetes/oof/charts/oof-has/charts/oof-has-data/templates/deployment.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-data/templates/deployment.yaml
@@@ -37,7 -37,7 +37,7 @@@ spec
          - /root/ready.py
          args:
          - --container-name
 -        - music-tomcat
 +        - music-springboot
          env:
          - name: NAMESPACE
            valueFrom:
@@@ -93,7 -93,7 +93,7 @@@
              fieldRef:
                apiVersion: v1
                fieldPath: metadata.namespace
-         image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+         image: "{{ .Values.global.dockerHubRepository }}/{{ .Values.global.curlImage }}"
          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
  
        containers:
@@@ -132,11 -132,11 +132,11 @@@
              name: {{ .Values.global.commonConfigPrefix }}-config
              subPath: conductor.conf
            - mountPath: /usr/local/bin/log.conf
-             name: {{ .Values.global.commonConfigPrefix }}-config 
+             name: {{ .Values.global.commonConfigPrefix }}-config
              subPath: log.conf
            - mountPath: /usr/local/bin/healthy.sh
              name: {{ .Values.global.commonConfigPrefix }}-config
-             subPath: healthy.sh 
+             subPath: healthy.sh
            - mountPath: /usr/local/bin/aai_cert.cer
              name: {{ .Values.global.commonConfigPrefix }}-config
              subPath: aai_cert.cer
@@@ -169,7 -169,7 +169,7 @@@
              - key: log.conf
                path: log.conf
              - key: healthy.sh
-               path: healthy.sh 
+               path: healthy.sh
              - key: aai_cert.cer
                path: aai_cert.cer
              - key: aai_key.key

diff --combined kubernetes/oof/charts/oof-has/charts/oof-has-reservation/templates/deployment.yaml
index cb83643,4faf464..335ac4c
--- 1/kubernetes/oof/charts/oof-has/charts/oof-has-reservation/templates/deployment.yaml
--- 2/kubernetes/oof/charts/oof-has/charts/oof-has-reservation/templates/deployment.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-reservation/templates/deployment.yaml
@@@ -37,7 -37,7 +37,7 @@@ spec
          - /root/ready.py
          args:
          - --container-name
 -        - music-tomcat
 +        - music-springboot
          env:
          - name: NAMESPACE
            valueFrom:
@@@ -93,7 -93,7 +93,7 @@@
              fieldRef:
                apiVersion: v1
                fieldPath: metadata.namespace
-         image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+         image: "{{ .Values.global.dockerHubRepository }}/{{ .Values.global.curlImage }}"
          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
  
        containers:

diff --combined kubernetes/oof/charts/oof-has/charts/oof-has-solver/templates/deployment.yaml
index 858bf89,26380f6..4c2a345
--- 1/kubernetes/oof/charts/oof-has/charts/oof-has-solver/templates/deployment.yaml
--- 2/kubernetes/oof/charts/oof-has/charts/oof-has-solver/templates/deployment.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-solver/templates/deployment.yaml
@@@ -37,7 -37,7 +37,7 @@@ spec
          - /root/ready.py
          args:
          - --container-name
 -        - music-tomcat
 +        - music-springboot
          env:
          - name: NAMESPACE
            valueFrom:
@@@ -93,7 -93,7 +93,7 @@@
              fieldRef:
                apiVersion: v1
                fieldPath: metadata.namespace
-         image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+         image: "{{ .Values.global.dockerHubRepository }}/{{ .Values.global.curlImage }}"
          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
  
        containers: