From 1ed9aa16365fd99b0457bb3830afcb7e2be7fde3 Mon Sep 17 00:00:00 2001 From: Michael Katzenellenbogen Date: Mon, 16 Apr 2018 15:13:29 -0400 Subject: [PATCH 1/2] add if statements for optional S3 env variables, and quote them because they are booleans --- stable/docker-registry/templates/deployment.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/stable/docker-registry/templates/deployment.yaml b/stable/docker-registry/templates/deployment.yaml index 7084f784cea3..3c47ee8732a7 100644 --- a/stable/docker-registry/templates/deployment.yaml +++ b/stable/docker-registry/templates/deployment.yaml @@ -84,10 +84,14 @@ spec: value: {{ required ".Values.s3.region is required" .Values.s3.region }} - name: REGISTRY_STORAGE_S3_BUCKET value: {{ required ".Values.s3.bucket is required" .Values.s3.bucket }} + {{- if .Values.s3.encrypt }} - name: REGISTRY_STORAGE_S3_ENCRYPT - value: {{ .Values.s3.encrypt }} + value: {{ .Values.s3.encrypt | quote }} + {{- end }} + {{- if .Values.s3.secure }} - name: REGISTRY_STORAGE_S3_SECURE - value: {{ .Values.s3.secure }} + value: {{ .Values.s3.secure | quote }} + {{- end }} {{- end }} volumeMounts: {{- if .Values.secrets.htpasswd }} From ead26693247e5dd85470707531db361ac83eb782 Mon Sep 17 00:00:00 2001 From: Michael Katzenellenbogen Date: Mon, 16 Apr 2018 16:01:05 -0400 Subject: [PATCH 2/2] bump version, per CI request --- stable/docker-registry/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stable/docker-registry/Chart.yaml b/stable/docker-registry/Chart.yaml index 835c7a86ef11..d28f76bc42ae 100644 --- a/stable/docker-registry/Chart.yaml +++ b/stable/docker-registry/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: A Helm chart for Docker Registry name: docker-registry -version: 1.1.1 +version: 1.1.2 appVersion: 2.6.2 home: https://hub.docker.com/_/registry/ icon: https://hub.docker.com/public/images/logos/mini-logo.svg