Skip to content

Commit d207168

Browse files
committed
Get operator from chart appVersion
Signed-off-by: Tamal Saha <tamal@appscode.com>
1 parent 9bc4b6c commit d207168

File tree

4 files changed

+3
-4
lines changed

4 files changed

+3
-4
lines changed

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,6 @@ chart-contents-%:
243243
yq -y --indentless -i '.appVersion="$(APP_VERSION)"' ./charts/$*/Chart.yaml; \
244244
case "$*" in \
245245
voyager) \
246-
yqq w -i ./charts/$*/values.yaml operator.tag --tag '!!str' $(APP_VERSION); \
247246
yqq w -i ./charts/$*/values.yaml haproxy.tag --tag '!!str' $(HAPROXY_VERSION); \
248247
;; \
249248
esac; \

charts/voyager/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ The following table lists the configurable parameters of the `voyager` chart and
5454
| registryFQDN | Docker registry fqdn used to pull KubeDB related images Set this to use docker registry hosted at ${registryFQDN}/${registry}/${image} | <code>""</code> |
5555
| operator.registry | Docker registry used to pull Voyager operator image | <code>appscode</code> |
5656
| operator.repository | Voyager operator container image | <code>voyager</code> |
57-
| operator.tag | Voyager operator container image tag | <code>v14.2.2</code> |
57+
| operator.tag | Voyager operator container image tag | <code>""</code> |
5858
| operator.resources | Compute Resources required by the operator container | <code>{}</code> |
5959
| operator.securityContext | Security options the operator container should run with | <code>{}</code> |
6060
| haproxy.registry | Docker registry used to pull HAProxy image | <code>appscode</code> |

charts/voyager/templates/deployment-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ spec:
3838
- name: operator
3939
securityContext:
4040
{{- toYaml .Values.operator.securityContext | nindent 10 }}
41-
image: {{ list (include "operator.registry" .) .Values.operator.repository | compact | join "/" }}:{{ .Values.operator.tag }}
41+
image: {{ list (include "operator.registry" .) .Values.operator.repository | compact | join "/" }}:{{ .Values.operator.tag | default .Chart.AppVersion }}
4242
imagePullPolicy: {{ .Values.imagePullPolicy }}
4343
args:
4444
- operator

charts/voyager/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ operator:
2626
# Voyager operator container image
2727
repository: voyager
2828
# Voyager operator container image tag
29-
tag: v14.2.2
29+
tag: ""
3030
# Compute Resources required by the operator container
3131
resources: {}
3232
# Security options the operator container should run with

0 commit comments

Comments
 (0)