kubeflow
/
pipelines
mirror of https://github.com/kubeflow/pipelines.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Yuan (Bob) Gong 2021-07-22 18:51:25 +08:00 committed by GitHub
parent bd281a55fa
commit 04342436a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 66 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.cloudbuild.yaml
View File

@ -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

20
.release.cloudbuild.yaml
View File

@ -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)

18
backend/Dockerfile
View File

@ -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

2
backend/third_party_licenses/apiserver.csv
View File

@ -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

1 # Generated by https://github.com/google/go-licenses/v2. DO NOT EDIT.
9 github.com/PuerkitoBio/urlesc, https://github.com/PuerkitoBio/urlesc/blob/de5bf2ad4578/LICENSE, BSD-3-Clause
10 github.com/VividCortex/mysqlerr, https://github.com/VividCortex/mysqlerr/blob/6c6b55f8796f/LICENSE, MIT
11 github.com/antonmedv/expr, https://github.com/antonmedv/expr/blob/v1.8.8/LICENSE, MIT
12 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
13 github.com/argoproj/pkg, https://github.com/argoproj/pkg/blob/v0.8.1/LICENSE, Apache-2.0
14 github.com/asaskevich/govalidator, https://github.com/asaskevich/govalidator/blob/7a23bdc65eef/LICENSE, MIT
15 github.com/beorn7/perks, https://github.com/beorn7/perks/blob/v1.0.1/LICENSE, MIT

2
backend/third_party_licenses/cache_server.csv
View File

@ -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

1 # Generated by https://github.com/google/go-licenses/v2. DO NOT EDIT.
7 github.com/PuerkitoBio/purell, https://github.com/PuerkitoBio/purell/blob/v1.1.1/LICENSE, BSD-3-Clause
8 github.com/PuerkitoBio/urlesc, https://github.com/PuerkitoBio/urlesc/blob/de5bf2ad4578/LICENSE, BSD-3-Clause
9 github.com/antonmedv/expr, https://github.com/antonmedv/expr/blob/v1.8.8/LICENSE, MIT
10 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
11 github.com/argoproj/pkg, https://github.com/argoproj/pkg/blob/v0.8.1/LICENSE, Apache-2.0
12 github.com/asaskevich/govalidator, https://github.com/asaskevich/govalidator/blob/7a23bdc65eef/LICENSE, MIT
13 github.com/beorn7/perks, https://github.com/beorn7/perks/blob/v1.0.1/LICENSE, MIT

2
backend/third_party_licenses/persistence_agent.csv
View File

@ -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

1 # Generated by https://github.com/google/go-licenses/v2. DO NOT EDIT.
9 github.com/PuerkitoBio/purell, https://github.com/PuerkitoBio/purell/blob/v1.1.1/LICENSE, BSD-3-Clause
10 github.com/PuerkitoBio/urlesc, https://github.com/PuerkitoBio/urlesc/blob/de5bf2ad4578/LICENSE, BSD-3-Clause
11 github.com/antonmedv/expr, https://github.com/antonmedv/expr/blob/v1.8.8/LICENSE, MIT
12 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
13 github.com/argoproj/pkg, https://github.com/argoproj/pkg/blob/v0.8.1/LICENSE, Apache-2.0
14 github.com/asaskevich/govalidator, https://github.com/asaskevich/govalidator/blob/7a23bdc65eef/LICENSE, MIT
15 github.com/beorn7/perks, https://github.com/beorn7/perks/blob/v1.0.1/LICENSE, MIT

2
backend/third_party_licenses/swf.csv
View File

@ -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

1 # Generated by https://github.com/google/go-licenses/v2. DO NOT EDIT.
9 github.com/PuerkitoBio/purell, https://github.com/PuerkitoBio/purell/blob/v1.1.1/LICENSE, BSD-3-Clause
10 github.com/PuerkitoBio/urlesc, https://github.com/PuerkitoBio/urlesc/blob/de5bf2ad4578/LICENSE, BSD-3-Clause
11 github.com/antonmedv/expr, https://github.com/antonmedv/expr/blob/v1.8.8/LICENSE, MIT
12 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
13 github.com/argoproj/pkg, https://github.com/argoproj/pkg/blob/v0.8.1/LICENSE, Apache-2.0
14 github.com/asaskevich/govalidator, https://github.com/asaskevich/govalidator/blob/7a23bdc65eef/LICENSE, MIT
15 github.com/beorn7/perks, https://github.com/beorn7/perks/blob/v1.0.1/LICENSE, MIT

4
go.mod
View File

@ -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

4
go.sum generated
View File

