feat: use argo v3.1.2-patch.2. Part of #5718 (#6082)

* feat: use argo v3.1.2-patch * upgrade to argo v3.1.2-patch.2 * update versions to v3.1.2
kubeflow · Jul 22, 2021 · 0434243 · 0434243
1 parent bd281a5
commit 0434243
Show file tree

Hide file tree

Showing 27 changed files with 66 additions and 66 deletions.
diff --git a/.cloudbuild.yaml b/.cloudbuild.yaml
@@ -192,10 +192,10 @@ steps:
   args: ['pull', 'gcr.io/cloudsql-docker/gce-proxy:1.14']
   id:   'pullCloudsqlProxy'
 - name: 'gcr.io/cloud-builders/docker'
-  args: ['pull', 'gcr.io/ml-pipeline/argoexec:v3.1.1-patch-license-compliance']
+  args: ['pull', 'gcr.io/ml-pipeline/argoexec:v3.1.2-patch.2-license-compliance']
   id:   'pullArgoExecutor'
 - name: 'gcr.io/cloud-builders/docker'
-  args: ['pull', 'gcr.io/ml-pipeline/workflow-controller:v3.1.1-patch-license-compliance']
+  args: ['pull', 'gcr.io/ml-pipeline/workflow-controller:v3.1.2-patch.2-license-compliance']
   id:   'pullArgoWorkflowController'
 
 # Tag for Hosted - SemVersion to Major.Minor parsing

diff --git a/.release.cloudbuild.yaml b/.release.cloudbuild.yaml
@@ -479,14 +479,14 @@ steps:
     docker push gcr.io/ml-pipeline/google/pipelines-test/cloudsqlproxy:$(cat /workspace/mm.ver)
 
 - name: 'gcr.io/cloud-builders/docker'
-  args: ['pull', 'gcr.io/ml-pipeline/argoexec:v3.1.1-patch-license-compliance']
+  args: ['pull', 'gcr.io/ml-pipeline/argoexec:v3.1.2-patch.2-license-compliance']
   id:   'pullArgoExecutor'
 - name: 'gcr.io/cloud-builders/docker'
-  args: ['tag', 'gcr.io/ml-pipeline/argoexec:v3.1.1-patch-license-compliance', 'gcr.io/ml-pipeline/google/pipelines/argoexecutor:$TAG_NAME']
+  args: ['tag', 'gcr.io/ml-pipeline/argoexec:v3.1.2-patch.2-license-compliance', 'gcr.io/ml-pipeline/google/pipelines/argoexecutor:$TAG_NAME']
   id:   'tagArgoExecutorForMarketplace'
   waitFor: ['pullArgoExecutor']
 - name: 'gcr.io/cloud-builders/docker'
-  args: ['tag', 'gcr.io/ml-pipeline/argoexec:v3.1.1-patch-license-compliance', 'gcr.io/ml-pipeline/google/pipelines-test/argoexecutor:$TAG_NAME']
+  args: ['tag', 'gcr.io/ml-pipeline/argoexec:v3.1.2-patch.2-license-compliance', 'gcr.io/ml-pipeline/google/pipelines-test/argoexecutor:$TAG_NAME']
   id:   'tagArgoExecutorForMarketplaceTest'
   waitFor: ['pullArgoExecutor']
 - id:   'tagArgoExecutorForMarketplaceMajorMinor'
@@ -496,20 +496,20 @@ steps:
   args:
   - -ceux
   - |
