diff options
8 files changed, 39 insertions, 30 deletions
diff --git a/kubernetes/aaf/components/aaf-cert-service/values.yaml b/kubernetes/aaf/components/aaf-cert-service/values.yaml index ad4b7c459b..ee3beffd7f 100644 --- a/kubernetes/aaf/components/aaf-cert-service/values.yaml +++ b/kubernetes/aaf/components/aaf-cert-service/values.yaml @@ -47,7 +47,7 @@ service: # Deployment configuration repository: nexus3.onap.org:10001 -image: onap/org.onap.aaf.certservice.aaf-certservice-api:1.1.0 +image: onap/org.onap.aaf.certservice.aaf-certservice-api:1.2.0 pullPolicy: Always replicaCount: 1 diff --git a/kubernetes/common/certInitializer/requirements.yaml b/kubernetes/common/certInitializer/requirements.yaml index 237f1d1354..31041ad669 100644 --- a/kubernetes/common/certInitializer/requirements.yaml +++ b/kubernetes/common/certInitializer/requirements.yaml @@ -16,3 +16,6 @@ dependencies: - name: common version: ~6.x-0 repository: 'file://../common' + - name: readinessCheck + version: ~6.x-0 + repository: 'file://../readinessCheck' diff --git a/kubernetes/common/certInitializer/templates/_certInitializer.yaml b/kubernetes/common/certInitializer/templates/_certInitializer.yaml index 9c744f39ba..1250c1225e 100644 --- a/kubernetes/common/certInitializer/templates/_certInitializer.yaml +++ b/kubernetes/common/certInitializer/templates/_certInitializer.yaml @@ -42,24 +42,7 @@ {{- $initRoot := default $dot.Values.certInitializer .initRoot -}} {{- $initName := default "certInitializer" -}} {{- $subchartDot := fromJson (include "common.subChartDot" (dict "dot" $dot "initRoot" $initRoot)) }} -- name: {{ include "common.name" $dot }}-aaf-readiness - image: "{{ $subchartDot.Values.global.readinessRepository }}/{{ $subchartDot.Values.global.readinessImage }}" - imagePullPolicy: {{ $subchartDot.Values.global.pullPolicy | default $subchartDot.Values.pullPolicy }} - command: - - /root/ready.py - args: - - --container-name - - aaf-locate - - --container-name - - aaf-cm - - --container-name - - aaf-service - env: - - name: NAMESPACE - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: metadata.namespace +{{ include "common.readinessCheck.waitFor" $subchartDot }} - name: {{ include "common.name" $dot }}-aaf-config image: {{ include "common.repository" $subchartDot }}/{{ $subchartDot.Values.global.aafAgentImage }} imagePullPolicy: {{ $subchartDot.Values.global.pullPolicy | default $subchartDot.Values.pullPolicy }} diff --git a/kubernetes/common/certInitializer/values.yaml b/kubernetes/common/certInitializer/values.yaml index fdee4c9bd2..416282f72a 100644 --- a/kubernetes/common/certInitializer/values.yaml +++ b/kubernetes/common/certInitializer/values.yaml @@ -13,8 +13,6 @@ # limitations under the License. global: - readinessRepository: oomk8s - readinessImage: readiness-check:2.0.2 repository: nexus3.onap.org:10001 aafAgentImage: onap/aaf/aaf_agent:2.1.20 aafEnabled: true @@ -29,6 +27,12 @@ secrets: password: '{{ .Values.aafDeployPass }}' passwordPolicy: required +readinessCheck: + wait_for: + - aaf-locate + - aaf-cm + - aaf-service + aafDeployFqi: "changeme" fqdn: "" app_ns: "org.osaaf.aaf" diff --git a/kubernetes/common/readinessCheck/templates/_readinessCheck.tpl b/kubernetes/common/readinessCheck/templates/_readinessCheck.tpl index 1bdea6bb27..3cdf13a362 100644 --- a/kubernetes/common/readinessCheck/templates/_readinessCheck.tpl +++ b/kubernetes/common/readinessCheck/templates/_readinessCheck.tpl @@ -17,18 +17,29 @@ {{/* Generate readiness part for a pod Will look by default to .Values.wait_for + There are two formats available. - Value of wait_for is an array of all pods /jobs to wait: - - Example: + The simple one (where wait_for is just list of containers): wait_for: - aaf-locate - aaf-cm - aaf-service - The function can takes two arguments (inside a dictionary): + The powerful one (where wait_for is a map): + + wait_for: + name: myname + containers: + - aaf-locate + - aaf-cm + - aaf-service + + + The function can takes below arguments (inside a dictionary): - .dot : environment (.) + - .initRoot : the root dictionary of readinessCheck submodule + (default to .Values.readinessCheck) - .wait_for : list of containers / jobs to wait for (default to .Values.wait_for) @@ -42,13 +53,15 @@ {{/* Our version of helm doesn't support deepCopy so we need this nasty trick */}} {{- $subchartDot := fromJson (include "common.subChartDot" (dict "dot" $dot "initRoot" $initRoot)) }} {{- $wait_for := default $initRoot.wait_for .wait_for -}} -- name: {{ include "common.name" $dot }}-{{ $wait_for.name }}-readiness +{{- $containers := index (ternary (dict "containers" $wait_for) $wait_for (kindIs "slice" $wait_for)) "containers" -}} +{{- $namePart := index (ternary (dict) $wait_for (kindIs "slice" $wait_for)) "name" -}} +- name: {{ include "common.name" $dot }}{{ ternary "" (printf "-%s" $namePart) (empty $namePart) }}-readiness image: "{{ $subchartDot.Values.global.readinessRepository }}/{{ $subchartDot.Values.global.readinessImage }}" imagePullPolicy: {{ $subchartDot.Values.global.pullPolicy | default $subchartDot.Values.pullPolicy }} command: - /root/ready.py args: - {{- range $container := $wait_for.containers }} + {{- range $container := $containers }} - --container-name - {{ tpl $container $dot }} {{- end }} diff --git a/kubernetes/esr/charts/esr-gui/templates/deployment.yaml b/kubernetes/esr/charts/esr-gui/templates/deployment.yaml index 9c70d327d7..4dee376dee 100644 --- a/kubernetes/esr/charts/esr-gui/templates/deployment.yaml +++ b/kubernetes/esr/charts/esr-gui/templates/deployment.yaml @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: {{ include "common.fullname" . }} @@ -24,6 +24,9 @@ metadata: release: {{ include "common.release" . }} heritage: {{ .Release.Service }} spec: + selector: + matchLabels: + app: {{ include "common.name" . }} replicas: {{ .Values.replicaCount }} template: metadata: diff --git a/kubernetes/esr/charts/esr-server/templates/deployment.yaml b/kubernetes/esr/charts/esr-server/templates/deployment.yaml index 995a409d8a..6a98fe6059 100644 --- a/kubernetes/esr/charts/esr-server/templates/deployment.yaml +++ b/kubernetes/esr/charts/esr-server/templates/deployment.yaml @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: {{ include "common.fullname" . }} @@ -24,6 +24,9 @@ metadata: release: {{ include "common.release" . }} heritage: {{ .Release.Service }} spec: + selector: + matchLabels: + app: {{ include "common.name" . }} replicas: {{ .Values.replicaCount }} template: metadata: diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml index 8a94369d39..b562beb732 100755 --- a/kubernetes/onap/values.yaml +++ b/kubernetes/onap/values.yaml @@ -113,7 +113,7 @@ global: cmpv2Enabled: true aaf: certServiceClient: - image: onap/org.onap.aaf.certservice.aaf-certservice-client:1.1.0 + image: onap/org.onap.aaf.certservice.aaf-certservice-client:1.2.0 secret: name: aaf-cert-service-client-tls-secret mountPath: /etc/onap/aaf/certservice/certs/ |