diff --git a/containers/proxy-helm/proxy-helm.changes.cbosdo.helm-fixes b/containers/proxy-helm/proxy-helm.changes.cbosdo.helm-fixes index 0c4f4ff26ba..a8f88132d41 100644 --- a/containers/proxy-helm/proxy-helm.changes.cbosdo.helm-fixes +++ b/containers/proxy-helm/proxy-helm.changes.cbosdo.helm-fixes @@ -1 +1,3 @@ +- Add registrySecret value to the helm chart for authentication + (bsc#1231157) - Fix labels indentation (bsc#1231150) diff --git a/containers/proxy-helm/templates/deployment.yaml b/containers/proxy-helm/templates/deployment.yaml index 70c89a23399..ab80ff2e587 100644 --- a/containers/proxy-helm/templates/deployment.yaml +++ b/containers/proxy-helm/templates/deployment.yaml @@ -15,6 +15,10 @@ spec: labels: app: uyuni-proxy spec: +{{- if .Values.registrySecret }} + imagePullSecrets: + - name: {{ .Values.registrySecret }} +{{- end }} containers: - name: httpd image: {{- include "deployment.container.image" (dict "name" "proxy-httpd" "global" .) | indent 1}} diff --git a/containers/proxy-helm/values.yaml b/containers/proxy-helm/values.yaml index 0bb54e93820..58aff4faa95 100644 --- a/containers/proxy-helm/values.yaml +++ b/containers/proxy-helm/values.yaml @@ -17,6 +17,10 @@ images: ## pullPolicy: "Always" +## registrySecret defines the name of secret to use to pull the images from the +## registry with authentication. Leave empty for no authentication. +registrySecret: "" + ## ingress defines the ingress that is used in the cluster. ## It can be either "nginx", "traefik" or any other value. ingress: "traefik" diff --git a/containers/server-helm/server-helm.changes.cbosdo.helm-fixes b/containers/server-helm/server-helm.changes.cbosdo.helm-fixes index 0c4f4ff26ba..a8f88132d41 100644 --- a/containers/server-helm/server-helm.changes.cbosdo.helm-fixes +++ b/containers/server-helm/server-helm.changes.cbosdo.helm-fixes @@ -1 +1,3 @@ +- Add registrySecret value to the helm chart for authentication + (bsc#1231157) - Fix labels indentation (bsc#1231150) diff --git a/containers/server-helm/templates/deployment.yaml b/containers/server-helm/templates/deployment.yaml index 592ed499ef7..d275083dfdf 100644 --- a/containers/server-helm/templates/deployment.yaml +++ b/containers/server-helm/templates/deployment.yaml @@ -15,6 +15,10 @@ spec: labels: app: uyuni spec: +{{- if .Values.registrySecret }} + imagePullSecrets: + - name: {{ .Values.registrySecret }} +{{- end }} initContainers: {{- if not .Values.migration }} - name: init-etc-tls diff --git a/containers/server-helm/values.yaml b/containers/server-helm/values.yaml index f954b6ee979..c55f6aab145 100644 --- a/containers/server-helm/values.yaml +++ b/containers/server-helm/values.yaml @@ -13,6 +13,10 @@ images: ## pullPolicy: "IfNotPresent" +## registrySecret defines the name of secret to use to pull the images from the +## registry with authentication. Leave empty for no authentication. +registrySecret: "" + ## uyuni server overall Persistent Volume access modes ## Must match those of existing PV or dynamic provisioner ## Ref: http://kubernetes.io/docs/user-guide/persistent-volumes/