Add global setting for docker registry (#135)

ktech-org · Nov 20, 2024 · 0bb27e6 · 0bb27e6
1 parent 91e1e6f
commit 0bb27e6
Show file tree

Hide file tree

Showing 15 changed files with 19 additions and 13 deletions.
diff --git a/charts/bandstand-cron-job/Chart.yaml b/charts/bandstand-cron-job/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: bandstand-cron-job
-version: 4.2.4
+version: 4.3.0
 description: Application chart for a simple cron job
 type: application
 maintainers:

diff --git a/charts/bandstand-cron-job/templates/cronjob.yaml b/charts/bandstand-cron-job/templates/cronjob.yaml
@@ -23,7 +23,7 @@ spec:
           restartPolicy: {{ .Values.restartPolicy | default "OnFailure" }}
           containers:
             - name: {{ .Release.Name }}
-              image: {{ .Values.dockerRegistry | default "ktechartifacts-docker.jfrog.io" }}/{{ $.Values.imageName | default .Release.Name }}:{{ .Values.global.image.tag }}
+              image: {{ .Values.dockerRegistry | default .Values.global.dockerRegistry | default "ktechartifacts-docker.jfrog.io" }}/{{ $.Values.imageName | default .Release.Name }}:{{ .Values.global.image.tag }}
               imagePullPolicy: Always
               {{- $jobContainer := .Values.jobContainer | default dict }}
               {{- if $jobContainer.command }}

diff --git a/charts/bandstand-headless-service/Chart.yaml b/charts/bandstand-headless-service/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: bandstand-headless-service
-version: 3.4.3
+version: 3.5.0
 description: Chart for a standalone (non-web) service
 type: application
 maintainers:

diff --git a/charts/bandstand-headless-service/templates/deployment.yaml b/charts/bandstand-headless-service/templates/deployment.yaml
@@ -22,7 +22,7 @@ spec:
       serviceAccountName: {{ $relName }}
       containers:
         - name: {{ $relName }}
-          image: {{ .Values.dockerRegistry | default "ktechartifacts-docker.jfrog.io" }}/{{ $.Values.imageName | default $relName }}:{{ .Values.global.image.tag }}
+          image: {{ .Values.dockerRegistry | default .Values.global.dockerRegistry | default "ktechartifacts-docker.jfrog.io" }}/{{ $.Values.imageName | default $relName }}:{{ .Values.global.image.tag }}
           imagePullPolicy: Always
           {{- $serverContainer := .Values.serverContainer | default dict }}
           {{- if $serverContainer.command }}

diff --git a/charts/bandstand-job/Chart.yaml b/charts/bandstand-job/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: bandstand-job
-version: 1.2.3
+version: 1.3.0
 description: Application chart for a simple job starting immediately after deployment
 type: application
 maintainers:

diff --git a/charts/bandstand-job/templates/job.yaml b/charts/bandstand-job/templates/job.yaml
@@ -16,7 +16,7 @@ spec:
       restartPolicy: {{ .Values.restartPolicy | default "OnFailure" }}
       containers:
         - name: {{ .Release.Name }}
-          image: {{ .Values.dockerRegistry | default "ktechartifacts-docker.jfrog.io" }}/{{ $.Values.imageName | default .Release.Name }}:{{ .Values.global.image.tag }}
+          image: {{ .Values.dockerRegistry | default .Values.global.dockerRegistry | default "ktechartifacts-docker.jfrog.io" }}/{{ $.Values.imageName | default .Release.Name }}:{{ .Values.global.image.tag }}
           imagePullPolicy: Always
           {{- $jobContainer := .Values.jobContainer | default dict }}
           {{- if $jobContainer.command }}

diff --git a/charts/bandstand-test-runner/Chart.yaml b/charts/bandstand-test-runner/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: bandstand-test-runner
-version: 2.4.4
+version: 2.5.0
 description: Application for running standalone test pod
 type: application
 maintainers:

diff --git a/charts/bandstand-test-runner/templates/tests/pod.yaml b/charts/bandstand-test-runner/templates/tests/pod.yaml
@@ -28,7 +28,7 @@ spec:
   serviceAccountName: {{ $.Release.Name }}
   containers:
     - name: {{ $.Release.Name }}
-      image: {{ $.Values.dockerRegistry | default "ktechartifacts-docker.jfrog.io" }}/{{ $.Values.imageName | default $.Release.Name }}:{{ $.Values.global.image.tag }}
+      image: {{ $.Values.dockerRegistry | default $.Values.global.dockerRegistry | default "ktechartifacts-docker.jfrog.io" }}/{{ $.Values.imageName | default $.Release.Name }}:{{ $.Values.global.image.tag }}
       imagePullPolicy: Always
       {{- $testRun := . | default dict }}
       {{- if $testRun.command }}

diff --git a/charts/bandstand-triggered-job/Chart.yaml b/charts/bandstand-triggered-job/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: bandstand-triggered-job
-version: 1.3.3
+version: 1.4.0
 description: Application chart for a job triggered from SQS
 type: application
 maintainers:

diff --git a/charts/bandstand-triggered-job/templates/scaledjob.yaml b/charts/bandstand-triggered-job/templates/scaledjob.yaml
@@ -23,7 +23,7 @@ spec:
         restartPolicy: {{ .Values.restartPolicy | default "OnFailure" }}
         containers:
           - name: {{ .Release.Name }}
-            image: {{ .Values.dockerRegistry | default "ktechartifacts-docker.jfrog.io" }}/{{ $.Values.imageName | default .Release.Name }}:{{ .Values.global.image.tag }}
+            image: {{ .Values.dockerRegistry | default .Values.global.dockerRegistry | default "ktechartifacts-docker.jfrog.io" }}/{{ $.Values.imageName | default .Release.Name }}:{{ .Values.global.image.tag }}
             imagePullPolicy: Always
             {{- $jobContainer := .Values.jobContainer | default dict }}
             {{- if $jobContainer.command }}

diff --git a/charts/bandstand-web-service/Chart.yaml b/charts/bandstand-web-service/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: bandstand-web-service
-version: 4.8.3
+version: 4.9.0
 description: Application chart for a web service
 type: application
 maintainers:

diff --git a/charts/bandstand-web-service/templates/deployment.yaml b/charts/bandstand-web-service/templates/deployment.yaml
@@ -29,7 +29,7 @@ spec:
       serviceAccountName: {{ $relName }}
       containers:
         - name: {{ $relName }}
-          image: {{ .Values.dockerRegistry | default "ktechartifacts-docker.jfrog.io" }}/{{ $.Values.imageName | default $relName }}:{{ .Values.global.image.tag }}
+          image: {{ .Values.dockerRegistry | default .Values.global.dockerRegistry | default "ktechartifacts-docker.jfrog.io" }}/{{ $.Values.imageName | default $relName }}:{{ .Values.global.image.tag }}
           imagePullPolicy: Always
           {{- $serverContainer := .Values.serverContainer | default dict }}
           {{- if $serverContainer.command }}

diff --git a/charts/bandstand-web-service/templates/tests/pod.yaml b/charts/bandstand-web-service/templates/tests/pod.yaml
@@ -24,7 +24,7 @@ spec:
   {{- end }}
   containers:
     - name: {{ $relName }}-acceptance-tests
-      image: {{ .Values.dockerRegistry | default "ktechartifacts-docker.jfrog.io" }}/{{ ($.Values.test).imageName | default $.Values.imageName | default $relName }}-acceptance-tests:{{ .Values.global.image.tag }}
+      image: {{ .Values.dockerRegistry | default .Values.global.dockerRegistry | default "ktechartifacts-docker.jfrog.io" }}/{{ ($.Values.test).imageName | default $.Values.imageName | default $relName }}-acceptance-tests:{{ .Values.global.image.tag }}
       imagePullPolicy: Always
       {{- $testContainer := .Values.testContainer | default dict }}
       {{- if $testContainer.command }}

diff --git a/test-charts/test-runner/image-override/values.yaml b/test-charts/test-runner/image-override/values.yaml
@@ -6,3 +6,6 @@ bandstand-test-runner:
 
   testRuns:
     - name: test-suite-1
+
+global:
+  dockerRegistry: 067805054192.dkr.ecr.eu-west-1.amazonaws.com
diff --git a/test-charts/web-service/image-override/values.yaml b/test-charts/web-service/image-override/values.yaml
@@ -6,3 +6,6 @@ bandstand-web-service:
 
   ingress:
     enabled: true
+
+global:
+  dockerRegistry: 067805054192.dkr.ecr.eu-west-1.amazonaws.com