From 5d3767e69ce7fc9a4e2be2e1fa5ebff16a7c8046 Mon Sep 17 00:00:00 2001 From: emsixteeen Date: Tue, 17 Apr 2018 10:32:00 -0400 Subject: [PATCH] quote boolean S3 environment variables (#5066) * add if statements for optional S3 env variables, and quote them because they are booleans * bump version, per CI request --- stable/docker-registry/Chart.yaml | 2 +- stable/docker-registry/templates/deployment.yaml | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/stable/docker-registry/Chart.yaml b/stable/docker-registry/Chart.yaml index 835c7a86ef..d28f76bc42 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 diff --git a/stable/docker-registry/templates/deployment.yaml b/stable/docker-registry/templates/deployment.yaml index 7084f784ce..3c47ee8732 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 }}