Unverified Commit 3ef77619 authored by julienmancuso's avatar julienmancuso Committed by GitHub
Browse files

fix: make imagePullSecrets optional when installing dynamo cloud (#1324)

parent 3afbd518
...@@ -112,4 +112,3 @@ spec: ...@@ -112,4 +112,3 @@ spec:
tolerations: tolerations:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
imagePullSecrets: {{ .Values.imagePullSecrets | default list | toJson }}
\ No newline at end of file
...@@ -23,10 +23,8 @@ image: ...@@ -23,10 +23,8 @@ image:
# Overrides the image tag whose default is the chart appVersion. # Overrides the image tag whose default is the chart appVersion.
tag: "" tag: ""
# This is for the secretes for pulling an image from a private repository more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ # This is for the secrets for pulling an image from a private repository more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
imagePullSecrets: #imagePullSecrets: []
- name: nvcrimagepullsecret
- name: docker-imagepullsecret
# This is to override the chart name. # This is to override the chart name.
nameOverride: "" nameOverride: ""
fullnameOverride: "" fullnameOverride: ""
......
...@@ -37,6 +37,10 @@ spec: ...@@ -37,6 +37,10 @@ spec:
annotations: annotations:
kubectl.kubernetes.io/default-container: manager kubectl.kubernetes.io/default-container: manager
spec: spec:
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- args: {{- toYaml .Values.controllerManager.kubeRbacProxy.args | nindent - args: {{- toYaml .Values.controllerManager.kubeRbacProxy.args | nindent
8 }} 8 }}
...@@ -120,7 +124,6 @@ spec: ...@@ -120,7 +124,6 @@ spec:
10 }} 10 }}
securityContext: {{- toYaml .Values.controllerManager.manager.containerSecurityContext securityContext: {{- toYaml .Values.controllerManager.manager.containerSecurityContext
| nindent 10 }} | nindent 10 }}
imagePullSecrets: {{ .Values.imagePullSecrets | default list | toJson }}
securityContext: securityContext:
runAsNonRoot: true runAsNonRoot: true
serviceAccountName: {{ include "dynamo-operator.fullname" . }}-controller-manager serviceAccountName: {{ include "dynamo-operator.fullname" . }}-controller-manager
......
...@@ -107,7 +107,7 @@ dynamo: ...@@ -107,7 +107,7 @@ dynamo:
cacheRepo: '' cacheRepo: ''
snapshotMode: '' # options: full, redo, time snapshotMode: '' # options: full, redo, time
imagePullSecrets: [] #imagePullSecrets: []
kubernetesClusterDomain: cluster.local kubernetesClusterDomain: cluster.local
metricsService: metricsService:
ports: ports:
......
...@@ -14,15 +14,9 @@ ...@@ -14,15 +14,9 @@
# limitations under the License. # limitations under the License.
# Used to generate top-level secrets (overridden by custom-values.yaml) # Used to generate top-level secrets (overridden by custom-values.yaml)
imagePullSecrets:
# Subcharts # Subcharts
dynamo-operator: dynamo-operator:
enabled: true enabled: true
imagePullSecrets:
- name: gitlab-imagepull
- name: nvcrimagepullsecret
- name: docker-imagepullsecret
natsAddr: "" natsAddr: ""
etcdAddr: "" etcdAddr: ""
namespaceRestriction: namespaceRestriction:
...@@ -79,7 +73,6 @@ dynamo-api-store: ...@@ -79,7 +73,6 @@ dynamo-api-store:
repository: "" repository: ""
tag: "latest" tag: "latest"
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
imagePullSecrets:
ingress: ingress:
enabled: false enabled: false
className: nginx className: nginx
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment