Skip to content

Commit

Permalink
feat: upgrade argo-workflows to v3.1.0. Part of #5718 (#5922)
Browse files Browse the repository at this point in the history
  • Loading branch information
Bobgy authored Jun 28, 2021
1 parent 551756e commit 3973407
Show file tree
Hide file tree
Showing 68 changed files with 75,606 additions and 36,448 deletions.
4 changes: 2 additions & 2 deletions .cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:v2.12.9-license-compliance']
args: ['pull', 'gcr.io/ml-pipeline/argoexec:v3.1.0-license-compliance']
id: 'pullArgoExecutor'
- name: 'gcr.io/cloud-builders/docker'
args: ['pull', 'gcr.io/ml-pipeline/workflow-controller:v2.12.9-license-compliance']
args: ['pull', 'gcr.io/ml-pipeline/workflow-controller:v3.1.0-license-compliance']
id: 'pullArgoWorkflowController'

# Tag for Hosted - SemVersion to Major.Minor parsing
Expand Down
20 changes: 10 additions & 10 deletions .release.cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:v2.12.9-license-compliance']
args: ['pull', 'gcr.io/ml-pipeline/argoexec:v3.1.0-license-compliance']
id: 'pullArgoExecutor'
- name: 'gcr.io/cloud-builders/docker'
args: ['tag', 'gcr.io/ml-pipeline/argoexec:v2.12.9-license-compliance', 'gcr.io/ml-pipeline/google/pipelines/argoexecutor:$TAG_NAME']
args: ['tag', 'gcr.io/ml-pipeline/argoexec:v3.1.0-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:v2.12.9-license-compliance', 'gcr.io/ml-pipeline/google/pipelines-test/argoexecutor:$TAG_NAME']
args: ['tag', 'gcr.io/ml-pipeline/argoexec:v3.1.0-license-compliance', 'gcr.io/ml-pipeline/google/pipelines-test/argoexecutor:$TAG_NAME']
id: 'tagArgoExecutorForMarketplaceTest'
waitFor: ['pullArgoExecutor']
- id: 'tagArgoExecutorForMarketplaceMajorMinor'
Expand All @@ -496,20 +496,20 @@ steps:
args:
- -ceux
- |
docker tag gcr.io/ml-pipeline/argoexec:v2.12.9-license-compliance gcr.io/ml-pipeline/google/pipelines/argoexecutor:$(cat /workspace/mm.ver)
docker tag gcr.io/ml-pipeline/argoexec:v2.12.9-license-compliance gcr.io/ml-pipeline/google/pipelines-test/argoexecutor:$(cat /workspace/mm.ver)
docker tag gcr.io/ml-pipeline/argoexec:v3.1.0-license-compliance gcr.io/ml-pipeline/google/pipelines/argoexecutor:$(cat /workspace/mm.ver)
docker tag gcr.io/ml-pipeline/argoexec:v3.1.0-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:v2.12.9-license-compliance']
args: ['pull', 'gcr.io/ml-pipeline/workflow-controller:v3.1.0-license-compliance']
id: 'pullArgoWorkflowController'
- name: 'gcr.io/cloud-builders/docker'
args: ['tag', 'gcr.io/ml-pipeline/workflow-controller:v2.12.9-license-compliance', 'gcr.io/ml-pipeline/google/pipelines/argoworkflowcontroller:$TAG_NAME']
args: ['tag', 'gcr.io/ml-pipeline/workflow-controller:v3.1.0-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:v2.12.9-license-compliance', 'gcr.io/ml-pipeline/google/pipelines-test/argoworkflowcontroller:$TAG_NAME']
args: ['tag', 'gcr.io/ml-pipeline/workflow-controller:v3.1.0-license-compliance', 'gcr.io/ml-pipeline/google/pipelines-test/argoworkflowcontroller:$TAG_NAME']
id: 'tagArgoWorkflowControllerForMarketplaceTest'
waitFor: ['pullArgoWorkflowController']
- id: 'tagArgoWorkflowControllerForMarketplaceMajorMinor'
Expand All @@ -519,8 +519,8 @@ steps:
args:
- -ceux
- |
docker tag gcr.io/ml-pipeline/workflow-controller:v2.12.9-license-compliance gcr.io/ml-pipeline/google/pipelines/argoworkflowcontroller:$(cat /workspace/mm.ver)
docker tag gcr.io/ml-pipeline/workflow-controller:v2.12.9-license-compliance gcr.io/ml-pipeline/google/pipelines-test/argoworkflowcontroller:$(cat /workspace/mm.ver)
docker tag gcr.io/ml-pipeline/workflow-controller:v3.1.0-license-compliance gcr.io/ml-pipeline/google/pipelines/argoworkflowcontroller:$(cat /workspace/mm.ver)
docker tag gcr.io/ml-pipeline/workflow-controller:v3.1.0-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)
Expand Down
2 changes: 1 addition & 1 deletion backend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ 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 v2.12.9
ENV ARGO_VERSION v3.1.0
RUN curl -sLO https://github.com/argoproj/argo/releases/download/${ARGO_VERSION}/argo-linux-amd64.gz && \
gunzip argo-linux-amd64.gz && \
chmod +x argo-linux-amd64 && \
Expand Down
14 changes: 9 additions & 5 deletions backend/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ CSV_PATH=backend/third_party_licenses
.PHONY: all
all: license_apiserver license_persistence_agent license_cache_server license_swf license_viewer