-    docker tag gcr.io/ml-pipeline/argoexec:v3.1.1-patch-license-compliance gcr.io/ml-pipeline/google/pipelines/argoexecutor:$(cat /workspace/mm.ver)
-    docker tag gcr.io/ml-pipeline/argoexec:v3.1.1-patch-license-compliance gcr.io/ml-pipeline/google/pipelines-test/argoexecutor:$(cat /workspace/mm.ver)
+    docker tag gcr.io/ml-pipeline/argoexec:v3.1.2-patch.2-license-compliance gcr.io/ml-pipeline/google/pipelines/argoexecutor:$(cat /workspace/mm.ver)
+    docker tag gcr.io/ml-pipeline/argoexec:v3.1.2-patch.2-license-compliance gcr.io/ml-pipeline/google/pipelines-test/argoexecutor:$(cat /workspace/mm.ver)
     docker push gcr.io/ml-pipeline/google/pipelines/argoexecutor:$(cat /workspace/mm.ver)
     docker push gcr.io/ml-pipeline/google/pipelines-test/argoexecutor:$(cat /workspace/mm.ver)
 
 - name: 'gcr.io/cloud-builders/docker'
-  args: ['pull', 'gcr.io/ml-pipeline/workflow-controller:v3.1.1-patch-license-compliance']
+  args: ['pull', 'gcr.io/ml-pipeline/workflow-controller:v3.1.2-patch.2-license-compliance']
   id:   'pullArgoWorkflowController'
 - name: 'gcr.io/cloud-builders/docker'
-  args: ['tag', 'gcr.io/ml-pipeline/workflow-controller:v3.1.1-patch-license-compliance', 'gcr.io/ml-pipeline/google/pipelines/argoworkflowcontroller:$TAG_NAME']
+  args: ['tag', 'gcr.io/ml-pipeline/workflow-controller:v3.1.2-patch.2-license-compliance', 'gcr.io/ml-pipeline/google/pipelines/argoworkflowcontroller:$TAG_NAME']
   id:   'tagArgoWorkflowControllerForMarketplace'
   waitFor: ['pullArgoWorkflowController']
 - name: 'gcr.io/cloud-builders/docker'
-  args: ['tag', 'gcr.io/ml-pipeline/workflow-controller:v3.1.1-patch-license-compliance', 'gcr.io/ml-pipeline/google/pipelines-test/argoworkflowcontroller:$TAG_NAME']
+  args: ['tag', 'gcr.io/ml-pipeline/workflow-controller:v3.1.2-patch.2-license-compliance', 'gcr.io/ml-pipeline/google/pipelines-test/argoworkflowcontroller:$TAG_NAME']
   id:   'tagArgoWorkflowControllerForMarketplaceTest'
   waitFor: ['pullArgoWorkflowController']
 - id:   'tagArgoWorkflowControllerForMarketplaceMajorMinor'
@@ -519,8 +519,8 @@ steps:
   args:
   - -ceux
   - |
-    docker tag gcr.io/ml-pipeline/workflow-controller:v3.1.1-patch-license-compliance gcr.io/ml-pipeline/google/pipelines/argoworkflowcontroller:$(cat /workspace/mm.ver)
-    docker tag gcr.io/ml-pipeline/workflow-controller:v3.1.1-patch-license-compliance gcr.io/ml-pipeline/google/pipelines-test/argoworkflowcontroller:$(cat /workspace/mm.ver)
+    docker tag gcr.io/ml-pipeline/workflow-controller:v3.1.2-patch.2-license-compliance gcr.io/ml-pipeline/google/pipelines/argoworkflowcontroller:$(cat /workspace/mm.ver)
+    docker tag gcr.io/ml-pipeline/workflow-controller:v3.1.2-patch.2-license-compliance gcr.io/ml-pipeline/google/pipelines-test/argoworkflowcontroller:$(cat /workspace/mm.ver)
     docker push gcr.io/ml-pipeline/google/pipelines/argoworkflowcontroller:$(cat /workspace/mm.ver)
     docker push gcr.io/ml-pipeline/google/pipelines-test/argoworkflowcontroller:$(cat /workspace/mm.ver)
 

diff --git a/backend/Dockerfile b/backend/Dockerfile
@@ -33,11 +33,11 @@ COPY backend/requirements.txt .
 RUN python3 -m pip install -r requirements.txt --no-cache-dir
 
 # Downloading Argo CLI so that the samples are validated
