From 343927cbf1ebd1220b4244e301ff4df499a2c7bd Mon Sep 17 00:00:00 2001 From: chgl Date: Sun, 18 Apr 2021 21:01:57 +0200 Subject: [PATCH] use Chart.AppVersion as the default image tag Signed-off-by: chgl --- charts/argo-workflows/Chart.yaml | 1 + .../controller/workflow-controller-deployment.yaml | 4 ++-- .../templates/server/server-deployment.yaml | 2 +- charts/argo-workflows/values.yaml | 9 ++++++--- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/charts/argo-workflows/Chart.yaml b/charts/argo-workflows/Chart.yaml index cca9d64f..b540b670 100644 --- a/charts/argo-workflows/Chart.yaml +++ b/charts/argo-workflows/Chart.yaml @@ -3,6 +3,7 @@ name: argo-workflows description: A Helm chart for Argo Workflows type: application version: 0.1.0 +appVersion: "v3.0.1" icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png home: https://github.com/argoproj/argo-helm sources: diff --git a/charts/argo-workflows/templates/controller/workflow-controller-deployment.yaml b/charts/argo-workflows/templates/controller/workflow-controller-deployment.yaml index 1a4cc1f8..61e878ed 100644 --- a/charts/argo-workflows/templates/controller/workflow-controller-deployment.yaml +++ b/charts/argo-workflows/templates/controller/workflow-controller-deployment.yaml @@ -32,14 +32,14 @@ spec: {{- end }} containers: - name: controller - image: "{{ .Values.controller.image.registry }}/{{ .Values.controller.image.repository }}:{{ .Values.controller.image.tag }}" + image: "{{ .Values.controller.image.registry }}/{{ .Values.controller.image.repository }}:{{ .Values.controller.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.images.pullPolicy }} command: [ "workflow-controller" ] args: - "--configmap" - "{{ .Release.Name }}-{{ .Values.controller.name}}-configmap" - "--executor-image" - - "{{ .Values.executor.image.registry }}/{{ .Values.executor.image.repository }}:{{ .Values.executor.image.tag }}" + - "{{ .Values.executor.image.registry }}/{{ .Values.executor.image.repository }}:{{ .Values.executor.image.tag | default .Chart.AppVersion }}" - "--loglevel" - "{{ .Values.controller.logging.level }}" - "--gloglevel" diff --git a/charts/argo-workflows/templates/server/server-deployment.yaml b/charts/argo-workflows/templates/server/server-deployment.yaml index e8e6bcbb..40d3d738 100644 --- a/charts/argo-workflows/templates/server/server-deployment.yaml +++ b/charts/argo-workflows/templates/server/server-deployment.yaml @@ -32,7 +32,7 @@ spec: {{- end }} containers: - name: argo-server - image: "{{ .Values.server.image.registry }}/{{ .Values.server.image.repository }}:{{ .Values.server.image.tag }}" + image: "{{ .Values.server.image.registry }}/{{ .Values.server.image.repository }}:{{ .Values.server.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.images.pullPolicy }} args: - server diff --git a/charts/argo-workflows/values.yaml b/charts/argo-workflows/values.yaml index e042a922..ce5bc8bd 100644 --- a/charts/argo-workflows/values.yaml +++ b/charts/argo-workflows/values.yaml @@ -29,7 +29,8 @@ controller: image: registry: quay.io repository: argoproj/workflow-controller - tag: v3.0.1 + # Overrides the image tag whose default is the chart appVersion. + tag: "" # parallelism dictates how many workflows can be running at the same time parallelism: # podAnnotations is an optional map of annotations to be applied to the controller Pods @@ -146,7 +147,8 @@ executor: image: registry: quay.io repository: argoproj/argoexec - tag: v3.0.1 + # Overrides the image tag whose default is the chart appVersion. + tag: "" resources: {} # Adds environment variables for the executor. env: {} @@ -162,7 +164,8 @@ server: image: registry: quay.io repository: argoproj/argocli - tag: v3.0.1 + # Overrides the image tag whose default is the chart appVersion. + tag: "" # optional map of annotations to be applied to the ui Pods podAnnotations: {} # Optional labels to add to the UI pods