Add imagePullSecrets support

... for pulling images for private docker registries
linkerd · Oct 18, 2023 · 85329aa · 85329aa
1 parent 877772a
commit 85329aa
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 1 deletion.
diff --git a/charts/linkerd-smi/README.md b/charts/linkerd-smi/README.md
@@ -72,6 +72,7 @@ Kubernetes: `>=1.16.0-0`
 | adaptor.nodeSelector | object | `{}` | Node selector for the adaptor instance |
 | adaptor.tolerations | list | `[]` | Tolerations for the adaptor instance |
 | clusterDomain | string | `"cluster.local"` | Kubernetes DNS Domain name to use |
+| imagePullSecrets | list | `[]` | imagePullSecrets to apply to all ServiceAccounts for pulling images from private registries |
 | linkerdNamespace | string | `"linkerd"` | Namespace of the Linkerd core control-plane install |
 | namespaceMetadata.image.name | string | `"extension-init"` | Docker image name for the namespace-metadata instance |
 | namespaceMetadata.image.pullPolicy | string | `"IfNotPresent"` | Pull policy for the namespace-metadata instance |

diff --git a/charts/linkerd-smi/templates/_metadata.tpl → charts/linkerd-smi/templates/_partials.tpl b/charts/linkerd-smi/templates/_metadata.tpl → charts/linkerd-smi/templates/_partials.tpl
@@ -1,3 +1,10 @@
 {{- define "partials.namespace" -}}
 {{ if eq .Release.Service "CLI" }}namespace: {{.Release.Namespace}}{{ end }}
 {{- end -}}
+
+{{- define "partials.image-pull-secrets"}}
+{{- if . }}
+imagePullSecrets:
+{{ toYaml . | indent 2 }}
+{{- end }}
+{{- end -}}
diff --git a/charts/linkerd-smi/templates/namespace-metadata-rbac.yaml b/charts/linkerd-smi/templates/namespace-metadata-rbac.yaml
@@ -6,6 +6,7 @@ metadata:
     "helm.sh/hook-weight": "0"
     "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
   name: namespace-metadata
+{{- include "partials.image-pull-secrets" .Values.imagePullSecrets }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role

diff --git a/charts/linkerd-smi/templates/rbac.yaml b/charts/linkerd-smi/templates/rbac.yaml
@@ -44,3 +44,4 @@ metadata:
   labels:
     linkerd.io/extension: smi
     component: smi-adaptor
+{{- include "partials.image-pull-secrets" .Values.imagePullSecrets }}
diff --git a/charts/linkerd-smi/values.yaml b/charts/linkerd-smi/values.yaml
@@ -4,6 +4,10 @@ clusterDomain: cluster.local
 # -- Namespace of the Linkerd core control-plane install
 linkerdNamespace: linkerd
 
+# -- imagePullSecrets to apply to all ServiceAccounts for pulling images from
+# private registries
+imagePullSecrets: []
+
 # SMI Adaptor configuration
 adaptor:
   image:

diff --git a/cli/cmd/install.go b/cli/cmd/install.go
@@ -25,7 +25,7 @@ var (
 		"templates/namespace.yaml",
 		"templates/adaptor.yaml",
 		"templates/rbac.yaml",
-		"templates/_metadata.tpl",
+		"templates/_partials.tpl",
 		"templates/trafficsplit-crd.yaml",
 	}
 )