feat: Add support for existingSecret for htpasswd authentication

README.md

@@ -134,6 +134,8 @@ and their default values.
 | `fullnameOverride`                 | Set resource fullname override                                                   | `""`                           |
 | `useSecretHtpasswd`                | Use htpasswd from `.Values.secrets.htpasswd`. This require helm v3.2.0 or above. | `false`                        |
 | `secrets.htpasswd`                 | user and password list to generate htpasswd.                                     | `[]`                           |
+| `secrets.existingSecretHtpasswd`   | Existing secret containing htpasswd file (alternative to `secrets.htpasswd`)     | `""`                           |
+| `secrets.existingSecretHtpasswdKey` | Key in the existing secret that contains the htpasswd file content              | `"htpasswd"`                   |
 | `ingress.enabled`                  | Enable/Disable Ingress                                                           | `false`                        |
 | `ingress.className`                | Ingress Class Name (k8s `>=1.18` required)                                       | `""`                           |
 | `ingress.labels`                   | Ingress Labels                                                                   | `{}`                           |
@@ -191,6 +193,38 @@ secrets:
 This config will create a htpasswd file with user "verdaccio", If in config
 'htpasswd' auth is used. You can login using this credentials.
 
+### Use existing secret for htpasswd
+
+Instead of providing plain text credentials in `values.yaml`, you can reference an
+existing Kubernetes secret containing the htpasswd file. This is more secure as it
+avoids storing passwords in plain text in your values files.
+
+When `secrets.existingSecretHtpasswd` is set, the chart will use the specified
+secret instead of generating one from `secrets.htpasswd`. The secret must contain
+a key with the htpasswd file content (default key: `htpasswd`, configurable via
+`secrets.existingSecretHtpasswdKey`).
+
+#### Example
+
+```yaml
+secrets:
+  # Reference an existing secret instead of providing plain text credentials
+  existingSecretHtpasswd: "my-htpasswd-secret"
+  existingSecretHtpasswdKey: "htpasswd"  # Optional, defaults to "htpasswd"
+```
+
+The existing secret should contain the htpasswd file content in the specified key.
+You can create such a secret using:
+
+```bash
+kubectl create secret generic my-htpasswd-secret \
+  --from-file=htpasswd=/path/to/htpasswd
+```
+
+> **Note**: If both `secrets.htpasswd` and `secrets.existingSecretHtpasswd` are set,
+> `secrets.existingSecretHtpasswd` takes precedence and no secret will be generated
+> from `secrets.htpasswd`.
+
 ### Custom ConfigMap
 
 When creating a new chart with this chart as a dependency, CustomConfigMap can

charts/verdaccio/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 description: A lightweight private node.js proxy registry
 name: verdaccio
-version: 4.28.0
+version: 4.29.0
 appVersion: 6.2.3
 home: https://verdaccio.org
 icon: https://cdn.verdaccio.dev/logos/default.png

charts/verdaccio/templates/deployment.yaml

@@ -32,7 +32,12 @@ spec:
     metadata:
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
+        {{- if and .Values.secrets.htpasswd (not .Values.secrets.existingSecretHtpasswd) }}
         checksum/htpasswd-secret: {{ toJson .Values.secrets.htpasswd | sha256sum }}
+        {{- end }}
+        {{- if .Values.secrets.existingSecretHtpasswd }}
+        checksum/htpasswd-secret: {{ .Values.secrets.existingSecretHtpasswd }}-{{ .Values.secrets.existingSecretHtpasswdKey | default "htpasswd" }}
+        {{- end }}
         {{- if .Values.secretEnvVars }}
         checksum/env-secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
         {{- end }}
@@ -129,10 +134,10 @@ spec:
             - mountPath: /verdaccio/storage
               name: storage
               readOnly: false
-            {{- if .Values.secrets.htpasswd }}
+            {{- if or .Values.secrets.htpasswd .Values.secrets.existingSecretHtpasswd }}
             - mountPath: /verdaccio/storage/htpasswd
               name: htpasswd
