diff --git a/charts/lenses/Chart.yaml b/charts/lenses/Chart.yaml index 7f4f8d7..0709666 100644 --- a/charts/lenses/Chart.yaml +++ b/charts/lenses/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v1 description: A chart for Lenses icon: https://www.lenses.io/images/logos/icon_ellipse2red.png name: lenses -version: 5.0.0 +version: 5.0.1 appVersion: 5.0.0 diff --git a/charts/lenses/templates/deployment.yaml b/charts/lenses/templates/deployment.yaml index c1cd48c..159858c 100644 --- a/charts/lenses/templates/deployment.yaml +++ b/charts/lenses/templates/deployment.yaml @@ -48,6 +48,17 @@ spec: prometheus.io/port: "9102" prometheus.io/path: "/metrics" spec: + {{- if .Values.image.registrySecretKey }} + imagePullSecrets: + - name: {{ .Values.image.registrySecretKey }} + {{- if .Values.lenses.provision.enabled }} + {{- $provision := .Values.lenses.provision }} + {{- if $provision.sidecar.image.registrySecretKey }} + - name: {{$provision.sidecar.image.registrySecretKey }} + {{- end }} + {{- end}} + {{- end }} + {{- if .Values.nodeSelector }} nodeSelector: {{- toYaml .Values.nodeSelector | nindent 8 }} @@ -113,10 +124,6 @@ spec: - name: {{ .Chart.Name }} image: {{include "lensesImage" . | quote }} imagePullPolicy: {{ .Values.image.pullPolicy }} - {{- if .Values.image.registrySecretKey }} - imagePullSecrets: - - name: {{ .Values.image.registrySecretKey }} - {{- end }} ports: - containerPort: {{ .Values.restPort }} {{- if .Values.lenses.livenessProbe.enabled }} @@ -345,10 +352,6 @@ spec: - name: {{default "lenses-provision" $provision.name}} image: {{include "sidecarProvisionImage" . | quote }} imagePullPolicy: {{default "IfNotPresent" $provision.sidecar.image.pullPolicy}} - {{- if $provision.sidecar.image.registrySecretKey}} - imagePullSecrets: - - name: {{$provision.sidecar.image.registrySecretKey}} - {{- end}} command: - bash - -c diff --git a/charts/lenses/values.yaml b/charts/lenses/values.yaml index d2de56a..e1d35b2 100644 --- a/charts/lenses/values.yaml +++ b/charts/lenses/values.yaml @@ -140,7 +140,7 @@ ingress: lenses: # Set the details to provision Lenses using lenses-cli provision: - enabled: false + enabled: true # Find more details in https://docs.lenses.io/current/installation/kubernetes/helm/#helm-provision # About provision.yaml structure: https://docs.lenses.io/current/tools/cli/provision/provision-yaml/ @@ -157,13 +157,13 @@ lenses: # Find more details in https://docs.lenses.io/current/installation/kubernetes/helm/#helm-provision-sidecar sidecar: - # name: +# name: image: repository: lensesio/lenses-cli # Default to .Chart.AppVersion with major.minor semantic (e.g 5.0) - # tag: - # pullPolicy: IfNotPresent - # registrySecretKey: +# tag: +# pullPolicy: IfNotPresent +# registrySecretKey: # Additional volume mounts to load additional files from pre-existing volumes, secrets or vault secrets to use in provisioning # Use it in conjuction with lenses.additionalVolumes