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

Support private reg and secret settings in operator helm install #208

Merged
merged 2 commits into from
Dec 5, 2023
Merged

Support private reg and secret settings in operator helm install #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bed0cb9
Support setting private images registry and pull secrets for operator…
tomer-shefler Dec 5, 2023
8794980
Remove requirement to fill all proxy field when setting proxy to oper…
tomer-shefler Dec 5, 2023
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
10 changes: 5 additions & 5 deletions charts/cbcontainers-operator/cbcontainers-operator-chart/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ spec:
- --logtostderr=true
- --http2-disable
- --v=0
image: "{{ .Values.rbacProxy.image.repository }}:{{.Values.rbacProxy.image.version }}"
image: "{{ .Values.imagesRegistry | default "" }}{{ .Values.rbacProxy.image.repository }}:{{.Values.rbacProxy.image.version }}"
name: kube-rbac-proxy
ports:
- containerPort: 8443
Expand All @@ -61,7 +61,7 @@ spec:
- --leader-elect
command:
- /manager
image: "{{ .Values.operator.image.repository | default "cbartifactory/octarine-operator" }}:{{ .Values.operator.image.version | default .Chart.AppVersion }}"
image: "{{ .Values.imagesRegistry | default "" }}{{ .Values.operator.image.repository | default "cbartifactory/octarine-operator" }}:{{ .Values.operator.image.version | default .Chart.AppVersion }}"
env:
- name: OPERATOR_NAMESPACE
valueFrom:
Expand All @@ -70,11 +70,11 @@ spec:
{{/* If you want to enable HTTP Proxy you need to set all 3 of the values - operator.proxy.http, operator.proxy.https and operator.proxy.noProxy */}}
{{- if .Values.operator.proxy -}}
- name: HTTP_PROXY
value: {{ required "all values under spec.operator.proxy are required if even one is set" .Values.operator.proxy.http }}
value: {{ .Values.operator.proxy.http }}
- name: HTTPS_PROXY
value: {{ required "all values under spec.operator.proxy are required if even one is set" .Values.operator.proxy.https }}
value: {{ .Values.operator.proxy.https }}
- name: NO_PROXY
value: {{ required "all values under spec.operator.proxy are required if even one is set" .Values.operator.proxy.noProxy }}
value: {{ .Values.operator.proxy.noProxy }}
{{- end -}}
{{- if .Values.operator.environment -}}
{{- with .Values.operator.environment -}}
Expand Down
2 changes: 1 addition & 1 deletion charts/cbcontainers-operator/cbcontainers-operator-chart/templates/operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6432,7 +6432,7 @@ spec:
---
apiVersion: v1
imagePullSecrets:
- name: cbcontainers-operator-public-registry-secret
- name: {{ default "cbcontainers-operator-public-registry-secret" .Values.imagesPullSecret }}
kind: ServiceAccount
metadata:
name: cbcontainers-operator
Expand Down
Loading