From 51c6e55ddb6f1bb494b8a4d006a79003013161eb Mon Sep 17 00:00:00 2001 From: Jesse Horner Date: Fri, 11 Jun 2021 10:21:00 -0400 Subject: [PATCH] add support for registry proxy --- README.md | 4 ++++ templates/deployment.yaml | 14 ++++++++++++++ templates/secret.yaml | 7 +++++++ values.yaml | 7 +++++++ 4 files changed, 32 insertions(+) diff --git a/README.md b/README.md index 00f1fd5..3a67bd5 100644 --- a/README.md +++ b/README.md @@ -75,6 +75,10 @@ their default values. | `s3.secure` | Use HTTPS | `nil` | | `swift.authurl` | Swift authurl | `nil` | | `swift.container` | Swift container | `nil` | +| `proxy.enabled` | If true, registry will function as a proxy/mirror | `false` | +| `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` | | `nodeSelector` | node labels for pod assignment | `{}` | | `affinity` | affinity settings | `{}` | | `tolerations` | pod tolerations | `[]` | diff --git a/templates/deployment.yaml b/templates/deployment.yaml index a146d76..2c3d10a 100644 --- a/templates/deployment.yaml +++ b/templates/deployment.yaml @@ -154,6 +154,20 @@ spec: - name: REGISTRY_STORAGE_SWIFT_CONTAINER value: {{ required ".Values.swift.container is required" .Values.swift.container }} {{- end }} +{{- if .Values.proxy.enabled }} + - name: REGISTRY_PROXY_REMOTEURL + value: {{ required ".Values.proxy.remoteurl is required" .Values.proxy.remoteurl }} + - name: REGISTRY_PROXY_USERNAME + valueFrom: + secretKeyRef: + name: {{ template "docker-registry.fullname" . }}-secret + key: proxyUsername + - name: REGISTRY_PROXY_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "docker-registry.fullname" . }}-secret + key: proxyPassword +{{- end }} {{- if .Values.persistence.deleteEnabled }} - name: REGISTRY_STORAGE_DELETE_ENABLED value: "true" diff --git a/templates/secret.yaml b/templates/secret.yaml index c22fd30..2a5c902 100644 --- a/templates/secret.yaml +++ b/templates/secret.yaml @@ -35,3 +35,10 @@ data: swiftPassword: {{ .Values.secrets.swift.password | b64enc | quote }} {{- end }} {{- end }} + + {{- if .Values.proxy.username }} + proxyUsername: {{ .Values.proxy.username | b64enc | quote }} + {{- end }} + {{- if .Values.proxy.password }} + proxyPassword: {{ .Values.proxy.password | b64enc | quote }} + {{- end }} diff --git a/values.yaml b/values.yaml index 46ea691..1316644 100644 --- a/values.yaml +++ b/values.yaml @@ -97,6 +97,13 @@ secrets: # authurl: http://swift.example.com/ # container: my-container +# https://docs.docker.com/registry/recipes/mirror/ +proxy: + enabled: false + remoteurl: https://registry-1.docker.io + username: "" + password: "" + configData: version: 0.1 log: