feat: argo workflows v3.5.6 (#67)

Signed-off-by: Jesse Suen <jesse@akuity.io>
akuity · May 9, 2024 · 60ea440 · 60ea440
1 parent 6b7092e
commit 60ea440
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 17 deletions.
diff --git a/charts/argo-workflows/Chart.yaml b/charts/argo-workflows/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
-version: 3.5.0-rc1-ak.0.1
-appVersion: 3.5.0-rc1
+version: 3.5.6-ak.0.0
+appVersion: 3.5.6
 name: argo-workflows
 description: A Helm chart for Argo Workflows
 type: application
@@ -9,6 +9,7 @@ home: https://github.com/akuity/helm-charts
 sources:
   - https://github.com/argoproj/argo-workflows
 maintainers:
-  - name: terrytangyuan
   - name: jessesuen
-  - name: wanghong230
+    email: jesse@akuity.io
+  - name: 34fathombelow
+    email: justin@akuity.io
diff --git a/charts/argo-workflows/README.md b/charts/argo-workflows/README.md
@@ -1,6 +1,6 @@
 # argo-workflows
 
-![Version: 3.5.0-rc1-ak.0.1](https://img.shields.io/badge/Version-3.5.0--rc1--ak.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.5.0-rc1](https://img.shields.io/badge/AppVersion-3.5.0--rc1-informational?style=flat-square)
+![Version: 3.5.6-ak.0.0](https://img.shields.io/badge/Version-3.5.6--ak.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.5.6](https://img.shields.io/badge/AppVersion-3.5.6-informational?style=flat-square)
 
 A Helm chart for Argo Workflows
 
@@ -10,9 +10,8 @@ A Helm chart for Argo Workflows
 
 | Name | Email | Url |
 | ---- | ------ | --- |
-| terrytangyuan |  |  |
-| jessesuen |  |  |
-| wanghong230 |  |  |
+| jessesuen | <jesse@akuity.io> |  |
+| 34fathombelow | <justin@akuity.io> |  |
 
 ## Source Code
 

diff --git a/charts/argo-workflows/crds/all-crds.yaml b/charts/argo-workflows/crds/all-crds.yaml
@@ -677,6 +677,17 @@ spec:
                           type: object
                         bucket:
                           type: string
+                        caSecret:
+                          properties:
+                            key:
+                              type: string
+                            name:
+                              type: string
+                            optional:
+                              type: boolean
+                          required:
+                          - key
+                          type: object
                         createBucketIfNotPresent:
                           properties:
                             objectLocking:

diff --git a/charts/argo-workflows/values.yaml b/charts/argo-workflows/values.yaml
@@ -1,7 +1,7 @@
 global:
   image:
     # -- The default image tag applied to all Argo Workflows deployments.
-    tag: v3.5.0-rc1-ak.0
+    tag: v3.5.6-ak.0
 
 # -- Controller customizes the deployment of Argo Workflows controller.
 controller:

diff --git a/hack/compare-workflows.sh b/hack/compare-workflows.sh
@@ -6,15 +6,12 @@ set -euo pipefail
 PROJECT_ROOT=$(cd $(dirname ${BASH_SOURCE})/..; pwd)
 chart_root="${PROJECT_ROOT}/charts/argo-workflows"
 upstream_version=v$(grep appVersion ${chart_root}/Chart.yaml | awk '{print $2}')
+akuity_version=v$(grep version charts/argo-workflows/Chart.yaml | awk '{print $2}' | cut -d"." -f1-4)
 
 helm_tmpdir=$(mktemp -d 2>/dev/null || mktemp -d -t 'helm')
 helm dependency update ${chart_root} 2>&1 >/dev/null
 helm template \
     --include-crds \
-    --set controller.image.repository=quay.io/argoproj/workflow-controller \
-    --set executor.image.repository=quay.io/argoproj/argoexec \
-    --set server.image.repository=quay.io/argoproj/argocli \
-    --set global.image.tag=${upstream_version} \
     --namespace argo ${chart_root} | grep -v imagePullPolicy > $helm_tmpdir/helm.yaml
 
 echo """
@@ -35,16 +32,27 @@ kind: Kustomization
 namespace: argo
 resources:
 - https://github.com/argoproj/argo-workflows/releases/download/${upstream_version}/install.yaml
-""" > $upstream_tmpdir/kustomization.yaml
 
+images:
+- name: quay.io/argoproj/argoexec
+  newName: quay.io/akuity/argoexec
+  newTag: ${akuity_version}
+- name: quay.io/argoproj/workflow-controller
+  newName: quay.io/akuity/workflow-controller
+  newTag: ${akuity_version}
+- name: quay.io/argoproj/argocli
+  newName: quay.io/akuity/argocli
+  newTag: ${akuity_version}
+
+""" > $upstream_tmpdir/kustomization.yaml
 
 diff_dir=$(mktemp -d 2>/dev/null || mktemp -d -t 'diff')
+echo "Helm template output is located in: $diff_dir/helm.yaml"
+echo "Upstream output is located in: $diff_dir/upstream.yaml"
+
 helm_out=$(kustomize build $helm_tmpdir > $diff_dir/helm.yaml)
 upstream_out=$(kustomize build $upstream_tmpdir \
     | grep -v imagePullPolicy \
     | grep -v "^data: null$" \
     > $diff_dir/upstream.yaml)
 diff $diff_dir/upstream.yaml $diff_dir/helm.yaml
-
-echo "Helm template output is located in: $diff_dir/helm.yaml"
-echo "Upstream output is located in: $diff_dir/upstream.yaml"