-ENV ARGO_VERSION v3.1.1
+ENV ARGO_VERSION v3.1.2
 RUN curl -sLO https://github.com/argoproj/argo-workflows/releases/download/${ARGO_VERSION}/argo-linux-amd64.gz && \
-  gunzip argo-linux-amd64.gz && \
-  chmod +x argo-linux-amd64 && \
-  mv ./argo-linux-amd64 /usr/local/bin/argo
+    gunzip argo-linux-amd64.gz && \
+    chmod +x argo-linux-amd64 && \
+    mv ./argo-linux-amd64 /usr/local/bin/argo
 
 WORKDIR /go/src/github.com/kubeflow/pipelines
 COPY sdk sdk
@@ -52,11 +52,11 @@ COPY backend/src/apiserver/config/sample_config.json /samples/
 # The default image is replaced with the GCR-hosted python image.
 RUN set -e; \
     < /samples/sample_config.json jq .[].file --raw-output | while read pipeline_yaml; do \
-        pipeline_py="${pipeline_yaml%.yaml}"; \
-        mode=`< /samples/sample_config.json jq ".[] | select(.file == \"${pipeline_yaml}\") | (if .mode == null then \"V1\" else .mode end)" --raw-output`; \
-        mv "$pipeline_py" "${pipeline_py}.tmp"; \
-        echo 'import kfp; kfp.components.default_base_image_or_builder="gcr.io/google-appengine/python:2020-03-31-141326"' | cat - "${pipeline_py}.tmp" > "$pipeline_py"; \
-        dsl-compile --py "$pipeline_py" --output "$pipeline_yaml" --mode "$mode" || python3 "$pipeline_py"; \
+    pipeline_py="${pipeline_yaml%.yaml}"; \
+    mode=`< /samples/sample_config.json jq ".[] | select(.file == \"${pipeline_yaml}\") | (if .mode == null then \"V1\" else .mode end)" --raw-output`; \
+    mv "$pipeline_py" "${pipeline_py}.tmp"; \
+    echo 'import kfp; kfp.components.default_base_image_or_builder="gcr.io/google-appengine/python:2020-03-31-141326"' | cat - "${pipeline_py}.tmp" > "$pipeline_py"; \
+    dsl-compile --py "$pipeline_py" --output "$pipeline_yaml" --mode "$mode" || python3 "$pipeline_py"; \
     done
 
 # 3. Start api web server

diff --git a/backend/third_party_licenses/apiserver.csv b/backend/third_party_licenses/apiserver.csv
@@ -9,7 +9,7 @@ github.com/PuerkitoBio/purell, https://github.com/PuerkitoBio/purell/blob/v1.1.1
 github.com/PuerkitoBio/urlesc, https://github.com/PuerkitoBio/urlesc/blob/de5bf2ad4578/LICENSE, BSD-3-Clause
 github.com/VividCortex/mysqlerr, https://github.com/VividCortex/mysqlerr/blob/6c6b55f8796f/LICENSE, MIT
 github.com/antonmedv/expr, https://github.com/antonmedv/expr/blob/v1.8.8/LICENSE, MIT
-github.com/Bobgy/argo-workflows/v3, https://github.com/Bobgy/argo-workflows/blob/v3.1.1-patch/LICENSE, Apache-2.0
+github.com/Bobgy/argo-workflows/v3, https://github.com/Bobgy/argo-workflows/blob/v3.1.2-patch.2/LICENSE, Apache-2.0
 github.com/argoproj/pkg, https://github.com/argoproj/pkg/blob/v0.8.1/LICENSE, Apache-2.0
 github.com/asaskevich/govalidator, https://github.com/asaskevich/govalidator/blob/7a23bdc65eef/LICENSE, MIT
 github.com/beorn7/perks, https://github.com/beorn7/perks/blob/v1.0.1/LICENSE, MIT