.PHONY: clean
clean:
rm -rf $(BUILD)

$(BUILD)/apiserver:
GO111MODULE=on go build -o $(BUILD)/apiserver github.com/kubeflow/pipelines/backend/src/apiserver
$(BUILD)/persistence_agent:
Expand All @@ -22,19 +26,19 @@ $(BUILD)/viewer:
# See README.md#updating-licenses-info section for more details.
.PHONY: license_apiserver
license_apiserver: $(BUILD)/apiserver
cd $(MOD_ROOT) && go-licenses csv backend/$(BUILD)/apiserver | tee $(CSV_PATH)/apiserver.csv
cd $(MOD_ROOT) && go-licenses csv backend/$(BUILD)/apiserver > $(CSV_PATH)/apiserver.csv
.PHONY: license_persistence_agent
license_persistence_agent: $(BUILD)/persistence_agent
cd $(MOD_ROOT) && go-licenses csv backend/$(BUILD)/persistence_agent | tee $(CSV_PATH)/persistence_agent.csv
cd $(MOD_ROOT) && go-licenses csv backend/$(BUILD)/persistence_agent > $(CSV_PATH)/persistence_agent.csv
.PHONY: license_cache_server
license_cache_server: $(BUILD)/cache_server
cd $(MOD_ROOT) && go-licenses csv backend/$(BUILD)/cache_server | tee $(CSV_PATH)/cache_server.csv
cd $(MOD_ROOT) && go-licenses csv backend/$(BUILD)/cache_server > $(CSV_PATH)/cache_server.csv
.PHONY: license_swf
license_swf: $(BUILD)/swf
cd $(MOD_ROOT) && go-licenses csv backend/$(BUILD)/swf | tee $(CSV_PATH)/swf.csv
cd $(MOD_ROOT) && go-licenses csv backend/$(BUILD)/swf > $(CSV_PATH)/swf.csv
.PHONY: license_viewer
license_viewer: $(BUILD)/viewer
cd $(MOD_ROOT) && go-licenses csv backend/$(BUILD)/viewer | tee $(CSV_PATH)/viewer.csv
cd $(MOD_ROOT) && go-licenses csv backend/$(BUILD)/viewer > $(CSV_PATH)/viewer.csv

