Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes error when pulling lenses docker image from private registry #14 #15

Open
wants to merge 3 commits into
base: release/5.0
Choose a base branch
from
Open

Fixes error when pulling lenses docker image from private registry #14 #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f34bc94
fix indent for lenses-cli sidecar
Mar 14, 2022
9bc5faf
move imagePullSecrets field to pod level for 2 occurrences
Mar 14, 2022
518ed8e
bump chart version to 5.0.1
Mar 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/lenses/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
19 changes: 11 additions & 8 deletions charts/lenses/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand Down Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions charts/lenses/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand All @@ -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
Expand Down