From 02691aa8443ef4613b8f23be32d0f5ec2d63aed5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Rodr=C3=ADguez=20Hern=C3=A1ndez?= Date: Tue, 12 Mar 2019 15:58:56 +0100 Subject: [PATCH] [stable/ghost] Add pullSecrets to volumePermissions image (#12125) Signed-off-by: Carlos Rodriguez Hernandez --- stable/ghost/Chart.yaml | 2 +- stable/ghost/templates/_helpers.tpl | 10 ++++++++-- stable/ghost/values.yaml | 7 ++++++- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/stable/ghost/Chart.yaml b/stable/ghost/Chart.yaml index 220479381f..c852d6b780 100644 --- a/stable/ghost/Chart.yaml +++ b/stable/ghost/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: ghost -version: 6.4.0 +version: 6.5.0 appVersion: 2.16.4 description: A simple, powerful publishing platform that allows you to share your stories with the world keywords: diff --git a/stable/ghost/templates/_helpers.tpl b/stable/ghost/templates/_helpers.tpl index 083ec9bcbe..dcdbbb06ae 100644 --- a/stable/ghost/templates/_helpers.tpl +++ b/stable/ghost/templates/_helpers.tpl @@ -125,7 +125,7 @@ imagePullSecrets: {{- range .Values.global.imagePullSecrets }} - name: {{ . }} {{- end }} -{{- else if or .Values.image.pullSecrets .Values.metrics.image.pullSecrets }} +{{- else if or .Values.image.pullSecrets .Values.metrics.image.pullSecrets .Values.volumePermissions.image.pullSecrets }} imagePullSecrets: {{- range .Values.image.pullSecrets }} - name: {{ . }} @@ -133,8 +133,11 @@ imagePullSecrets: {{- range .Values.metrics.image.pullSecrets }} - name: {{ . }} {{- end }} +{{- range .Values.volumePermissions.image.pullSecrets }} + - name: {{ . }} +{{- end }} {{- end -}} -{{- else if or .Values.image.pullSecrets .Values.metrics.image.pullSecrets }} +{{- else if or .Values.image.pullSecrets .Values.metrics.image.pullSecrets .Values.volumePermissions.image.pullSecrets }} imagePullSecrets: {{- range .Values.image.pullSecrets }} - name: {{ . }} @@ -142,5 +145,8 @@ imagePullSecrets: {{- range .Values.metrics.image.pullSecrets }} - name: {{ . }} {{- end }} +{{- range .Values.volumePermissions.image.pullSecrets }} + - name: {{ . }} +{{- end }} {{- end -}} {{- end -}} diff --git a/stable/ghost/values.yaml b/stable/ghost/values.yaml index 5b8eef752f..9dd926512a 100644 --- a/stable/ghost/values.yaml +++ b/stable/ghost/values.yaml @@ -26,7 +26,6 @@ image: # pullSecrets: # - myRegistryKeySecretName -## ## Init containers parameters: ## volumePermissions: Change the owner of the persist volume mountpoint to RunAsUser:fsGroup ## @@ -36,6 +35,12 @@ volumePermissions: repository: bitnami/minideb tag: latest pullPolicy: Always + ## Optionally specify an array of imagePullSecrets. + ## Secrets must be manually created in the namespace. + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ + ## + # pullSecrets: + # - myRegistryKeySecretName ## Ghost protocol, host and path to create application URLs ## ref: https://github.com/bitnami/bitnami-docker-ghost#configuration