From e4bbae03c92169ef1bef48f046ea45e3d567f7b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Louis=20Hau=C3=9Fknecht?= Date: Thu, 24 Aug 2023 14:50:49 +0000 Subject: [PATCH] Add imagePullSecrets to the multicluster chart. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #11285 Signed-off-by: Louis Haußknecht --- .../templates/namespace-metadata-rbac.yaml | 1 + .../templates/remote-access-service-mirror-rbac.yaml | 1 + multicluster/charts/linkerd-multicluster/values.yaml | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/multicluster/charts/linkerd-multicluster/templates/namespace-metadata-rbac.yaml b/multicluster/charts/linkerd-multicluster/templates/namespace-metadata-rbac.yaml index 00b55ee0b0cca..ff2a9718d2892 100644 --- a/multicluster/charts/linkerd-multicluster/templates/namespace-metadata-rbac.yaml +++ b/multicluster/charts/linkerd-multicluster/templates/namespace-metadata-rbac.yaml @@ -11,6 +11,7 @@ metadata: "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded name: namespace-metadata namespace: {{.Release.Namespace}} +{{- include "partials.image-pull-secrets" .Values.imagePullSecrets }} --- apiVersion: rbac.authorization.k8s.io/v1 kind: Role diff --git a/multicluster/charts/linkerd-multicluster/templates/remote-access-service-mirror-rbac.yaml b/multicluster/charts/linkerd-multicluster/templates/remote-access-service-mirror-rbac.yaml index 4fb6311c500db..3ed9def69a243 100644 --- a/multicluster/charts/linkerd-multicluster/templates/remote-access-service-mirror-rbac.yaml +++ b/multicluster/charts/linkerd-multicluster/templates/remote-access-service-mirror-rbac.yaml @@ -48,6 +48,7 @@ metadata: {{- with $.Values.commonLabels }}{{ toYaml . | trim | nindent 4 }}{{- end }} annotations: {{ include "partials.annotations.created-by" $ }} +{{- include "partials.image-pull-secrets" $.Values.imagePullSecrets }} --- apiVersion: v1 kind: Secret diff --git a/multicluster/charts/linkerd-multicluster/values.yaml b/multicluster/charts/linkerd-multicluster/values.yaml index fcd7ce9dd51be..3de8edc4b1884 100644 --- a/multicluster/charts/linkerd-multicluster/values.yaml +++ b/multicluster/charts/linkerd-multicluster/values.yaml @@ -50,6 +50,10 @@ podLabels: {} commonLabels: {} # -- Docker imagePullPolicy for all multicluster components imagePullPolicy: IfNotPresent +# -- For Private docker registries, authentication is needed. +# Registry secrets are applied to the respective service accounts +imagePullSecrets: [] +# - name: my-private-docker-registry-login-secret # -- The port on which the proxy accepts outbound traffic proxyOutboundPort: 4140 # -- If the remote mirror service account should be installed