Add support for "existing secrets" (#41)

* Add support for "existing secrets" * Clarify use of existingSecret
8gears · Jun 29, 2023 · 33dd27c · 33dd27c
1 parent 675f7a4
commit 33dd27c
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -112,6 +112,9 @@ config: # Dict with all n8n config options
 # postgresdb:
 # database: n8n
 # host: localhost
+#
+# existingSecret and secret are exclusive, with existingSecret taking priority.
+# existingSecret: "" # Use an existing Kubernetes secret, e.g created by hand or Vault operator.
 secret: # Dict with all n8n config options, unlike config the values here will end up in a secret.
 # database:
 # postgresdb:

diff --git a/templates/deployment.webhooks.yaml b/templates/deployment.webhooks.yaml
@@ -84,12 +84,12 @@ spec:
  configMap:
  name: {{ include "n8n.fullname" . }}
  {{- end }}
- {{- if .Values.secret }}
+ {{- if or (.Values.secret) (.Values.existingSecret) }}
  - name: secret-volume
  secret:
- secretName: {{ include "n8n.fullname" . }}
+ secretName: {{ if .Values.existingSecret }}{{ .Values.existingSecret }}{{ else }}{{ include "n8n.fullname" . }}{{ end }}
  items:
  - key: "secret.json"
  path: "secret.json"
  {{- end }}
-{{- end }}
+{{- end }}
diff --git a/templates/deployment.worker.yaml b/templates/deployment.worker.yaml
@@ -84,12 +84,12 @@ spec:
  configMap:
  name: {{ include "n8n.fullname" . }}
  {{- end }}
- {{- if .Values.secret }}
+ {{- if or (.Values.secret) (.Values.existingSecret) }}
  - name: secret-volume
  secret:
- secretName: {{ include "n8n.fullname" . }}
+ secretName: {{ if .Values.existingSecret }}{{ .Values.existingSecret }}{{ else }}{{ include "n8n.fullname" . }}{{ end }}
  items:
  - key: "secret.json"
  path: "secret.json"
  {{- end }}
- {{- end }}
+ {{- end }}
diff --git a/templates/deployment.yaml b/templates/deployment.yaml
@@ -91,10 +91,10 @@ spec:
  configMap:
  name: {{ include "n8n.fullname" . }}
  {{- end }}
- {{- if .Values.secret }}
+ {{- if or (.Values.secret) (.Values.existingSecret) }}
  - name: secret-volume
  secret:
- secretName: {{ include "n8n.fullname" . }}
+ secretName: {{ if .Values.existingSecret }}{{ .Values.existingSecret }}{{ else }}{{ include "n8n.fullname" . }}{{ end }}
  items:
  - key: "secret.json"
  path: "secret.json"

diff --git a/values.yaml b/values.yaml
@@ -9,7 +9,8 @@ config:
  pruneData: "true" # prune executions by default
  pruneDataMaxAge: 3760 # Per defaut we store 1 year of history
 
-
+# existingSecret and secret are exclusive, with existingSecret taking priority.
+# existingSecret: "" # Use an existing Kubernetes secret, e.g created by hand or Vault operator.
 secret: # Dict with all n8n json config options, unlike config the values here will end up in a secret.
 
 # Typical Example of a config in combination with a secret.