@ -60,8 +60,8 @@ github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6L
github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8=
github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk=
github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
github.com/Bobgy/argo-workflows/v3 v3.1.1-patch h1:qj9oOOdXnZSadf5IS51T+1yVdRh/yEzuD8U7EuMF1Dk=
github.com/Bobgy/argo-workflows/v3 v3.1.1-patch/go.mod h1:Z8Wc7uDOGw8TRdhqqREHLFE5SAgS0ENqqwaLakv56MU=
github.com/Bobgy/argo-workflows/v3 v3.1.2-patch.2 h1:HrsGEO2tq97zOFGB87OiNQh1/YNCZYaS+oogx6QS28Y=
github.com/Bobgy/argo-workflows/v3 v3.1.2-patch.2/go.mod h1:Z8Wc7uDOGw8TRdhqqREHLFE5SAgS0ENqqwaLakv56MU=
github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=

6
manifests/gcp_marketplace/chart/kubeflow-pipelines/templates/argo.yaml
View File

@ -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

6
manifests/gcp_marketplace/test/snapshot-base.yaml
View File

@ -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

6
manifests/gcp_marketplace/test/snapshot-managed-storage-with-db-prefix.yaml
View File

@ -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

6
manifests/gcp_marketplace/test/snapshot-managed-storage.yaml
View File

@ -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

6
manifests/kustomize/env/platform-agnostic-multi-user-pns/workflow-controller-configmap-patch.yaml vendored
View File

@ -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

6
manifests/kustomize/env/platform-agnostic-pns/workflow-controller-configmap-patch.yaml vendored
View File

@ -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.

6
manifests/kustomize/third-party/argo/base/workflow-controller-configmap-patch.yaml vendored
View File

@ -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

4
manifests/kustomize/third-party/argo/base/workflow-controller-deployment-patch.yaml vendored
View File

@ -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

4
test/install-argo-cli.sh
View File

@ -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

2
test/sample-test/Dockerfile
View File

@ -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 && \

8
test/tag_for_hosted.sh
View File

@ -120,12 +120,12 @@ docker tag gcr.io/cloudsql-docker/gce-proxy:1.14 gcr.io/$PROJECT_ID/hosted/$COMM
docker push gcr.io/$PROJECT_ID/hosted/$COMMIT_SHA/cloudsqlproxy:$SEM_VER
docker push gcr.io/$PROJECT_ID/hosted/$COMMIT_SHA/cloudsqlproxy:$MM_VER
docker tag gcr.io/ml-pipeline/argoexec:v3.1.1-patch-license-compliance gcr.io/$PROJECT_ID/hosted/$COMMIT_SHA/argoexecutor:$SEM_VER
docker tag gcr.io/ml-pipeline/argoexec:v3.1.1-patch-license-compliance gcr.io/$PROJECT_ID/hosted/$COMMIT_SHA/argoexecutor:$MM_VER
docker tag gcr.io/ml-pipeline/argoexec:v3.1.2-patch.2-license-compliance gcr.io/$PROJECT_ID/hosted/$COMMIT_SHA/argoexecutor:$SEM_VER
docker tag gcr.io/ml-pipeline/argoexec:v3.1.2-patch.2-license-compliance gcr.io/$PROJECT_ID/hosted/$COMMIT_SHA/argoexecutor:$MM_VER
docker push gcr.io/$PROJECT_ID/hosted/$COMMIT_SHA/argoexecutor:$SEM_VER
docker push gcr.io/$PROJECT_ID/hosted/$COMMIT_SHA/argoexecutor:$MM_VER
docker tag gcr.io/ml-pipeline/workflow-controller:v3.1.1-patch-license-compliance gcr.io/$PROJECT_ID/hosted/$COMMIT_SHA/argoworkflowcontroller:$SEM_VER
docker tag gcr.io/ml-pipeline/workflow-controller:v3.1.1-patch-license-compliance gcr.io/$PROJECT_ID/hosted/$COMMIT_SHA/argoworkflowcontroller:$MM_VER
docker tag gcr.io/ml-pipeline/workflow-controller:v3.1.2-patch.2-license-compliance gcr.io/$PROJECT_ID/hosted/$COMMIT_SHA/argoworkflowcontroller:$SEM_VER
docker tag gcr.io/ml-pipeline/workflow-controller:v3.1.2-patch.2-license-compliance gcr.io/$PROJECT_ID/hosted/$COMMIT_SHA/argoworkflowcontroller:$MM_VER
docker push gcr.io/$PROJECT_ID/hosted/$COMMIT_SHA/argoworkflowcontroller:$SEM_VER
docker push gcr.io/$PROJECT_ID/hosted/$COMMIT_SHA/argoworkflowcontroller:$MM_VER