diff --git a/backend/third_party_licenses/cache_server.csv b/backend/third_party_licenses/cache_server.csv
@@ -7,7 +7,7 @@ github.com/Masterminds/sprig, https://github.com/Masterminds/sprig/blob/v2.22.0/
 github.com/PuerkitoBio/purell, https://github.com/PuerkitoBio/purell/blob/v1.1.1/LICENSE, BSD-3-Clause
 github.com/PuerkitoBio/urlesc, https://github.com/PuerkitoBio/urlesc/blob/de5bf2ad4578/LICENSE, BSD-3-Clause
 github.com/antonmedv/expr, https://github.com/antonmedv/expr/blob/v1.8.8/LICENSE, MIT
-github.com/Bobgy/argo-workflows/v3, https://github.com/Bobgy/argo-workflows/blob/v3.1.1-patch/LICENSE, Apache-2.0
+github.com/Bobgy/argo-workflows/v3, https://github.com/Bobgy/argo-workflows/blob/v3.1.2-patch.2/LICENSE, Apache-2.0
 github.com/argoproj/pkg, https://github.com/argoproj/pkg/blob/v0.8.1/LICENSE, Apache-2.0
 github.com/asaskevich/govalidator, https://github.com/asaskevich/govalidator/blob/7a23bdc65eef/LICENSE, MIT
 github.com/beorn7/perks, https://github.com/beorn7/perks/blob/v1.0.1/LICENSE, MIT

diff --git a/backend/third_party_licenses/persistence_agent.csv b/backend/third_party_licenses/persistence_agent.csv
@@ -9,7 +9,7 @@ github.com/Masterminds/sprig, https://github.com/Masterminds/sprig/blob/v2.22.0/
 github.com/PuerkitoBio/purell, https://github.com/PuerkitoBio/purell/blob/v1.1.1/LICENSE, BSD-3-Clause
 github.com/PuerkitoBio/urlesc, https://github.com/PuerkitoBio/urlesc/blob/de5bf2ad4578/LICENSE, BSD-3-Clause
 github.com/antonmedv/expr, https://github.com/antonmedv/expr/blob/v1.8.8/LICENSE, MIT
-github.com/Bobgy/argo-workflows/v3, https://github.com/Bobgy/argo-workflows/blob/v3.1.1-patch/LICENSE, Apache-2.0
+github.com/Bobgy/argo-workflows/v3, https://github.com/Bobgy/argo-workflows/blob/v3.1.2-patch.2/LICENSE, Apache-2.0
 github.com/argoproj/pkg, https://github.com/argoproj/pkg/blob/v0.8.1/LICENSE, Apache-2.0
 github.com/asaskevich/govalidator, https://github.com/asaskevich/govalidator/blob/7a23bdc65eef/LICENSE, MIT
 github.com/beorn7/perks, https://github.com/beorn7/perks/blob/v1.0.1/LICENSE, MIT

diff --git a/backend/third_party_licenses/swf.csv b/backend/third_party_licenses/swf.csv
@@ -9,7 +9,7 @@ github.com/Masterminds/sprig, https://github.com/Masterminds/sprig/blob/v2.22.0/
 github.com/PuerkitoBio/purell, https://github.com/PuerkitoBio/purell/blob/v1.1.1/LICENSE, BSD-3-Clause
 github.com/PuerkitoBio/urlesc, https://github.com/PuerkitoBio/urlesc/blob/de5bf2ad4578/LICENSE, BSD-3-Clause
 github.com/antonmedv/expr, https://github.com/antonmedv/expr/blob/v1.8.8/LICENSE, MIT
