feat: Adds possibility to set image pull secrets in all charts

fix: linting errors
1Password · Aug 21, 2024 · bd87082 · bd87082
1 parent 282df93
commit bd87082
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 20 deletions.
diff --git a/charts/connect/README.md b/charts/connect/README.md
@@ -55,6 +55,7 @@ helm install --set connect.applicationName=connect connect ./connect
 
 | Key                                 | Type       | Default                            | Description                                                                                                                                                                                        |
 |-------------------------------------|------------|------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| global.imagePullSecrets             | array      | `[]`                               | Global list of secret names to use as image pull secrets for all pod specs in the chart. Secrets must exist in the same namespace                                                                  |
 | connect.create                      | boolean    | `true`                             | Denotes whether the 1Password Connect server will be deployed                                                                                                                                      |
 | connect.replicas                    | integer    | `1`                                | The number of replicas to run the 1Password Connect deployment                                                                                                                                     |
 | connect.applicationName             | string     | `"onepassword-connect"`            | The name of 1Password Connect Application                                                                                                                                                          |

diff --git a/charts/connect/templates/connect-deployment.yaml b/charts/connect/templates/connect-deployment.yaml
@@ -33,10 +33,10 @@ spec:
       {{- toYaml . | nindent 8 }}
       {{- end }}
     spec:
-{{- with .Values.connect.nodeSelector }}
+      {{- with .Values.connect.nodeSelector }}
       nodeSelector:
-{{ toYaml . | indent 8 }}
-{{- end }}
+      {{ toYaml . | indent 8 }}
+      {{- end }}
       volumes:
         - name: {{ .Values.connect.dataVolume.name }}
           {{ .Values.connect.dataVolume.type }}: {{- toYaml .Values.connect.dataVolume.values | nindent 12 }}
@@ -49,7 +49,7 @@ spec:
             secretName: {{ .Values.connect.tls.secret }}
         {{- end }}
       tolerations:
-{{ toYaml .Values.connect.tolerations | indent 8 }}
+        {{ toYaml .Values.connect.tolerations | indent 8 }}
       containers:
         - name: {{ .Values.connect.api.name }}
           image: {{ .Values.connect.api.imageRepository }}:{{ tpl .Values.connect.version . }}
@@ -84,10 +84,10 @@ spec:
             - name: OP_LOG_LEVEL
               value: "{{ .Values.connect.api.logLevel }}"
             {{- include "onepassword-connect.profilerConfig" . | indent 12 -}}
-            {{- range .Values.connect.customEnvVars}}
+            {{- range .Values.connect.customEnvVars }}
             - name: {{ .name }}
               value: {{ .value }}
-            {{- end }} 
+            {{- end }}
           {{- if .Values.connect.probes.readiness }}
           readinessProbe:
             httpGet:
@@ -166,4 +166,10 @@ spec:
               mountPath: /data
               subPath: profiler
         {{- end }}
-{{- end }}
+      {{- with .Values.global.imagePullSecrets }}
+      imagePullSecrets:
+      {{- range . }}
+        - name: {{ . | quote }}
+      {{- end }}
+      {{- end }}
+{{- end }}
diff --git a/charts/connect/templates/operator-deployment.yaml b/charts/connect/templates/operator-deployment.yaml
@@ -50,8 +50,8 @@ spec:
             capabilities:
               drop:
                 - all
-          command: ["/manager"]
-          args: [--zap-log-level={{ .Values.operator.logLevel }}]
+          command: [ "/manager" ]
+          args: [ --zap-log-level={{ .Values.operator.logLevel }}]
           env:
             - name: WATCH_NAMESPACE
               value: {{ default "" (tpl (include "helm-toolkit.utils.joinListWithComma" .Values.operator.watchNamespace) .) }}
@@ -75,7 +75,13 @@ spec:
             {{- range .Values.operator.customEnvVars}}
             - name: {{ .name }}
               value: {{ .value }}
-            {{- end }} 
+            {{- end }}
           resources:
             {{- toYaml .Values.operator.resources | nindent 12 }}
+      {{- with .Values.global.imagePullSecrets }}
+      imagePullSecrets:
+      {{- range . }}
+        - name: {{ . | quote }}
+      {{- end }}
+      {{- end }}
 {{- end }}
