diff options
| author |   Grzegorz-Lis <grzegorz.lis@nokia.com> | 2020-09-07 13:38:42 +0200 |
|---|---|---|
| committer | Grzegorz Lis <grzegorz.lis@nokia.com> | 2020-09-07 11:51:24 +0000 |
| commit | 5a01a0953803b3d1b140a77c779a3b942e293228 (patch) | |
| tree | 9e9fda9f276a301704ad2de7ddad2585c3609902 /components/aai-resources | |
| parent | 1990a02ce9295df7c94009401c24fa226a10f8e8 (diff) | |
[AAI] Use readiness container v3.0.1
Readiness container v3.x and up are now present in ONAP main repository.
They're also not using root user anymore and then script path has
changed.
Finally, "job_complete" script has been integrated in main "ready"
script.
This change will align readinessImage definition with rest of ONAP
components.
Issue-ID: OOM-2545
Signed-off-by: Grzegorz Lis <grzegorz.lis@nokia.com>
Change-Id: I766a16be3ae2669f562c9b4ebef875bfbdfac6a0
Diffstat (limited to 'components/aai-resources')
| -rw-r--r-- | components/aai-resources/templates/deployment.yaml | 13 | ||||
| -rw-r--r-- | components/aai-resources/values.yaml | 6 |
2 files changed, 10 insertions, 9 deletions
diff --git a/components/aai-resources/templates/deployment.yaml b/components/aai-resources/templates/deployment.yaml index c43c4ec..2440da6 100644 --- a/components/aai-resources/templates/deployment.yaml +++ b/components/aai-resources/templates/deployment.yaml @@ -1,5 +1,6 @@ -# Copyright © 2017 Amdocs, Bell Canada -# Modifications Copyright © 2018 AT&T +# Copyright (c) 2017 Amdocs, Bell Canada +# Modifications Copyright (c) 2018 AT&T +# Modifications Copyright (c) 2020 Nokia # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -1184,17 +1185,17 @@ spec: initContainers: - command: {{ if .Values.global.jobs.migration.enabled }} - - /root/job_complete.py + - /app/ready.py args: - --job-name - {{ include "common.release" . }}-aai-graphadmin-migration {{ else if .Values.global.jobs.createSchema.enabled }} - - /root/job_complete.py + - /app/ready.py args: - --job-name - {{ include "common.release" . }}-aai-graphadmin-create-db-schema {{ else }} - - /root/ready.py + - /app/ready.py args: - --container-name {{- if .Values.global.cassandra.localCluster }} @@ -1211,7 +1212,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ .Values.global.legacyReadinessRepository }}/{{ .Values.global.legacyReadinessImage }}" + image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-readiness {{ if .Values.global.installSidecarSecurity }} diff --git a/components/aai-resources/values.yaml b/components/aai-resources/values.yaml index b71c9c4..fc50f20 100644 --- a/components/aai-resources/values.yaml +++ b/components/aai-resources/values.yaml @@ -1,4 +1,5 @@ -# Copyright © 2018 Amdocs, Bell Canada, AT&T +# Copyright (c) 2018 Amdocs, Bell Canada, AT&T +# Copyright (c) 2020 Nokia # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,8 +18,7 @@ # Declare variables to be passed into your templates. global: # global defaults nodePortPrefix: 302 - legacyReadinessRepository: oomk8s - legacyReadinessImage: readiness-check:2.2.2 + readinessImage: onap/oom/readiness:3.0.1 # application image repository: nexus3.onap.org:10001 |