-github.com/Bobgy/argo-workflows/v3, https://github.com/Bobgy/argo-workflows/blob/v3.1.1-patch/LICENSE, Apache-2.0
+github.com/Bobgy/argo-workflows/v3, https://github.com/Bobgy/argo-workflows/blob/v3.1.2-patch.2/LICENSE, Apache-2.0
 github.com/argoproj/pkg, https://github.com/argoproj/pkg/blob/v0.8.1/LICENSE, Apache-2.0
 github.com/asaskevich/govalidator, https://github.com/asaskevich/govalidator/blob/7a23bdc65eef/LICENSE, MIT
 github.com/beorn7/perks, https://github.com/beorn7/perks/blob/v1.0.1/LICENSE, MIT

diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/kubeflow/pipelines
 require (
 	github.com/Masterminds/squirrel v0.0.0-20190107164353-fa735ea14f09
 	github.com/VividCortex/mysqlerr v0.0.0-20170204212430-6c6b55f8796f
-	github.com/argoproj/argo-workflows/v3 v3.1.1
+	github.com/argoproj/argo-workflows/v3 v3.1.2
 	github.com/cenkalti/backoff v2.0.0+incompatible
 	github.com/denisenkom/go-mssqldb v0.0.0-20181014144952-4e0d7dc8888f // indirect
 	github.com/elazarl/goproxy v0.0.0-20181111060418-2ce16c963a8a // indirect
@@ -55,7 +55,7 @@ require (
 
 replace (
 	// TODO: remove temporary patch
-	github.com/argoproj/argo-workflows/v3 v3.1.1 => github.com/Bobgy/argo-workflows/v3 v3.1.1-patch
+	github.com/argoproj/argo-workflows/v3 v3.1.2 => github.com/Bobgy/argo-workflows/v3 v3.1.2-patch.2
 	github.com/kubeflow/pipelines/api => ./api
 	k8s.io/kubernetes => k8s.io/kubernetes v1.11.1
 	sigs.k8s.io/controller-tools => sigs.k8s.io/controller-tools v0.2.9

diff --git a/go.sum b/go.sum
diff --git a/manifests/gcp_marketplace/chart/kubeflow-pipelines/templates/argo.yaml b/manifests/gcp_marketplace/chart/kubeflow-pipelines/templates/argo.yaml
@@ -341,9 +341,9 @@ subjects:
 apiVersion: v1
 data:
   # References:
-  # * https://github.com/argoproj/argo-workflows/blob/v3.1.1/config/config.go
-  # * https://github.com/argoproj/argo-workflows/blob/v3.1.1/docs/workflow-controller-configmap.md
-  # * https://github.com/argoproj/argo-workflows/blob/v3.1.1/docs/workflow-controller-configmap.yaml
+  # * https://github.com/argoproj/argo-workflows/blob/v3.1.2/config/config.go
+  # * https://github.com/argoproj/argo-workflows/blob/v3.1.2/docs/workflow-controller-configmap.md
+  # * https://github.com/argoproj/argo-workflows/blob/v3.1.2/docs/workflow-controller-configmap.yaml
 
   containerRuntimeExecutor: docker
 

diff --git a/manifests/gcp_marketplace/test/snapshot-base.yaml b/manifests/gcp_marketplace/test/snapshot-base.yaml
@@ -825,9 +825,9 @@ subjects:
 apiVersion: v1
 data:
   # References:
-  # * https://github.com/argoproj/argo-workflows/blob/v3.1.1/config/config.go
-  # * https://github.com/argoproj/argo-workflows/blob/v3.1.1/docs/workflow-controller-configmap.md
-  # * https://github.com/argoproj/argo-workflows/blob/v3.1.1/docs/workflow-controller-configmap.yaml
+  # * https://github.com/argoproj/argo-workflows/blob/v3.1.2/config/config.go
+  # * https://github.com/argoproj/argo-workflows/blob/v3.1.2/docs/workflow-controller-configmap.md
+  # * https://github.com/argoproj/argo-workflows/blob/v3.1.2/docs/workflow-controller-configmap.yaml
 
   containerRuntimeExecutor: docker
 

diff --git a/manifests/gcp_marketplace/test/snapshot-managed-storage-with-db-prefix.yaml b/manifests/gcp_marketplace/test/snapshot-managed-storage-with-db-prefix.yaml
@@ -840,9 +840,9 @@ subjects:
 apiVersion: v1
 data:
   # References:
-  # * https://github.com/argoproj/argo-workflows/blob/v3.1.1/config/config.go
-  # * https://github.com/argoproj/argo-workflows/blob/v3.1.1/docs/workflow-controller-configmap.md
-  # * https://github.com/argoproj/argo-workflows/blob/v3.1.1/docs/workflow-controller-configmap.yaml
+  # * https://github.com/argoproj/argo-workflows/blob/v3.1.2/config/config.go
+  # * https://github.com/argoproj/argo-workflows/blob/v3.1.2/docs/workflow-controller-configmap.md
+  # * https://github.com/argoproj/argo-workflows/blob/v3.1.2/docs/workflow-controller-configmap.yaml
 
   containerRuntimeExecutor: docker
 

diff --git a/manifests/gcp_marketplace/test/snapshot-managed-storage.yaml b/manifests/gcp_marketplace/test/snapshot-managed-storage.yaml
@@ -840,9 +840,9 @@ subjects:
 apiVersion: v1
 data:
   # References:
-  # * https://github.com/argoproj/argo-workflows/blob/v3.1.1/config/config.go
-  # * https://github.com/argoproj/argo-workflows/blob/v3.1.1/docs/workflow-controller-configmap.md
-  # * https://github.com/argoproj/argo-workflows/blob/v3.1.1/docs/workflow-controller-configmap.yaml
+  # * https://github.com/argoproj/argo-workflows/blob/v3.1.2/config/config.go
+  # * https://github.com/argoproj/argo-workflows/blob/v3.1.2/docs/workflow-controller-configmap.md
+  # * https://github.com/argoproj/argo-workflows/blob/v3.1.2/docs/workflow-controller-configmap.yaml
 
   containerRuntimeExecutor: docker
 

diff --git a/...s/kustomize/env/platform-agnostic-multi-user-pns/workflow-controller-configmap-patch.yaml b/...s/kustomize/env/platform-agnostic-multi-user-pns/workflow-controller-configmap-patch.yaml
@@ -4,9 +4,9 @@ metadata:
   name: workflow-controller-configmap
 data:
   # References:
-  # * https://github.com/argoproj/argo-workflows/blob/v3.1.1/config/config.go
-  # * https://github.com/argoproj/argo-workflows/blob/v3.1.1/docs/workflow-controller-configmap.md
-  # * https://github.com/argoproj/argo-workflows/blob/v3.1.1/docs/workflow-controller-configmap.yaml
+  # * https://github.com/argoproj/argo-workflows/blob/v3.1.2/config/config.go
+  # * https://github.com/argoproj/argo-workflows/blob/v3.1.2/docs/workflow-controller-configmap.md
+  # * https://github.com/argoproj/argo-workflows/blob/v3.1.2/docs/workflow-controller-configmap.yaml
 
   # pns executor is a more portable default, see https://github.com/kubeflow/pipelines/issues/1654.
   containerRuntimeExecutor: pns
diff --git a/manifests/kustomize/env/platform-agnostic-pns/workflow-controller-configmap-patch.yaml b/manifests/kustomize/env/platform-agnostic-pns/workflow-controller-configmap-patch.yaml
@@ -4,9 +4,9 @@ metadata:
   name: workflow-controller-configmap
 data:
   # References:
-  # * https://github.com/argoproj/argo-workflows/blob/v3.1.1/config/config.go
-  # * https://github.com/argoproj/argo-workflows/blob/v3.1.1/docs/workflow-controller-configmap.md
-  # * https://github.com/argoproj/argo-workflows/blob/v3.1.1/docs/workflow-controller-configmap.yaml
+  # * https://github.com/argoproj/argo-workflows/blob/v3.1.2/config/config.go
+  # * https://github.com/argoproj/argo-workflows/blob/v3.1.2/docs/workflow-controller-configmap.md
+  # * https://github.com/argoproj/argo-workflows/blob/v3.1.2/docs/workflow-controller-configmap.yaml
 
   # pns executor is a more portable default, see https://github.com/kubeflow/pipelines/issues/1654.
   # However, it is flaky for containers that run really fast, see https://github.com/kubeflow/pipelines/issues/5285.

diff --git a/manifests/kustomize/third-party/argo/base/workflow-controller-configmap-patch.yaml b/manifests/kustomize/third-party/argo/base/workflow-controller-configmap-patch.yaml
@@ -4,9 +4,9 @@ metadata:
   name: workflow-controller-configmap
 data:
   # References:
-  # * https://github.com/argoproj/argo-workflows/blob/v3.1.1/config/config.go
-  # * https://github.com/argoproj/argo-workflows/blob/v3.1.1/docs/workflow-controller-configmap.md
-  # * https://github.com/argoproj/argo-workflows/blob/v3.1.1/docs/workflow-controller-configmap.yaml
+  # * https://github.com/argoproj/argo-workflows/blob/v3.1.2/config/config.go
+  # * https://github.com/argoproj/argo-workflows/blob/v3.1.2/docs/workflow-controller-configmap.md
+  # * https://github.com/argoproj/argo-workflows/blob/v3.1.2/docs/workflow-controller-configmap.yaml
 
   # emissary executor is a more portable default, see https://github.com/kubeflow/pipelines/issues/1654.
   containerRuntimeExecutor: docker

diff --git a/manifests/kustomize/third-party/argo/base/workflow-controller-deployment-patch.yaml b/manifests/kustomize/third-party/argo/base/workflow-controller-deployment-patch.yaml
@@ -7,12 +7,12 @@ spec:
     spec:
       containers:
         - name: workflow-controller
-          image: gcr.io/ml-pipeline/workflow-controller:v3.1.1-patch-license-compliance
+          image: gcr.io/ml-pipeline/workflow-controller:v3.1.2-patch.2-license-compliance
           args:
             - --configmap
             - workflow-controller-configmap
             - --executor-image
-            - gcr.io/ml-pipeline/argoexec:v3.1.1-patch-license-compliance
+            - gcr.io/ml-pipeline/argoexec:v3.1.2-patch.2-license-compliance
           resources:
             requests:
               cpu: 100m

diff --git a/test/install-argo-cli.sh b/test/install-argo-cli.sh
@@ -19,8 +19,8 @@ set -ex
 DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null && pwd)"
 REPO_ROOT="${DIR}/.."
 # ARGO_VERSION="$(cat ${REPO_ROOT}/third_party/argo/VERSION)"
-# TODO: remove temporary patch, because argo/VERSION is currently v3.1.1-patch
-ARGO_VERSION=v3.1.1
+# TODO: remove temporary patch, because argo/VERSION is currently v3.1.2-patch.2
+ARGO_VERSION=v3.1.2
 OS=${OS:-"linux-amd64"}
 
 # if argo is not installed

diff --git a/test/sample-test/Dockerfile b/test/sample-test/Dockerfile
@@ -24,7 +24,7 @@ COPY ./samples /python/src/github.com/kubeflow/pipelines/samples
 RUN cd /python/src/github.com/kubeflow/pipelines
 
 # Downloading Argo CLI so that the samples are validated
-ENV ARGO_VERSION v3.1.1
+ENV ARGO_VERSION v3.1.2
 RUN curl -sLO https://github.com/argoproj/argo-workflows/releases/download/${ARGO_VERSION}/argo-linux-amd64.gz && \
   gunzip argo-linux-amd64.gz && \
   chmod +x argo-linux-amd64 && \