fix(argo-workflows): Quick fix for failing deployment when using imag…

…e digests (argoproj#1206) * Added short tag function and updated templates Signed-off-by: John Clark <[email protected]> * Chart.yaml update (version, changes) Signed-off-by: John Clark <[email protected]> * Removed unnecessary conditional logic Signed-off-by: John Clark <[email protected]> * Final newline to _helpers Signed-off-by: John Clark <[email protected]> * Rework without template function Signed-off-by: Marco Kilchhofer <[email protected]> Co-authored-by: Marco Kilchhofer <[email protected]>
orangesys · May 9, 2022 · 645f70f · 645f70f
1 parent bfad95f
commit 645f70f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/charts/argo-workflows/Chart.yaml b/charts/argo-workflows/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: argo-workflows
 description: A Helm chart for Argo Workflows
 type: application
-version: 0.14.3
+version: 0.14.4
 appVersion: v3.3.2
 icon: https://raw.githubusercontent.com/argoproj/argo-workflows/master/docs/assets/argo.png
 home: https://github.com/argoproj/argo-helm
@@ -15,4 +15,4 @@ maintainers:
  - name: benjaminws
 annotations:
  artifacthub.io/changes: |
- - "[Fixed]: Setting default ContainerRuntimeExecutor to emissary"
+ - "[Fixed]: Fixed failing when digests and tags longer than 63 characters"
diff --git a/charts/argo-workflows/templates/controller/workflow-controller-deployment.yaml b/charts/argo-workflows/templates/controller/workflow-controller-deployment.yaml
@@ -4,7 +4,7 @@ metadata:
  name: {{ template "argo-workflows.controller.fullname" . }}
  labels:
  {{- include "argo-workflows.labels" (dict "context" . "component" .Values.controller.name "name" .Values.controller.name) | nindent 4 }}
- app.kubernetes.io/version: {{ default .Chart.AppVersion .Values.controller.image.tag | quote }}
+ app.kubernetes.io/version: {{ default .Chart.AppVersion .Values.controller.image.tag | trunc 63 | quote }}
 spec:
  replicas: {{ .Values.controller.replicas }}
  selector:
@@ -14,7 +14,7 @@ spec:
  metadata:
  labels:
  {{- include "argo-workflows.labels" (dict "context" . "component" .Values.controller.name "name" .Values.controller.name) | nindent 8 }}
- app.kubernetes.io/version: {{ default .Chart.AppVersion .Values.controller.image.tag | quote }}
+ app.kubernetes.io/version: {{ default .Chart.AppVersion .Values.controller.image.tag | trunc 63 | quote }}
  {{- with.Values.controller.podLabels }}
  {{- toYaml . | nindent 8 }}
  {{- end }}

diff --git a/charts/argo-workflows/templates/controller/workflow-controller-service.yaml b/charts/argo-workflows/templates/controller/workflow-controller-service.yaml
@@ -5,7 +5,7 @@ metadata:
  name: {{ template "argo-workflows.controller.fullname" . }}
  labels:
  {{- include "argo-workflows.labels" (dict "context" . "component" .Values.controller.name "name" .Values.controller.name) | nindent 4 }}
- app.kubernetes.io/version: {{ default .Chart.AppVersion .Values.controller.image.tag | quote }}
+ app.kubernetes.io/version: {{ default .Chart.AppVersion .Values.controller.image.tag | trunc 63 | quote }}
  {{- with .Values.controller.serviceLabels }}
  {{ toYaml . | nindent 4 }}
  {{- end }}

diff --git a/charts/argo-workflows/templates/server/server-deployment.yaml b/charts/argo-workflows/templates/server/server-deployment.yaml
@@ -5,7 +5,7 @@ metadata:
  name: {{ template "argo-workflows.server.fullname" . }}
  labels:
  {{- include "argo-workflows.labels" (dict "context" . "component" .Values.server.name "name" .Values.server.name) | nindent 4 }}
- app.kubernetes.io/version: {{ default .Chart.AppVersion .Values.server.image.tag | quote }}
+ app.kubernetes.io/version: {{ default .Chart.AppVersion .Values.server.image.tag | trunc 63 | quote }}
 spec:
  replicas: {{ .Values.server.replicas }}
  selector:
@@ -15,7 +15,7 @@ spec:
  metadata:
  labels:
  {{- include "argo-workflows.labels" (dict "context" . "component" .Values.server.name "name" .Values.server.name) | nindent 8 }}
- app.kubernetes.io/version: {{ default .Chart.AppVersion .Values.server.image.tag | quote }}
+ app.kubernetes.io/version: {{ default .Chart.AppVersion .Values.server.image.tag | trunc 63 | quote }}
  {{- with .Values.server.podLabels }}
  {{- toYaml . | nindent 8 }}
  {{- end }}

diff --git a/charts/argo-workflows/templates/server/server-service.yaml b/charts/argo-workflows/templates/server/server-service.yaml
@@ -5,7 +5,7 @@ metadata:
  name: {{ template "argo-workflows.server.fullname" . }}
  labels:
  {{- include "argo-workflows.labels" (dict "context" . "component" .Values.server.name "name" .Values.server.name) | nindent 4 }}
- app.kubernetes.io/version: {{ default .Chart.AppVersion .Values.server.image.tag | quote }}
+ app.kubernetes.io/version: {{ default .Chart.AppVersion .Values.server.image.tag | trunc 63 | quote }}
  {{- with .Values.server.serviceAnnotations }}
  annotations:
  {{- toYaml . | nindent 4 }}