Skip to content

Commit

Permalink
feat: allow docker registry to be overridden
Browse files Browse the repository at this point in the history
Resolves #6
  • Loading branch information
eshepelyuk committed Jan 4, 2021
1 parent a5288a4 commit 21f2255
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion templates/cronjob.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
name: {{ $nm }}-clusters
containers:
- name: setup
image: "eshepelyuk/cmak-operator-cli:{{ $version }}"
image: {{ printf "%s/eshepelyuk/cmak-operator-cli:%s" .Values.imageRegistry $version | quote }}
command: ['python3', './json2zk.py']
args:
- '{{ .Values.reconcile.overwriteZk | ternary "--" "--no-" }}overwrite-zk'
Expand Down
4 changes: 2 additions & 2 deletions templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: zk
image: "zookeeper:3.6.1"
image: {{ printf "%s/zookeeper:%s" .Values.imageRegistry "3.6.1" | quote }}
imagePullPolicy: IfNotPresent
ports:
- name: zk
Expand All @@ -33,7 +33,7 @@ spec:
periodSeconds: 30
timeoutSeconds: 15
- name: ui
image: "hlebalbau/kafka-manager:{{ .Chart.AppVersion }}"
image: {{ printf "%s/hlebalbau/kafka-manager:%s" .Values.imageRegistry .Chart.AppVersion | quote }}
imagePullPolicy: IfNotPresent
ports:
- name: http
Expand Down
2 changes: 2 additions & 0 deletions values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@

"properties": {
"global": { "type": "object", "additionalProperties": true, "title": "placeholder for usage as a subchart" },
"image": { "type": "object", "additionalProperties": true, "title": "skaffold compatibility" },
"imageRegistry": { "type": "string", "default": "docker.io", "title": "docker registry for all images of the chart" },
"reconcile": {
"type": "object", "additionalProperties": false,
"required": ["schedule"], "title": "reconciliation job config",
Expand Down
2 changes: 2 additions & 0 deletions values.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
imageRegistry: docker.io

cmak:

basicAuth:
Expand Down

0 comments on commit 21f2255

Please sign in to comment.