-              subPath: htpasswd
+              subPath: {{ if .Values.secrets.existingSecretHtpasswd }}{{ .Values.secrets.existingSecretHtpasswdKey | default "htpasswd" }}{{ else }}htpasswd{{ end }}
               readOnly: true
             {{- end }}
             - mountPath: /verdaccio/conf
@@ -146,10 +151,10 @@ spec:
       - name: config
         configMap:
           name: {{ .Values.existingConfigMap | default (include "verdaccio.fullname" .) }}
-      {{- if .Values.secrets.htpasswd }}
+      {{- if or .Values.secrets.htpasswd .Values.secrets.existingSecretHtpasswd }}
       - name: htpasswd
         secret:
-          secretName: {{ include "verdaccio.fullname" . }}-htpasswd
+          secretName: {{ if .Values.secrets.existingSecretHtpasswd }}{{ .Values.secrets.existingSecretHtpasswd }}{{ else }}{{ include "verdaccio.fullname" . }}-htpasswd{{ end }}
       {{- end }}
       {{- if .Values.cachingNginx.enabled }}
       - name: config-volume

charts/verdaccio/templates/htpasswd-secret.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.secrets.htpasswd }}
+{{- if and .Values.secrets.htpasswd (not .Values.secrets.existingSecretHtpasswd) }}
 apiVersion: v1
 kind: Secret
 type: Opaque

charts/verdaccio/templates/statefulset.yaml

@@ -25,7 +25,12 @@ spec:
     metadata:
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
+        {{- if and .Values.secrets.htpasswd (not .Values.secrets.existingSecretHtpasswd) }}
         checksum/htpasswd-secret: {{ toJson .Values.secrets.htpasswd | sha256sum }}
+        {{- end }}
+        {{- if .Values.secrets.existingSecretHtpasswd }}
+        checksum/htpasswd-secret: {{ .Values.secrets.existingSecretHtpasswd }}-{{ .Values.secrets.existingSecretHtpasswdKey | default "htpasswd" }}
+        {{- end }}
         {{- if .Values.secretEnvVars }}
         checksum/env-secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
         {{- end }}
@@ -122,10 +127,10 @@ spec:
             - mountPath: /verdaccio/storage
               name: storage
               readOnly: false
-            {{- if .Values.secrets.htpasswd }}
+            {{- if or .Values.secrets.htpasswd .Values.secrets.existingSecretHtpasswd }}
             - mountPath: /verdaccio/storage/htpasswd
               name: htpasswd
-              subPath: htpasswd
+              subPath: {{ if .Values.secrets.existingSecretHtpasswd }}{{ .Values.secrets.existingSecretHtpasswdKey | default "htpasswd" }}{{ else }}htpasswd{{ end }}
               readOnly: true
             {{- end }}
             - mountPath: /verdaccio/conf
@@ -139,10 +144,10 @@ spec:
       - name: config
         configMap:
           name: {{ .Values.existingConfigMap | default (include "verdaccio.fullname" .) }}
-      {{- if .Values.secrets.htpasswd }}
+      {{- if or .Values.secrets.htpasswd .Values.secrets.existingSecretHtpasswd }}
       - name: htpasswd
         secret:
-          secretName: {{ include "verdaccio.fullname" . }}-htpasswd
+          secretName: {{ if .Values.secrets.existingSecretHtpasswd }}{{ .Values.secrets.existingSecretHtpasswd }}{{ else }}{{ include "verdaccio.fullname" . }}-htpasswd{{ end }}
       {{- end }}
       {{- if .Values.cachingNginx.enabled }}
       - name: config-volume

charts/verdaccio/values.yaml

@@ -264,6 +264,12 @@ secrets:
   #   password: "test"
   # - username: "blah"
   #   password: "blah"
+  # Existing secret containing htpasswd file
+  # If set, the secret will be used instead of generating one from secrets.htpasswd
+  # The secret must contain a key with the htpasswd file content (default key: "htpasswd")
+  existingSecretHtpasswd: ""
+  # Key in the existing secret that contains the htpasswd file content
+  existingSecretHtpasswdKey: "htpasswd"
 
 # Annotations to set on the deployment
 annotations: {}