diff --git a/charts/connect/values.yaml b/charts/connect/values.yaml
@@ -5,6 +5,11 @@
 # global common labels, applied to all ressources
 commonLabels: {}
 
+global:
+  # global list of secret names to use as image pull secrets for all pod specs in the chart
+  # secrets must exist in the same namespace
+  imagePullSecrets: []
+
 # This section of values is for 1Password Connect API and Sync Configuration
 connect:
   # Denotes whether the 1Password Connect server will be deployed

diff --git a/charts/secrets-injector/README.md b/charts/secrets-injector/README.md
@@ -30,15 +30,16 @@ $ helm install --set injector.applicationName=injector injector ./secrets-inject
 
 ### Values
 
-| Key                      | Type    | Default                                   | Description                                                                                                                               |
-| ------------------------ | ------- | ----------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- |
-| injector.applicationName | string  | `"secrets-injector"`                      | The name of 1Password Kubernetes Secrets Injector Application                                                                             |
-| injector.imagePullPolicy | string  | `"IfNotPresent"`                          | The 1Password Secrets Injector docker image policy. `"IfNotPresent"` means the image is pulled only if it is not already present locally. |
-| injector.imageRepository | string  | `"1password/kubernetes-secrets-injector"` | The 1Password Secrets Injector docker image repository                                                                                    |
-| injector.port            | string  | `443`                                     | The port the Secrets Injector exposes                                                                                                     |
-| injector.targetPort      | integer | `8443`                                    | The port the Secrets Injector API sends requests to the pod                                                                               |
-| injector.version         | string  | `{{.Chart.AppVersion}}`                   | The 1Password Secrets Injector version to pull.                                                                                           |
-| injector.customEnvVars   | array   | `[]`                                      | Custom Environment Variables for the 1Password Secrets Injector container that are not specified in this helm chart.                      |
+| Key                       | Type    | Default                                   | Description                                                                                                                               |
+|---------------------------|---------|-------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------|
+| injector.applicationName  | string  | `"secrets-injector"`                      | The name of 1Password Kubernetes Secrets Injector Application                                                                             |
+| injector.imagePullPolicy  | string  | `"IfNotPresent"`                          | The 1Password Secrets Injector docker image policy. `"IfNotPresent"` means the image is pulled only if it is not already present locally. |
+| injector.imagePullSecrets | array   | `[]`                                      | Global list of secret names to use as image pull secrets for all pod specs in the chart. Secrets must exist in the same namespace         |
+| injector.imageRepository  | string  | `"1password/kubernetes-secrets-injector"` | The 1Password Secrets Injector docker image repository                                                                                    |
+| injector.port             | string  | `443`                                     | The port the Secrets Injector exposes                                                                                                     |
+| injector.targetPort       | integer | `8443`                                    | The port the Secrets Injector API sends requests to the pod                                                                               |
+| injector.version          | string  | `{{.Chart.AppVersion}}`                   | The 1Password Secrets Injector version to pull.                                                                                           |
+| injector.customEnvVars    | array   | `[]`                                      | Custom Environment Variables for the 1Password Secrets Injector container that are not specified in this helm chart.                      |
 
 #### Custom Environment Variables
 

diff --git a/charts/secrets-injector/templates/deployment.yaml b/charts/secrets-injector/templates/deployment.yaml
@@ -35,8 +35,14 @@ spec:
           {{- range .Values.injector.customEnvVars}}
           - name: {{ .name }}
             value: {{ .value }}
-          {{- end }} 
+          {{- end }}
           lifecycle:
             preStop:
               exec:
                 command: [ "/bin/sh", "-c", "/prestop.sh" ]
+      {{- with .Values.injector.imagePullSecrets }}
+      imagePullSecrets:
+      {{- range . }}
+        - name: {{ . | quote }}
+      {{- end }}
+      {{- end }}
diff --git a/charts/secrets-injector/values.yaml b/charts/secrets-injector/values.yaml
@@ -1,6 +1,7 @@
 injector:
   applicationName: secrets-injector
   imagePullPolicy: IfNotPresent
+  imagePullSecrets: []
   imageRepository: 1password/kubernetes-secrets-injector
   port: 443
   targetPort: 8443