Merge remote-tracking branch 'upstream/main' into main

porter-dev · Mar 27, 2024 · ce1c487 · ce1c487
2 parents 9f73097 + c01dad7
commit ce1c487
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 1 deletion.
diff --git a/addons/metabase/templates/service.yaml b/addons/metabase/templates/service.yaml
@@ -3,6 +3,7 @@ kind: Service
 metadata:
   name: {{ include "docker-template.fullname" . }}
   labels:
+    porter.run/tailscale-svc: "true"
     {{- include "docker-template.labels" . | nindent 4 }}
 spec:
   {{ if .Values.ingress.enabled }}

diff --git a/applications/job/templates/cronjob.yaml b/applications/job/templates/cronjob.yaml
@@ -59,6 +59,10 @@ spec:
           {{ else }}
           serviceAccountName: {{ include "docker-template.serviceAccountName" . }}
           {{- end }}
+          {{- if and .Values.image .Values.image.imagePullSecret }}
+          imagePullSecrets:
+            - name: {{ .Values.image.imagePullSecret }}
+          {{- end }}
           containers:
           - name: {{ .Chart.Name }}
             {{- if .Values.global }}

diff --git a/applications/job/templates/hook-configmap.yaml b/applications/job/templates/hook-configmap.yaml
@@ -67,6 +67,10 @@ data:
             options:
               - name: edns0
           {{- end }}
+          {{- if and .Values.image .Values.image.imagePullSecret }}
+          imagePullSecrets:
+            - name: {{ .Values.image.imagePullSecret }}
+          {{- end }}
           containers:
           - name: {{ .Chart.Name }}
             {{- if .Values.global }}

diff --git a/applications/job/templates/hook.yaml b/applications/job/templates/hook.yaml
@@ -23,6 +23,10 @@ spec:
     spec:
       serviceAccountName: {{ include "docker-template.fullname" . }}
       restartPolicy: Never
+      {{- if and .Values.image .Values.image.imagePullSecret }}
+      imagePullSecrets:
+        - name: {{ .Values.image.imagePullSecret }}
+      {{- end }}
       containers:
       - name: job-manager
         image: public.ecr.aws/o1j4x7p4/job-manager:latest

diff --git a/applications/job/values.yaml b/applications/job/values.yaml
@@ -14,6 +14,8 @@ image:
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
   tag: latest
+  # A single imagePullSecret that will be injected into the deployment; only use in extreme cases, else it must be left blank. 
+  imagePullSecret:
 
 serviceAccount:
   # Specifies whether a service account should be created

diff --git a/applications/web/templates/deployment-blue-green.yaml b/applications/web/templates/deployment-blue-green.yaml
@@ -35,6 +35,10 @@ spec:
         options:
           - name: edns0
       {{- end }}
+      {{- if and $.Values.image $.Values.image.imagePullSecret }}
+      imagePullSecrets:
+        - name: {{ $.Values.image.imagePullSecret }}
+      {{- end }}
       containers:
         - name: {{ $.Chart.Name }}
           securityContext:

diff --git a/applications/web/templates/deployment.yaml b/applications/web/templates/deployment.yaml
@@ -49,6 +49,10 @@ spec:
         options:
           - name: edns0
       {{- end }}
+      {{- if and .Values.image .Values.image.imagePullSecret }}
+      imagePullSecrets:
+        - name: {{ .Values.image.imagePullSecret }}
+      {{- end }}
       containers:
         - name: {{ .Chart.Name }}
           securityContext:
@@ -353,7 +357,6 @@ spec:
             mountPath: /secrets/
             readOnly: true
         {{ end }}
-
       {{- if gt (len .Values.nodeSelector) 0}}
       nodeSelector:
         {{- range $k, $v := .Values.nodeSelector }}

diff --git a/applications/web/values.yaml b/applications/web/values.yaml
@@ -22,6 +22,8 @@ image:
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
   tag: latest
+  # A single imagePullSecret that will be injected into the deployment; only use in extreme cases, else it must be left blank. 
+  imagePullSecret:
 
 podLabels: {}
 

diff --git a/applications/worker/templates/deployment.yaml b/applications/worker/templates/deployment.yaml
@@ -50,6 +50,10 @@ spec:
         options:
           - name: edns0
       {{- end }}
+      {{- if and .Values.image .Values.image.imagePullSecret }}
+      imagePullSecrets:
+        - name: {{ .Values.image.imagePullSecret }}
+      {{- end }}
       containers:
         - name: {{ .Chart.Name }}
           securityContext:

diff --git a/applications/worker/values.yaml b/applications/worker/values.yaml
@@ -20,6 +20,8 @@ image:
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
   tag: latest
+  # A single imagePullSecret that will be injected into the deployment; only use in extreme cases, else it must be left blank. 
+  imagePullSecret:
 
 podLabels: {}