From 465b6d91b23f448bf654d76b6308ef35643b63a0 Mon Sep 17 00:00:00 2001 From: Cedric Verstraeten Date: Wed, 20 Nov 2024 15:12:41 +0100 Subject: [PATCH] add image registry --- charts/hub/Chart.yaml | 2 +- charts/hub/templates/kerberos-hub/hub-api.yaml | 2 +- charts/hub/templates/kerberos-hub/hub-cleanup.yaml | 2 +- charts/hub/templates/kerberos-hub/hub-frontend-demo.yaml | 2 +- charts/hub/templates/kerberos-hub/hub-frontend.yaml | 2 +- charts/hub/templates/kerberos-hub/hub-monitor-device.yaml | 2 +- .../templates/kerberos-hub/hub-reactivate-subscription.yaml | 2 +- charts/hub/templates/kerberos-pipeline/pipe-analysis.yaml | 2 +- charts/hub/templates/kerberos-pipeline/pipe-counting.yaml | 2 +- .../hub/templates/kerberos-pipeline/pipe-dominantcolor.yaml | 2 +- charts/hub/templates/kerberos-pipeline/pipe-event.yaml | 2 +- charts/hub/templates/kerberos-pipeline/pipe-export.yaml | 2 +- charts/hub/templates/kerberos-pipeline/pipe-monitor.yaml | 2 +- charts/hub/templates/kerberos-pipeline/pipe-notify-test.yaml | 2 +- charts/hub/templates/kerberos-pipeline/pipe-notify.yaml | 2 +- charts/hub/templates/kerberos-pipeline/pipe-sequence.yaml | 2 +- charts/hub/templates/kerberos-pipeline/pipe-sprite.yaml | 2 +- charts/hub/templates/kerberos-pipeline/pipe-throttler.yaml | 2 +- charts/hub/templates/kerberos-pipeline/pipe-thumbnail.yaml | 2 +- charts/hub/templates/kerberos-vault/vault-forwarder.yaml | 2 +- charts/hub/templates/kerberos-vault/vault-proxy.yaml | 2 +- charts/hub/values.yaml | 4 ++++ 22 files changed, 25 insertions(+), 21 deletions(-) diff --git a/charts/hub/Chart.yaml b/charts/hub/Chart.yaml index a402d26..7fdf620 100644 --- a/charts/hub/Chart.yaml +++ b/charts/hub/Chart.yaml @@ -16,7 +16,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.71.0 +version: 0.72.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/hub/templates/kerberos-hub/hub-api.yaml b/charts/hub/templates/kerberos-hub/hub-api.yaml index befe706..0f455ce 100644 --- a/charts/hub/templates/kerberos-hub/hub-api.yaml +++ b/charts/hub/templates/kerberos-hub/hub-api.yaml @@ -123,7 +123,7 @@ spec: {{- end }} containers: - name: hub-api - image: "{{ .Values.kerberoshub.api.repository }}:{{ .Values.kerberoshub.api.tag }}" + image: "{{ .Values.global.imageRegistry }}{{ .Values.kerberoshub.api.repository }}:{{ .Values.kerberoshub.api.tag }}" imagePullPolicy: {{ .Values.kerberoshub.api.pullPolicy }} {{- with .Values.kerberoshub.api.resources }} resources: diff --git a/charts/hub/templates/kerberos-hub/hub-cleanup.yaml b/charts/hub/templates/kerberos-hub/hub-cleanup.yaml index 5605a8c..1922fa4 100644 --- a/charts/hub/templates/kerberos-hub/hub-cleanup.yaml +++ b/charts/hub/templates/kerberos-hub/hub-cleanup.yaml @@ -24,7 +24,7 @@ spec: {{- end }} containers: - name: hub-cleanup - image: "{{ .Values.kerberoshub.cleanup.repository }}:{{ .Values.kerberoshub.cleanup.tag }}" + image: "{{ .Values.global.imageRegistry }}{{ .Values.kerberoshub.cleanup.repository }}:{{ .Values.kerberoshub.cleanup.tag }}" imagePullPolicy: {{ .Values.kerberoshub.cleanup.pullPolicy }} {{- with .Values.kerberoshub.cleanup.resources }} resources: diff --git a/charts/hub/templates/kerberos-hub/hub-frontend-demo.yaml b/charts/hub/templates/kerberos-hub/hub-frontend-demo.yaml index 461be2e..3dbe1e3 100644 --- a/charts/hub/templates/kerberos-hub/hub-frontend-demo.yaml +++ b/charts/hub/templates/kerberos-hub/hub-frontend-demo.yaml @@ -86,7 +86,7 @@ spec: {{- end }} containers: - name: hub-frontend-demo - image: "{{ .Values.kerberoshub.frontend.repository }}:{{ .Values.kerberoshub.frontend.tag }}" + image: "{{ .Values.global.imageRegistry }}{{ .Values.kerberoshub.frontend.repository }}:{{ .Values.kerberoshub.frontend.tag }}" imagePullPolicy: {{ .Values.kerberoshub.frontend.pullPolicy }} {{- with .Values.kerberoshub.frontend.resources }} resources: diff --git a/charts/hub/templates/kerberos-hub/hub-frontend.yaml b/charts/hub/templates/kerberos-hub/hub-frontend.yaml index 721fae7..5d73585 100644 --- a/charts/hub/templates/kerberos-hub/hub-frontend.yaml +++ b/charts/hub/templates/kerberos-hub/hub-frontend.yaml @@ -167,7 +167,7 @@ spec: {{- end }} containers: - name: hub-frontend - image: "{{ .Values.kerberoshub.frontend.repository }}:{{ .Values.kerberoshub.frontend.tag }}" + image: "{{ .Values.global.imageRegistry }}{{ .Values.kerberoshub.frontend.repository }}:{{ .Values.kerberoshub.frontend.tag }}" imagePullPolicy: {{ .Values.kerberoshub.frontend.pullPolicy }} {{- with .Values.kerberoshub.frontend.resources }} resources: diff --git a/charts/hub/templates/kerberos-hub/hub-monitor-device.yaml b/charts/hub/templates/kerberos-hub/hub-monitor-device.yaml index d90346a..3969e74 100644 --- a/charts/hub/templates/kerberos-hub/hub-monitor-device.yaml +++ b/charts/hub/templates/kerberos-hub/hub-monitor-device.yaml @@ -28,7 +28,7 @@ spec: {{- end }} containers: - name: hub-monitor-device - image: "{{ .Values.kerberoshub.monitordevice.repository }}:{{ .Values.kerberoshub.monitordevice.tag }}" + image: "{{ .Values.global.imageRegistry }}{{ .Values.kerberoshub.monitordevice.repository }}:{{ .Values.kerberoshub.monitordevice.tag }}" imagePullPolicy: {{ .Values.kerberoshub.monitordevice.pullPolicy }} {{- with .Values.kerberoshub.monitordevice.resources }} resources: diff --git a/charts/hub/templates/kerberos-hub/hub-reactivate-subscription.yaml b/charts/hub/templates/kerberos-hub/hub-reactivate-subscription.yaml index 728dbd4..bb72eee 100644 --- a/charts/hub/templates/kerberos-hub/hub-reactivate-subscription.yaml +++ b/charts/hub/templates/kerberos-hub/hub-reactivate-subscription.yaml @@ -24,7 +24,7 @@ spec: {{- end }} containers: - name: hub-reactivate-subscription - image: "{{ .Values.kerberoshub.reactivate.repository }}:{{ .Values.kerberoshub.reactivate.tag }}" + image: "{{ .Values.global.imageRegistry }}{{ .Values.kerberoshub.reactivate.repository }}:{{ .Values.kerberoshub.reactivate.tag }}" imagePullPolicy: {{ .Values.kerberoshub.reactivate.pullPolicy }} env: - name: READ_ONLY diff --git a/charts/hub/templates/kerberos-pipeline/pipe-analysis.yaml b/charts/hub/templates/kerberos-pipeline/pipe-analysis.yaml index d269230..197f309 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-analysis.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-analysis.yaml @@ -24,7 +24,7 @@ spec: {{- end }} containers: - name: pipe-analysis - image: "{{ .Values.kerberospipeline.analysis.repository }}:{{ .Values.kerberospipeline.analysis.tag }}" + image: "{{ .Values.global.imageRegistry }}{{ .Values.kerberospipeline.analysis.repository }}:{{ .Values.kerberospipeline.analysis.tag }}" imagePullPolicy: {{ .Values.kerberospipeline.analysis.pullPolicy }} {{- with .Values.kerberospipeline.analysis.resources }} resources: diff --git a/charts/hub/templates/kerberos-pipeline/pipe-counting.yaml b/charts/hub/templates/kerberos-pipeline/pipe-counting.yaml index 5ea62ac..f82e55b 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-counting.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-counting.yaml @@ -24,7 +24,7 @@ spec: {{- end }} containers: - name: pipe-counting - image: "{{ .Values.kerberospipeline.counting.repository }}:{{ .Values.kerberospipeline.counting.tag }}" + image: "{{ .Values.global.imageRegistry }}{{ .Values.kerberospipeline.counting.repository }}:{{ .Values.kerberospipeline.counting.tag }}" imagePullPolicy: {{ .Values.kerberospipeline.counting.pullPolicy }} {{- with .Values.kerberospipeline.counting.resources }} resources: diff --git a/charts/hub/templates/kerberos-pipeline/pipe-dominantcolor.yaml b/charts/hub/templates/kerberos-pipeline/pipe-dominantcolor.yaml index b140ed4..4ee51f9 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-dominantcolor.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-dominantcolor.yaml @@ -24,7 +24,7 @@ spec: {{- end }} containers: - name: pipe-dominantcolor - image: "{{ .Values.kerberospipeline.dominantColor.repository }}:{{ .Values.kerberospipeline.dominantColor.tag }}" + image: "{{ .Values.global.imageRegistry }}{{ .Values.kerberospipeline.dominantColor.repository }}:{{ .Values.kerberospipeline.dominantColor.tag }}" imagePullPolicy: {{ .Values.kerberospipeline.dominantColor.pullPolicy }} {{- with .Values.kerberospipeline.dominantColor.resources }} resources: diff --git a/charts/hub/templates/kerberos-pipeline/pipe-event.yaml b/charts/hub/templates/kerberos-pipeline/pipe-event.yaml index 493b7cf..63b4e82 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-event.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-event.yaml @@ -24,7 +24,7 @@ spec: {{- end }} containers: - name: pipe-event - image: "{{ .Values.kerberospipeline.event.repository }}:{{ .Values.kerberospipeline.event.tag }}" + image: "{{ .Values.global.imageRegistry }}{{ .Values.kerberospipeline.event.repository }}:{{ .Values.kerberospipeline.event.tag }}" imagePullPolicy: {{ .Values.kerberospipeline.event.pullPolicy }} {{- with .Values.kerberospipeline.event.resources }} resources: diff --git a/charts/hub/templates/kerberos-pipeline/pipe-export.yaml b/charts/hub/templates/kerberos-pipeline/pipe-export.yaml index f8a4ec8..941830c 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-export.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-export.yaml @@ -24,7 +24,7 @@ spec: {{- end }} containers: - name: pipe-export - image: "{{ .Values.kerberospipeline.export.repository }}:{{ .Values.kerberospipeline.export.tag }}" + image: "{{ .Values.global.imageRegistry }}{{ .Values.kerberospipeline.export.repository }}:{{ .Values.kerberospipeline.export.tag }}" imagePullPolicy: {{ .Values.kerberospipeline.export.pullPolicy }} {{- with .Values.kerberospipeline.export.resources }} resources: diff --git a/charts/hub/templates/kerberos-pipeline/pipe-monitor.yaml b/charts/hub/templates/kerberos-pipeline/pipe-monitor.yaml index 37a1933..3be4709 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-monitor.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-monitor.yaml @@ -24,7 +24,7 @@ spec: {{- end }} containers: - name: pipe-monitor - image: "{{ .Values.kerberospipeline.monitor.repository }}:{{ .Values.kerberospipeline.monitor.tag }}" + image: "{{ .Values.global.imageRegistry }}{{ .Values.kerberospipeline.monitor.repository }}:{{ .Values.kerberospipeline.monitor.tag }}" imagePullPolicy: {{ .Values.kerberospipeline.monitor.pullPolicy }} {{- with .Values.kerberospipeline.monitor.resources }} resources: diff --git a/charts/hub/templates/kerberos-pipeline/pipe-notify-test.yaml b/charts/hub/templates/kerberos-pipeline/pipe-notify-test.yaml index cef43af..7390c13 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-notify-test.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-notify-test.yaml @@ -28,7 +28,7 @@ spec: {{- end }} containers: - name: pipe-notify-test - image: "{{ .Values.kerberospipeline.notifyTest.repository }}:{{ .Values.kerberospipeline.notifyTest.tag }}" + image: "{{ .Values.global.imageRegistry }}{{ .Values.kerberospipeline.notifyTest.repository }}:{{ .Values.kerberospipeline.notifyTest.tag }}" imagePullPolicy: {{ .Values.kerberospipeline.notifyTest.pullPolicy }} {{- with .Values.kerberospipeline.notifyTest.resources }} resources: diff --git a/charts/hub/templates/kerberos-pipeline/pipe-notify.yaml b/charts/hub/templates/kerberos-pipeline/pipe-notify.yaml index 3eede92..b2fcae6 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-notify.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-notify.yaml @@ -28,7 +28,7 @@ spec: {{- end }} containers: - name: pipe-notify - image: "{{ .Values.kerberospipeline.notify.repository }}:{{ .Values.kerberospipeline.notify.tag }}" + image: "{{ .Values.global.imageRegistry }}{{ .Values.kerberospipeline.notify.repository }}:{{ .Values.kerberospipeline.notify.tag }}" imagePullPolicy: {{ .Values.kerberospipeline.notify.pullPolicy }} {{- with .Values.kerberospipeline.notify.resources }} resources: diff --git a/charts/hub/templates/kerberos-pipeline/pipe-sequence.yaml b/charts/hub/templates/kerberos-pipeline/pipe-sequence.yaml index e85c912..3c33ef3 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-sequence.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-sequence.yaml @@ -24,7 +24,7 @@ spec: {{- end }} containers: - name: pipe-sequence - image: "{{ .Values.kerberospipeline.sequence.repository }}:{{ .Values.kerberospipeline.sequence.tag }}" + image: "{{ .Values.global.imageRegistry }}{{ .Values.kerberospipeline.sequence.repository }}:{{ .Values.kerberospipeline.sequence.tag }}" imagePullPolicy: {{ .Values.kerberospipeline.sequence.pullPolicy }} {{- with .Values.kerberospipeline.sequence.resources }} resources: diff --git a/charts/hub/templates/kerberos-pipeline/pipe-sprite.yaml b/charts/hub/templates/kerberos-pipeline/pipe-sprite.yaml index 3ecefbb..25554f4 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-sprite.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-sprite.yaml @@ -25,7 +25,7 @@ spec: {{- end }} containers: - name: pipe-sprite - image: "{{ .Values.kerberospipeline.sprite.repository }}:{{ .Values.kerberospipeline.sprite.tag }}" + image: "{{ .Values.global.imageRegistry }}{{ .Values.kerberospipeline.sprite.repository }}:{{ .Values.kerberospipeline.sprite.tag }}" imagePullPolicy: {{ .Values.kerberospipeline.sprite.pullPolicy }} {{- with .Values.kerberospipeline.sprite.resources }} resources: diff --git a/charts/hub/templates/kerberos-pipeline/pipe-throttler.yaml b/charts/hub/templates/kerberos-pipeline/pipe-throttler.yaml index 36d1c77..58b8e50 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-throttler.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-throttler.yaml @@ -24,7 +24,7 @@ spec: {{- end }} containers: - name: pipe-throttler - image: "{{ .Values.kerberospipeline.throttler.repository }}:{{ .Values.kerberospipeline.throttler.tag }}" + image: "{{ .Values.global.imageRegistry }}{{ .Values.kerberospipeline.throttler.repository }}:{{ .Values.kerberospipeline.throttler.tag }}" imagePullPolicy: {{ .Values.kerberospipeline.throttler.pullPolicy }} {{- with .Values.kerberospipeline.throttler.resources }} resources: diff --git a/charts/hub/templates/kerberos-pipeline/pipe-thumbnail.yaml b/charts/hub/templates/kerberos-pipeline/pipe-thumbnail.yaml index fb773a2..6950be9 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-thumbnail.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-thumbnail.yaml @@ -24,7 +24,7 @@ spec: {{- end }} containers: - name: pipe-thumbnail - image: "{{ .Values.kerberospipeline.thumbnail.repository }}:{{ .Values.kerberospipeline.thumbnail.tag }}" + image: "{{ .Values.global.imageRegistry }}{{ .Values.kerberospipeline.thumbnail.repository }}:{{ .Values.kerberospipeline.thumbnail.tag }}" imagePullPolicy: {{ .Values.kerberospipeline.thumbnail.pullPolicy }} {{- with .Values.kerberospipeline.thumbnail.resources }} resources: diff --git a/charts/hub/templates/kerberos-vault/vault-forwarder.yaml b/charts/hub/templates/kerberos-vault/vault-forwarder.yaml index de3cdf1..2ee4d8f 100644 --- a/charts/hub/templates/kerberos-vault/vault-forwarder.yaml +++ b/charts/hub/templates/kerberos-vault/vault-forwarder.yaml @@ -26,7 +26,7 @@ spec: {{- end }} containers: - name: vault-forwarder - image: "{{ .Values.kerberoshub.forwarder.repository }}:{{ .Values.kerberoshub.forwarder.tag }}" + image: "{{ .Values.global.imageRegistry }}{{ .Values.kerberoshub.forwarder.repository }}:{{ .Values.kerberoshub.forwarder.tag }}" imagePullPolicy: {{ .Values.kerberoshub.forwarder.pullPolicy }} resources: requests: diff --git a/charts/hub/templates/kerberos-vault/vault-proxy.yaml b/charts/hub/templates/kerberos-vault/vault-proxy.yaml index 790be1c..3c7a69e 100644 --- a/charts/hub/templates/kerberos-vault/vault-proxy.yaml +++ b/charts/hub/templates/kerberos-vault/vault-proxy.yaml @@ -24,7 +24,7 @@ spec: {{- end }} containers: - name: vault-proxy - image: "{{ .Values.kerberoshub.proxy.repository }}:{{ .Values.kerberoshub.proxy.tag }}" + image: "{{ .Values.global.imageRegistry }}{{ .Values.kerberoshub.proxy.repository }}:{{ .Values.kerberoshub.proxy.tag }}" imagePullPolicy: {{ .Values.kerberoshub.proxy.pullPolicy }} ports: - containerPort: 8080 diff --git a/charts/hub/values.yaml b/charts/hub/values.yaml index 1003cd3..bdc3189 100644 --- a/charts/hub/values.yaml +++ b/charts/hub/values.yaml @@ -12,6 +12,10 @@ license: "L/+FAwEBB2xpY2Vuc2UB/4YAAQIBB1BheWxvYWQBCgABCVNpZ25hdHVyZQEKAAAA/gMv/4 licenseServer: url: "https://license.kerberos.io/verify" token: "214%ˆ#ddfsf@#3rfdsgl_)23sffeqasSwefDSFNBM" # do not change otherwise Kerberos Hub will not work. + +global: + imageRegistry: "docker.io/" + # Private Docker Registry: The registry secret is required if you have your Docker images behind a private registry. # By default it will pull from Docker hub (https://hub.docker.com/r/kerberos). #imagePullSecrets: