From 5a68bb595a1cc0dbb0aa65a6a2dad5c31a7e710b Mon Sep 17 00:00:00 2001 From: Joao Andrade Date: Mon, 2 Aug 2021 18:02:38 +0100 Subject: [PATCH] Add support for external proxy secrets --- README.md | 1 + templates/deployment.yaml | 4 ++-- values.yaml | 3 +++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3a67bd5..47f9a7b 100644 --- a/README.md +++ b/README.md @@ -79,6 +79,7 @@ their default values. | `proxy.remoteurl` | Remote registry URL to proxy requests to | `https://registry-1.docker.io` | | `proxy.username` | Remote registry login username | `nil` | | `proxy.password` | Remote registry login password | `nil` | +| `proxy.secretRef` | The ref for an external secret containing the proxyUsername and proxyPassword keys | `""` | | `nodeSelector` | node labels for pod assignment | `{}` | | `affinity` | affinity settings | `{}` | | `tolerations` | pod tolerations | `[]` | diff --git a/templates/deployment.yaml b/templates/deployment.yaml index 2c3d10a..b9b33ae 100644 --- a/templates/deployment.yaml +++ b/templates/deployment.yaml @@ -160,12 +160,12 @@ spec: - name: REGISTRY_PROXY_USERNAME valueFrom: secretKeyRef: - name: {{ template "docker-registry.fullname" . }}-secret + name: {{ if .Values.proxy.secretRef }}{{ .Values.proxy.secretRef }}{{ else }}{{ template "docker-registry.fullname" . }}-secret{{ end }} key: proxyUsername - name: REGISTRY_PROXY_PASSWORD valueFrom: secretKeyRef: - name: {{ template "docker-registry.fullname" . }}-secret + name: {{ if .Values.proxy.secretRef }}{{ .Values.proxy.secretRef }}{{ else }}{{ template "docker-registry.fullname" . }}-secret{{ end }} key: proxyPassword {{- end }} {{- if .Values.persistence.deleteEnabled }} diff --git a/values.yaml b/values.yaml index 1316644..11470f0 100644 --- a/values.yaml +++ b/values.yaml @@ -103,6 +103,9 @@ proxy: remoteurl: https://registry-1.docker.io username: "" password: "" + # the ref for a secret stored outside of this chart + # Keys: proxyUsername, proxyPassword + secretRef: "" configData: version: 0.1