2
third_party/argo/Dockerfile.argoexec vendored
View File

@ -15,7 +15,7 @@
ARG TAG
# FROM docker.io/argoproj/argoexec:${TAG}
# TODO: remove temporary fork
FROM gcr.io/ml-pipeline-test/argoexec:v3.1.1-patch
FROM gcr.io/ml-pipeline-test/argoexec:v3.1.2-patch.2
# Copy notices, licenses and source code.
COPY NOTICES/argoexec /NOTICES

2
third_party/argo/Dockerfile.workflow-controller vendored
View File

@ -15,7 +15,7 @@
ARG TAG
# FROM docker.io/argoproj/workflow-controller:${TAG}
# TODO: remove temporary fork
FROM gcr.io/ml-pipeline-test/workflow-controller:v3.1.1-patch
FROM gcr.io/ml-pipeline-test/workflow-controller:v3.1.2-patch.2
# Copy notices, licenses and source code.
COPY NOTICES/workflow-controller /NOTICES

2
third_party/argo/README.md vendored
View File

@ -21,7 +21,7 @@ Instructions:
1. Set version of argo you want to upgrade to, for example:
```bash
ARGO_TAG=v3.1.1
ARGO_TAG=v3.1.2
```
1. ```bash

2
third_party/argo/VERSION vendored
View File

@ -1 +1 @@
v3.1.1-patch
v3.1.2-patch.2

2
third_party/argo/go-licenses.yaml vendored
View File

@ -1,6 +1,6 @@
module:
go:
version: v3.1.1
version: v3.1.2
overrides:
- name: github.com/davecgh/go-spew
version: v1.1.1

2
third_party/argo/licenses-argoexec.csv vendored
View File

@ -1,5 +1,5 @@
# Generated by https://github.com/google/go-licenses/v2. DO NOT EDIT.
github.com/argoproj/argo-workflows/v3, https://github.com/argoproj/argo-workflows/blob/v3.1.1/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
cloud.google.com/go, https://github.com/googleapis/google-cloud-go/blob/v0.55.0/LICENSE, Apache-2.0
cloud.google.com/go, https://github.com/googleapis/google-cloud-go/blob/v0.55.0/cmd/go-cloud-debug-agent/internal/debug/elf/elf.go, BSD-2-Clause
cloud.google.com/go/storage, https://github.com/googleapis/google-cloud-go/blob/storage/v1.6.0/LICENSE, Apache-2.0

1 # Generated by https://github.com/google/go-licenses/v2. DO NOT EDIT.
2 github.com/argoproj/argo-workflows/v3, https://github.com/argoproj/argo-workflows/blob/v3.1.1/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
3 cloud.google.com/go, https://github.com/googleapis/google-cloud-go/blob/v0.55.0/LICENSE, Apache-2.0
4 cloud.google.com/go, https://github.com/googleapis/google-cloud-go/blob/v0.55.0/cmd/go-cloud-debug-agent/internal/debug/elf/elf.go, BSD-2-Clause
5 cloud.google.com/go/storage, https://github.com/googleapis/google-cloud-go/blob/storage/v1.6.0/LICENSE, Apache-2.0

2
third_party/argo/licenses-workflow-controller.csv vendored
View File

@ -1,5 +1,5 @@
# Generated by https://github.com/google/go-licenses/v2. DO NOT EDIT.
github.com/argoproj/argo-workflows/v3, https://github.com/argoproj/argo-workflows/blob/v3.1.1/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
cloud.google.com/go, https://github.com/googleapis/google-cloud-go/blob/v0.55.0/LICENSE, Apache-2.0
cloud.google.com/go, https://github.com/googleapis/google-cloud-go/blob/v0.55.0/cmd/go-cloud-debug-agent/internal/debug/elf/elf.go, BSD-2-Clause
github.com/Azure/go-autorest/autorest, https://github.com/Azure/go-autorest/blob/autorest/v0.11.1/LICENSE, Apache-2.0

1 # Generated by https://github.com/google/go-licenses/v2. DO NOT EDIT.
2 github.com/argoproj/argo-workflows/v3, https://github.com/argoproj/argo-workflows/blob/v3.1.1/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
3 cloud.google.com/go, https://github.com/googleapis/google-cloud-go/blob/v0.55.0/LICENSE, Apache-2.0
4 cloud.google.com/go, https://github.com/googleapis/google-cloud-go/blob/v0.55.0/cmd/go-cloud-debug-agent/internal/debug/elf/elf.go, BSD-2-Clause
5 github.com/Azure/go-autorest/autorest, https://github.com/Azure/go-autorest/blob/autorest/v0.11.1/LICENSE, Apache-2.0