.PHONY: image_all
image_all: image_apiserver image_persistence_agent image_cache image_swf image_viewer
Expand Down
26 changes: 18 additions & 8 deletions backend/third_party_licenses/apiserver.csv
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
# Generated by https://github.com/google/go-licenses/v2. DO NOT EDIT.
github.com/kubeflow/pipelines, https://github.com/kubeflow/pipelines/blob/master/LICENSE, Apache-2.0
github.com/kubeflow/pipelines, https://github.com/kubeflow/pipelines/blob/master/backend/src/apiserver/archive/log.go, Apache-2.0
github.com/Masterminds/goutils, https://github.com/Masterminds/goutils/blob/v1.1.0/LICENSE.txt, Apache-2.0
github.com/Masterminds/semver, https://github.com/Masterminds/semver/blob/v1.5.0/LICENSE.txt, MIT
github.com/Masterminds/sprig, https://github.com/Masterminds/sprig/blob/v2.22.0/LICENSE.txt, MIT
github.com/Masterminds/squirrel, https://github.com/Masterminds/squirrel/blob/fa735ea14f09/LICENSE.txt, MIT
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/VividCortex/mysqlerr, https://github.com/VividCortex/mysqlerr/blob/6c6b55f8796f/LICENSE, MIT
github.com/argoproj/argo-workflows/v3, https://github.com/argoproj/argo-workflows/blob/v3.0.4/LICENSE, Apache-2.0
github.com/antonmedv/expr, https://github.com/antonmedv/expr/blob/v1.8.8/LICENSE, MIT
github.com/argoproj/argo-workflows/v3, https://github.com/argoproj/argo-workflows/blob/v3.1.0/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
Expand All @@ -14,6 +18,7 @@ github.com/cespare/xxhash/v2, https://github.com/cespare/xxhash/blob/v2.1.1/LICE
github.com/colinmarc/hdfs, https://github.com/colinmarc/hdfs/blob/9746310a4d31/LICENSE.txt, MIT
github.com/davecgh/go-spew, https://github.com/davecgh/go-spew/blob/v1.1.1/LICENSE, ISC
github.com/docker/spdystream, https://github.com/docker/spdystream/blob/6480d4af844c/LICENSE, Apache-2.0
github.com/doublerebel/bellows, https://github.com/doublerebel/bellows/blob/f177d92a03d3/LICENSE, MIT
github.com/emicklei/go-restful, https://github.com/emicklei/go-restful/blob/v2.15.0/LICENSE, MIT
github.com/fsnotify/fsnotify, https://github.com/fsnotify/fsnotify/blob/v1.4.9/LICENSE, BSD-3-Clause
github.com/ghodss/yaml, https://github.com/ghodss/yaml/blob/25d852aebe32/LICENSE, MIT / BSD-3-Clause
Expand All @@ -29,7 +34,7 @@ github.com/go-openapi/strfmt, https://github.com/go-openapi/strfmt/blob/v0.19.11
github.com/go-openapi/swag, https://github.com/go-openapi/swag/blob/v0.19.12/LICENSE, Apache-2.0
github.com/go-sql-driver/mysql, https://github.com/go-sql-driver/mysql/blob/v1.5.0/LICENSE, MPL-2.0
github.com/go-stack/stack, https://github.com/go-stack/stack/blob/v1.8.0/LICENSE.md, MIT
github.com/gogo/protobuf, https://github.com/gogo/protobuf/blob/v1.3.1/LICENSE, BSD-3-Clause / BSD-2-Clause
github.com/gogo/protobuf, https://github.com/gogo/protobuf/blob/v1.3.2/LICENSE, BSD-3-Clause / BSD-2-Clause
github.com/golang/glog, https://github.com/golang/glog/blob/23def4e6c14b/LICENSE, Apache-2.0
github.com/golang/protobuf, https://github.com/golang/protobuf/blob/v1.4.3/LICENSE, BSD-3-Clause
github.com/google/gofuzz, https://github.com/google/gofuzz/blob/v1.1.0/LICENSE, Apache-2.0
Expand All @@ -43,6 +48,7 @@ github.com/grpc-ecosystem/grpc-gateway, https://github.com/grpc-ecosystem/grpc-g
github.com/grpc-ecosystem/grpc-gateway, https://github.com/grpc-ecosystem/grpc-gateway/blob/v1.16.0/third_party/googleapis/LICENSE, Apache-2.0
github.com/hashicorp/go-uuid, https://github.com/hashicorp/go-uuid/blob/v1.0.2/LICENSE, MPL-2.0
github.com/hashicorp/hcl, https://github.com/hashicorp/hcl/blob/v1.0.0/LICENSE, MPL-2.0
github.com/huandu/xstrings, https://github.com/huandu/xstrings/blob/v1.3.0/LICENSE, MIT
github.com/imdario/mergo, https://github.com/imdario/mergo/blob/v0.3.10/LICENSE, BSD-3-Clause
github.com/jcmturner/gofork, https://github.com/jcmturner/gofork/blob/v1.0.0/LICENSE, BSD-3-Clause
github.com/jinzhu/gorm, https://github.com/jinzhu/gorm/blob/v1.9.1/License, MIT
Expand All @@ -59,10 +65,13 @@ github.com/mattn/go-sqlite3, https://github.com/mattn/go-sqlite3/blob/v1.9.0/LIC
github.com/mattn/go-sqlite3/., https://github.com/mattn/go-sqlite3/blob/v1.9.0/sqlite3-binding.h#L2-L11, blessing
github.com/matttproud/golang_protobuf_extensions, https://github.com/matttproud/golang_protobuf_extensions/blob/c182affec369/LICENSE, Apache-2.0
github.com/minio/minio-go, https://github.com/minio/minio-go/blob/v6.0.14/LICENSE, Apache-2.0
github.com/mitchellh/copystructure, https://github.com/mitchellh/copystructure/blob/v1.0.0/LICENSE, MIT
github.com/mitchellh/go-homedir, https://github.com/mitchellh/go-homedir/blob/v1.1.0/LICENSE, MIT
github.com/mitchellh/mapstructure, https://github.com/mitchellh/mapstructure/blob/v1.4.0/LICENSE, MIT
github.com/mitchellh/reflectwalk, https://github.com/mitchellh/reflectwalk/blob/v1.0.1/LICENSE, MIT
github.com/modern-go/concurrent, https://github.com/modern-go/concurrent/blob/bacd9c7ef1dd/LICENSE, Apache-2.0
github.com/modern-go/reflect2, https://github.com/modern-go/reflect2/blob/v1.0.1/LICENSE, Apache-2.0
github.com/oliveagle/jsonpath, https://github.com/oliveagle/jsonpath/blob/2e52cf6e6852/LICENSE, MIT
github.com/pelletier/go-toml, https://github.com/pelletier/go-toml/blob/v1.8.0/LICENSE, MIT
github.com/pkg/errors, https://github.com/pkg/errors/blob/v0.9.1/LICENSE, BSD-2-Clause
github.com/pmezard/go-difflib, https://github.com/pmezard/go-difflib/blob/v1.0.0/LICENSE, BSD-3-Clause
Expand All @@ -80,18 +89,19 @@ github.com/spf13/cast, https://github.com/spf13/cast/blob/v1.3.1/LICENSE, MIT
github.com/spf13/jwalterweatherman, https://github.com/spf13/jwalterweatherman/blob/v1.1.0/LICENSE, MIT
github.com/spf13/pflag, https://github.com/spf13/pflag/blob/v1.0.5/LICENSE, BSD-3-Clause
github.com/spf13/viper, https://github.com/spf13/viper/blob/v1.7.0/LICENSE, MIT
github.com/stretchr/testify, https://github.com/stretchr/testify/blob/v1.6.1/LICENSE, MIT
github.com/stretchr/testify, https://github.com/stretchr/testify/blob/v1.7.0/LICENSE, MIT
github.com/subosito/gotenv, https://github.com/subosito/gotenv/blob/v1.2.0/LICENSE, MIT
github.com/valyala/bytebufferpool, https://github.com/valyala/bytebufferpool/blob/v1.0.0/LICENSE, MIT
github.com/valyala/fasttemplate, https://github.com/valyala/fasttemplate/blob/v1.1.0/LICENSE, MIT
go.mongodb.org/mongo-driver, https://github.com/mongodb/mongo-go-driver/blob/v1.4.4/LICENSE, Apache-2.0
go.mongodb.org/mongo-driver/., https://github.com/mongodb/mongo-go-driver/blob/v1.4.4/THIRD-PARTY-NOTICES#L1-L29, BSD-2-Clause
go.mongodb.org/mongo-driver/., https://github.com/mongodb/mongo-go-driver/blob/v1.4.4/THIRD-PARTY-NOTICES#L31-L61, BSD-3-Clause
golang.org/x/crypto, https://github.com/golang/crypto/blob/7f63de1d35b0/LICENSE, BSD-3-Clause
golang.org/x/net, https://github.com/golang/net/blob/986b41b23924/LICENSE, BSD-3-Clause
golang.org/x/crypto, https://github.com/golang/crypto/blob/5ea612d1eb83/LICENSE, BSD-3-Clause
golang.org/x/net, https://github.com/golang/net/blob/e18ecbb05110/LICENSE, BSD-3-Clause
golang.org/x/oauth2, https://github.com/golang/oauth2/blob/bf48bf16ab8d/LICENSE, BSD-3-Clause
golang.org/x/sys, https://github.com/golang/sys/blob/f84b799fce68/LICENSE, BSD-3-Clause
golang.org/x/text, https://github.com/golang/text/blob/v0.3.4/LICENSE, BSD-3-Clause
golang.org/x/sys, https://github.com/golang/sys/blob/a50acf3fe073/LICENSE, BSD-3-Clause
golang.org/x/term, https://github.com/golang/term/blob/7de9c90e9dd1/LICENSE, BSD-3-Clause
golang.org/x/text, https://github.com/golang/text/blob/v0.3.5/LICENSE, BSD-3-Clause
golang.org/x/time, https://github.com/golang/time/blob/3af7569d3a1e/LICENSE, BSD-3-Clause
google.golang.org/genproto, https://github.com/googleapis/go-genproto/blob/86f49bd18e98/LICENSE, Apache-2.0
google.golang.org/grpc, https://github.com/grpc/grpc-go/blob/v1.34.0/LICENSE, Apache-2.0
Expand All @@ -103,7 +113,7 @@ gopkg.in/jcmturner/dnsutils.v1, https://github.com/jcmturner/dnsutils/blob/v1.0.
gopkg.in/jcmturner/gokrb5.v5, https://github.com/jcmturner/gokrb5/blob/v5.3.0/LICENSE, Apache-2.0
gopkg.in/jcmturner/rpc.v0, https://github.com/jcmturner/rpc/blob/v0.0.2/LICENSE, Apache-2.0
gopkg.in/yaml.v2, https://github.com/go-yaml/yaml/blob/v2.4.0/LICENSE, Apache-2.0 / MIT
gopkg.in/yaml.v3, https://github.com/go-yaml/yaml/blob/eeeca48fe776/LICENSE, MIT
gopkg.in/yaml.v3, https://github.com/go-yaml/yaml/blob/496545a6307b/LICENSE, MIT
k8s.io/api, https://github.com/kubernetes/api/blob/v0.19.6/LICENSE, Apache-2.0
k8s.io/apimachinery, https://github.com/kubernetes/apimachinery/blob/v0.19.6/LICENSE, Apache-2.0
k8s.io/client-go, https://github.com/kubernetes/client-go/blob/v0.19.6/LICENSE, Apache-2.0
Expand Down
Loading

0 comments on commit 3973407

Please sign in to comment.