Skip to content

Commit be9200c

Browse files
authored
Merge pull request #12 from tarantool/8-image-pull-secrets
Add ability to pass external imagePullSecrets
2 parents 85af0c8 + 003ae3a commit be9200c

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

charts/cartridge/templates/roles.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,16 @@ spec:
103103
{{- if $securityContext.enabled }}
104104
securityContext: {{ tpl (omit $securityContext "enabled" | toYaml) $ | nindent 10 }}
105105
{{- end }}
106-
{{- if $.Values.dockerconfigjson }}
106+
{{- if or $.Values.imagePullSecrets $.Values.dockerconfigjson }}
107107
imagePullSecrets:
108+
{{- if $.Values.dockerconfigjson }}
108109
- name: {{ include "chart.resource.fullname" (dict "context" $ "suffix" "image-pull") | quote }}
110+
{{- end }}
111+
{{- if $.Values.dockerconfigjson }}
112+
{{- range $.Values.imagePullSecrets }}
113+
- {{ toYaml . }}
114+
{{- end }}
115+
{{- end }}
109116
{{- end }}
110117
volumes:
111118
- name: {{ include "chart.resource.fullname" (dict "context" $ "suffix" "socket-volume") }}

charts/cartridge/values.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,11 @@ tarantool:
347347
# clientIP:
348348
# timeoutSeconds: 300
349349

350-
# Configuration for docker image registries' credentials
350+
351+
# External configuration for docker image registries' credentials
352+
imagePullSecrets: []
353+
354+
# In-place configuration for docker image registries' credentials
351355
# Example:
352356
# dockerconfigjson:
353357
# - address: registry.try.tarantool.io

0 commit comments

Comments
 (0)