From d0b2eb2493a3e1ce06af4d93b5fc71df86462f79 Mon Sep 17 00:00:00 2001 From: Sylvain Desbureaux Date: Fri, 21 Aug 2020 09:30:30 +0200 Subject: Prepare upgrade to readiness containers v3.0.1 Readiness 3.x is a new version, not using root user and using stable Kubernetes API. The upgrade is not doable by just changing version as script path has moved. Therefore, we must upgrade everything in one shot. As AAI is not in the same repo, it's not doable for this component. We then change variables only for AAI so we can continue to use older images. We'll move AAI just after the rest has been upgraded. Issue-ID: OOM-2545 Signed-off-by: Sylvain Desbureaux Change-Id: I5afa83892043f4844afe12e61724a8d368a9f2e0 --- components/aai-babel/values.yaml | 1 - components/aai-graphadmin/templates/deployment.yaml | 2 +- components/aai-graphadmin/templates/job-copy-db-backup.yaml | 2 +- components/aai-graphadmin/templates/job-create-db.yaml | 2 +- components/aai-graphadmin/templates/job-migration.yaml | 4 ++-- components/aai-graphadmin/values.yaml | 4 ++-- components/aai-resources/templates/deployment.yaml | 2 +- components/aai-resources/values.yaml | 4 ++-- components/aai-schema-service/values.yaml | 2 -- components/aai-search-data/values.yaml | 2 -- components/aai-sparky-be/templates/deployment.yaml | 2 +- components/aai-sparky-be/values.yaml | 2 ++ components/aai-traversal/templates/deployment.yaml | 2 +- components/aai-traversal/templates/job.yaml | 2 +- components/aai-traversal/values.yaml | 4 ++-- templates/deployment.yaml | 2 +- values.yaml | 4 ++-- 17 files changed, 20 insertions(+), 23 deletions(-) diff --git a/components/aai-babel/values.yaml b/components/aai-babel/values.yaml index b0f29dd..6f2c033 100644 --- a/components/aai-babel/values.yaml +++ b/components/aai-babel/values.yaml @@ -17,7 +17,6 @@ # Global configuration defaults. ################################################################# global: - readinessImage: readiness-check:2.0.2 loggingImage: beats/filebeat:5.5.0 ################################################################# diff --git a/components/aai-graphadmin/templates/deployment.yaml b/components/aai-graphadmin/templates/deployment.yaml index 3630d6a..bee6b75 100644 --- a/components/aai-graphadmin/templates/deployment.yaml +++ b/components/aai-graphadmin/templates/deployment.yaml @@ -72,7 +72,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" + image: "{{ .Values.global.legacyReadinessRepository }}/{{ .Values.global.legacyReadinessImage }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-readiness {{ end }} diff --git a/components/aai-graphadmin/templates/job-copy-db-backup.yaml b/components/aai-graphadmin/templates/job-copy-db-backup.yaml index ba74ef1..36c0538 100644 --- a/components/aai-graphadmin/templates/job-copy-db-backup.yaml +++ b/components/aai-graphadmin/templates/job-copy-db-backup.yaml @@ -66,7 +66,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" + image: "{{ .Values.global.legacyReadinessRepository }}/{{ .Values.global.legacyReadinessImage }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-db-backup-readiness {{- end }} diff --git a/components/aai-graphadmin/templates/job-create-db.yaml b/components/aai-graphadmin/templates/job-create-db.yaml index 2ab57b6..2546c0a 100644 --- a/components/aai-graphadmin/templates/job-create-db.yaml +++ b/components/aai-graphadmin/templates/job-create-db.yaml @@ -67,7 +67,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" + image: "{{ .Values.global.legacyReadinessRepository }}/{{ .Values.global.legacyReadinessImage }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-readiness containers: diff --git a/components/aai-graphadmin/templates/job-migration.yaml b/components/aai-graphadmin/templates/job-migration.yaml index 37740be..7e62fb9 100644 --- a/components/aai-graphadmin/templates/job-migration.yaml +++ b/components/aai-graphadmin/templates/job-migration.yaml @@ -72,7 +72,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" + image: "{{ .Values.global.legacyReadinessRepository }}/{{ .Values.global.legacyReadinessImage }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-readiness - command: @@ -234,7 +234,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" + image: "{{ .Values.global.legacyReadinessRepository }}/{{ .Values.global.legacyReadinessImage }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-db-backup-readiness {{- end }} diff --git a/components/aai-graphadmin/values.yaml b/components/aai-graphadmin/values.yaml index 8e44f26..2527cea 100644 --- a/components/aai-graphadmin/values.yaml +++ b/components/aai-graphadmin/values.yaml @@ -22,8 +22,8 @@ # Declare variables to be passed into your templates. global: # global defaults nodePortPrefix: 302 - readinessRepository: oomk8s - readinessImage: readiness-check:2.0.2 + legacyReadinessRepository: oomk8s + legacyReadinessImage: readiness-check:2.2.2 # application image diff --git a/components/aai-resources/templates/deployment.yaml b/components/aai-resources/templates/deployment.yaml index 5f8b638..c43c4ec 100644 --- a/components/aai-resources/templates/deployment.yaml +++ b/components/aai-resources/templates/deployment.yaml @@ -1211,7 +1211,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" + image: "{{ .Values.global.legacyReadinessRepository }}/{{ .Values.global.legacyReadinessImage }}" 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 00e1c83..b71c9c4 100644 --- a/components/aai-resources/values.yaml +++ b/components/aai-resources/values.yaml @@ -17,8 +17,8 @@ # Declare variables to be passed into your templates. global: # global defaults nodePortPrefix: 302 - readinessRepository: oomk8s - readinessImage: readiness-check:2.0.2 + legacyReadinessRepository: oomk8s + legacyReadinessImage: readiness-check:2.2.2 # application image repository: nexus3.onap.org:10001 diff --git a/components/aai-schema-service/values.yaml b/components/aai-schema-service/values.yaml index 01f4ae4..6842eb3 100644 --- a/components/aai-schema-service/values.yaml +++ b/components/aai-schema-service/values.yaml @@ -17,8 +17,6 @@ # Declare variables to be passed into your templates. global: # global defaults nodePortPrefix: 302 - readinessRepository: oomk8s - readinessImage: readiness-check:2.0.2 # application image repository: nexus3.onap.org:10001 diff --git a/components/aai-search-data/values.yaml b/components/aai-search-data/values.yaml index 26b4cd8..53a2064 100644 --- a/components/aai-search-data/values.yaml +++ b/components/aai-search-data/values.yaml @@ -17,8 +17,6 @@ # Declare variables to be passed into your templates. global: # global defaults nodePortPrefix: 302 - readinessRepository: oomk8s - readinessImage: readiness-check:2.0.2 # application image diff --git a/components/aai-sparky-be/templates/deployment.yaml b/components/aai-sparky-be/templates/deployment.yaml index fedb0da..b0bc74e 100644 --- a/components/aai-sparky-be/templates/deployment.yaml +++ b/components/aai-sparky-be/templates/deployment.yaml @@ -51,7 +51,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" + image: "{{ .Values.global.legacyReadinessRepository }}/{{ .Values.global.legacyReadinessImage }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-readiness containers: diff --git a/components/aai-sparky-be/values.yaml b/components/aai-sparky-be/values.yaml index 36820c4..643eee7 100644 --- a/components/aai-sparky-be/values.yaml +++ b/components/aai-sparky-be/values.yaml @@ -25,6 +25,8 @@ global: # global defaults serviceName: aai-gizmo searchData: serviceName: aai-search-data + legacyReadinessRepository: oomk8s + legacyReadinessImage: readiness-check:2.2.2 # application image repository: nexus3.onap.org:10001 diff --git a/components/aai-traversal/templates/deployment.yaml b/components/aai-traversal/templates/deployment.yaml index 8adb49d..b1b779e 100644 --- a/components/aai-traversal/templates/deployment.yaml +++ b/components/aai-traversal/templates/deployment.yaml @@ -657,7 +657,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" + image: "{{ .Values.global.legacyReadinessRepository }}/{{ .Values.global.legacyReadinessImage }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-readiness {{ end }} diff --git a/components/aai-traversal/templates/job.yaml b/components/aai-traversal/templates/job.yaml index 92b8614..6f5e259 100644 --- a/components/aai-traversal/templates/job.yaml +++ b/components/aai-traversal/templates/job.yaml @@ -55,7 +55,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" + image: "{{ .Values.global.legacyReadinessRepository }}/{{ .Values.global.legacyReadinessImage }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-readiness containers: diff --git a/components/aai-traversal/values.yaml b/components/aai-traversal/values.yaml index 526a719..04185ee 100644 --- a/components/aai-traversal/values.yaml +++ b/components/aai-traversal/values.yaml @@ -17,8 +17,8 @@ # Declare variables to be passed into your templates. global: # global defaults nodePortPrefix: 302 - readinessRepository: oomk8s - readinessImage: readiness-check:2.0.2 + legacyReadinessRepository: oomk8s + legacyReadinessImage: readiness-check:2.2.2 # application image diff --git a/templates/deployment.yaml b/templates/deployment.yaml index 24b8f10..e04b5fd 100644 --- a/templates/deployment.yaml +++ b/templates/deployment.yaml @@ -53,7 +53,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" + image: "{{ .Values.global.legacyReadinessRepository }}/{{ .Values.global.legacyReadinessImage }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-readiness containers: diff --git a/values.yaml b/values.yaml index 4b17500..404d908 100644 --- a/values.yaml +++ b/values.yaml @@ -22,8 +22,8 @@ global: # global defaults dockerhubRepository: docker.io busyboxImage: busybox - readinessRepository: oomk8s - readinessImage: readiness-check:2.0.2 + legacyReadinessRepository: oomk8s + legacyReadinessImage: readiness-check:2.2.2 loggingRepository: docker.elastic.co loggingImage: beats/filebeat:5.5.0 -- cgit 1.2.3-korg