Merge branch 'main' into production

porter-dev · Dec 5, 2024 · 3621830 · 3621830
2 parents 584277d + 12db372
commit 3621830
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/applications/job/templates/cronjob.yaml b/applications/job/templates/cronjob.yaml
@@ -75,6 +75,9 @@ spec:
           {{- if and .Values.image .Values.image.imagePullSecret }}
           imagePullSecrets:
             - name: {{ .Values.image.imagePullSecret }}
+          {{- else if and .Values.global  .Values.global.image .Values.global.image.imagePullSecret }}
+          imagePullSecrets:
+            - name: {{ .Values.global.image.imagePullSecret }}
           {{- end }}
           containers:
             - name: {{ .Chart.Name }}

diff --git a/applications/web/Chart.yaml b/applications/web/Chart.yaml
@@ -10,4 +10,4 @@ keywords:
   - web
 name: web
 type: application
-version: 0.206.0
+version: 0.207.0
diff --git a/applications/web/templates/deployment.yaml b/applications/web/templates/deployment.yaml
@@ -88,6 +88,9 @@ spec:
       {{- if and .Values.image .Values.image.imagePullSecret }}
       imagePullSecrets:
         - name: {{ .Values.image.imagePullSecret }}
+      {{- else if and .Values.global  .Values.global.image .Values.global.image.imagePullSecret }}
+      imagePullSecrets:
+        - name: {{ .Values.global.image.imagePullSecret }}
       {{- end }}
       initContainers:
         # this is used for ensuring the kubelet is ready on new nodes, and can injected any downward API keys

diff --git a/applications/worker/templates/deployment.yaml b/applications/worker/templates/deployment.yaml
@@ -65,6 +65,9 @@ spec:
       {{- if and .Values.image .Values.image.imagePullSecret }}
       imagePullSecrets:
         - name: {{ .Values.image.imagePullSecret }}
+      {{- else if and .Values.global  .Values.global.image .Values.global.image.imagePullSecret }}
+      imagePullSecrets:
+        - name: {{ .Values.global.image.imagePullSecret }}
       {{- end }}
       initContainers:
         # this is used for ensuring the kubelet is ready on new nodes, and can injected any downward API keys