Merge branch 'main' into helm-ca-certs

ericpaulsen · ericpaulsen · commit 3dd81fe58a9d · 2022-10-24T14:05:29.000-04:00
merge in main
diff --git a/helm/templates/coder.yaml b/helm/templates/coder.yaml
@@ -28,6 +28,10 @@ spec:
     spec:
       serviceAccountName: coder
       restartPolicy: Always
+      {{- with .Values.coder.image.pullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       terminationGracePeriodSeconds: 60
       containers:
         - name: coder
diff --git a/helm/values.yaml b/helm/values.yaml
@@ -17,6 +17,10 @@ coder:
     # coder.image.pullPolicy -- The pull policy to use for the image. See:
     # https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy
     pullPolicy: IfNotPresent
+    # coder.image.pullSecret -- The secret used for pulling the Coder image from
+    # a private registry.
+    pullSecrets: []
+    #  - name: "pull-secret"
 
   # coder.annotations -- The Deployment annotations. See:
   # https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
