feat(image registry): allow configuring another image registry (acryl…

…data#479) * feat(image registry): allow configuring another image registry like mirrors * feat(image registry): add documentation of schema registry override * feat(image registry): fix versions * feat(image registry): fix image names * feat(image registry): Use helm templates * feat(image registry): Reduce num of templates * feat(image registry): Local registry config take precedence over global config
DSchmidtDev · Aug 28, 2024 · 185d126 · 185d126
1 parent ad3303e
commit 185d126
Show file tree

Hide file tree

Showing 36 changed files with 260 additions and 226 deletions.
diff --git a/charts/datahub/Chart.yaml b/charts/datahub/Chart.yaml
@@ -4,33 +4,33 @@ description: A Helm chart for DataHub
 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.
-version: 0.4.22
+version: 0.4.23
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
 appVersion: 0.14.0.2
 dependencies:
   - name: datahub-gms
-    version: 0.2.171
+    version: 0.2.172
     repository: file://./subcharts/datahub-gms
     condition: datahub-gms.enabled
   - name: datahub-frontend
-    version: 0.2.158
+    version: 0.2.159
     repository: file://./subcharts/datahub-frontend
     condition: datahub-frontend.enabled
   - name: datahub-mae-consumer
-    version: 0.2.160
+    version: 0.2.161
     repository: file://./subcharts/datahub-mae-consumer
     condition: global.datahub_standalone_consumers_enabled
   - name: datahub-mce-consumer
-    version: 0.2.162
+    version: 0.2.163
     repository: file://./subcharts/datahub-mce-consumer
     condition: global.datahub_standalone_consumers_enabled
   - name: datahub-ingestion-cron
-    version: 0.2.143
+    version: 0.2.144
     repository: file://./subcharts/datahub-ingestion-cron
     condition: datahub-ingestion-cron.enabled
   - name: acryl-datahub-actions
-    version: 0.2.146
+    version: 0.2.147
     repository: file://./subcharts/acryl-datahub-actions
     condition: acryl-datahub-actions.enabled
 maintainers:

diff --git a/charts/datahub/README.md b/charts/datahub/README.md
diff --git a/charts/datahub/subcharts/acryl-datahub-actions/Chart.yaml b/charts/datahub/subcharts/acryl-datahub-actions/Chart.yaml
@@ -12,7 +12,7 @@ description: A Helm chart for Kubernetes
 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.
-version: 0.2.146
+version: 0.2.147
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
 appVersion: 0.0.11
diff --git a/charts/datahub/subcharts/acryl-datahub-actions/README.md b/charts/datahub/subcharts/acryl-datahub-actions/README.md
@@ -19,6 +19,7 @@ Current chart version is `0.0.3`
 | image.args                                                                  | list                                                                                              | `[]`                          | Override the image's args.  Used to configure custom startup or shutdown behavior                                                                                                                                                            |
 | image.command                                                               | list                                                                                              | `[]`                          | Override the image's command.  Used to configure custom startup or shutdown behavior                                                                                                                                                         |
 | image.pullPolicy                                                            | string                                                                                            | `"IfNotPresent"`              |                                                                                                                                                                                                                                              |
+| image.registry                                                              | string                                                                                            | ``                            | Image registry override to be used by the job.                                                                                                                                                                                               |
 | image.repository                                                            | string                                                                                            | `"acryldata/datahub-actions"` |                                                                                                                                                                                                                                              |
 | image.tag                                                                   | string                                                                                            | `"v0.0.6"`                    |                                                                                                                                                                                                                                              |
 | imagePullSecrets                                                            | list                                                                                              | `[]`                          |                                                                                                                                                                                                                                              |

diff --git a/charts/datahub/subcharts/acryl-datahub-actions/templates/deployment.yaml b/charts/datahub/subcharts/acryl-datahub-actions/templates/deployment.yaml
@@ -55,7 +55,7 @@ spec:
       {{- end }}
       {{- if .Values.priorityClassName }}
       priorityClassName: "{{ .Values.priorityClassName }}"
-      {{- end }}      
+      {{- end }}
       initContainers:
       {{- if .Values.extraInitContainers }}
       {{- .Values.extraInitContainers | toYaml | nindent 6 }}
@@ -64,7 +64,7 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: {{ include "datahub.image" (dict "imageRegistry" .Values.global.imageRegistry "version" .Values.global.datahub.version "image" .Values.image) }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: http

diff --git a/charts/datahub/subcharts/acryl-datahub-actions/values.yaml b/charts/datahub/subcharts/acryl-datahub-actions/values.yaml
@@ -87,6 +87,8 @@ debug:
   enabled: false
 
 global:
+  imageRegistry: "docker.io"
+
   kafka:
     bootstrap:
       server: "broker:9092"

diff --git a/charts/datahub/subcharts/datahub-frontend/Chart.yaml b/charts/datahub/subcharts/datahub-frontend/Chart.yaml
@@ -12,7 +12,7 @@ description: A Helm chart for Kubernetes
 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.
-version: 0.2.158
+version: 0.2.159
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
 appVersion: v0.13.1