feat: imagePullSecrets support

Signed-off-by: Lester Guerzon <[email protected]>
guerzon · Sep 9, 2024 · 5c4acc8 · 5c4acc8
1 parent 46c7e41
commit 5c4acc8
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 7 deletions.
diff --git a/charts/vaultwarden/Chart.yaml b/charts/vaultwarden/Chart.yaml
@@ -13,5 +13,5 @@ maintainers:
   - name: guerzon
     email: [email protected]
     url: https://github.com/guerzon
-version: 0.28.0
+version: 0.29.0
 kubeVersion: ">=1.12.0-0"
diff --git a/charts/vaultwarden/README.md b/charts/vaultwarden/README.md
@@ -35,9 +35,11 @@ Example that uses the Alpine-based image `1.24.0-alpine` and an existing secret
 
 ```yaml
 image:
+  registry: ghcr.io
+  repository: guerzon/vaultwarden
   tag: "1.24.0-alpine"
   pullSecrets:
-    - myRegKey
+    - name: myRegKey
 ```
 
 **Important**: specify the URL used by users with the `domain` variable, otherwise, some functionalities might not work:
@@ -318,7 +320,7 @@ helm -n $NAMESPACE uninstall $RELEASE_NAME
 | `image.repository`      | Vaultwarden image repository                                                              | `vaultwarden/server` |
 | `image.tag`             | Vaultwarden image tag                                                                     | `1.32.0-alpine`      |
 | `image.pullPolicy`      | Vaultwarden image pull policy                                                             | `IfNotPresent`       |
-| `image.pullSecrets`     | Specify docker-registry secret names                                                      | `[]`                 |
+| `image.pullSecrets`     | Specify docker-registry secrets                                                           | `[]`                 |
 | `image.extraSecrets`    | Vaultwarden image extra secrets                                                           | `[]`                 |
 | `image.extraVars`       | Vaultwarden image extra vars                                                              | `[]`                 |
 | `fullnameOverride`      | String to override the application name.                                                  | `""`                 |

diff --git a/charts/vaultwarden/ci/test-values.yaml b/charts/vaultwarden/ci/test-values.yaml
@@ -12,7 +12,7 @@ adminToken:
 
 image:
   pullSecrets:
-    - myRegKey
+    - name: myRegKey
 
 yubico:
   clientId: "ABCDE"

diff --git a/charts/vaultwarden/templates/_podSpec.tpl b/charts/vaultwarden/templates/_podSpec.tpl
@@ -174,4 +174,8 @@ containers:
 {{- if .Values.serviceAccount.create }}
 serviceAccountName: {{ .Values.serviceAccount.name }}
 {{- end }}
+{{- with .Values.image.pullSecrets }}
+imagePullSecrets:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
 {{- end }}
diff --git a/charts/vaultwarden/values.yaml b/charts/vaultwarden/values.yaml
@@ -18,11 +18,11 @@ image:
   ## ref: https://kubernetes.io/docs/user-guide/images/#pre-pulling-images
   ##
   pullPolicy: IfNotPresent
-  ## @param image.pullSecrets Specify docker-registry secret names
+  ## @param image.pullSecrets Specify docker-registry secrets
   ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
   ## Example:
   ## pullSecrets:
-  ##   - myRegistryKeySecretName
+  ##   - name: myRegistryKeySecretName
   ##
   pullSecrets: []
   ## @param image.extraSecrets Vaultwarden image extra secrets

diff --git a/demo.yaml b/demo.yaml
@@ -15,4 +15,4 @@ adminToken:
 
 image:
   pullSecrets:
-    - myRegKey
+    - name: myRegKey