Skip to content

Commit fc80fdc

Browse files
gmfrascarimolive
authored andcommitted
chore: Upgrade Argo to v3.4.17 (kubeflow#10978)
Signed-off-by: Giulio Frasca <[email protected]>
1 parent e3a11a5 commit fc80fdc

33 files changed

+4544
-1462
lines changed

.cloudbuild.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,10 +170,10 @@ steps:
170170
args: ['pull', 'gcr.io/cloudsql-docker/gce-proxy:1.25.0']
171171
id: 'pullCloudsqlProxy'
172172
- name: 'gcr.io/cloud-builders/docker'
173-
args: ['pull', 'gcr.io/ml-pipeline/argoexec:v3.4.16-license-compliance']
173+
args: ['pull', 'gcr.io/ml-pipeline/argoexec:v3.4.17-license-compliance']
174174
id: 'pullArgoExecutor'
175175
- name: 'gcr.io/cloud-builders/docker'
176-
args: ['pull', 'gcr.io/ml-pipeline/workflow-controller:v3.4.16-license-compliance']
176+
args: ['pull', 'gcr.io/ml-pipeline/workflow-controller:v3.4.17-license-compliance']
177177
id: 'pullArgoWorkflowController'
178178

179179
# V2 related images

.release.cloudbuild.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -478,14 +478,14 @@ steps:
478478
docker push gcr.io/ml-pipeline/google/pipelines-test/cloudsqlproxy:$(cat /workspace/mm.ver)
479479
480480
- name: 'gcr.io/cloud-builders/docker'
481-
args: ['pull', 'gcr.io/ml-pipeline/argoexec:v3.4.16-license-compliance']
481+
args: ['pull', 'gcr.io/ml-pipeline/argoexec:v3.4.17-license-compliance']
482482
id: 'pullArgoExecutor'
483483
- name: 'gcr.io/cloud-builders/docker'
484-
args: ['tag', 'gcr.io/ml-pipeline/argoexec:v3.4.16-license-compliance', 'gcr.io/ml-pipeline/google/pipelines/argoexecutor:$TAG_NAME']
484+
args: ['tag', 'gcr.io/ml-pipeline/argoexec:v3.4.17-license-compliance', 'gcr.io/ml-pipeline/google/pipelines/argoexecutor:$TAG_NAME']
485485
id: 'tagArgoExecutorForMarketplace'
486486
waitFor: ['pullArgoExecutor']
487487
- name: 'gcr.io/cloud-builders/docker'
488-
args: ['tag', 'gcr.io/ml-pipeline/argoexec:v3.4.16-license-compliance', 'gcr.io/ml-pipeline/google/pipelines-test/argoexecutor:$TAG_NAME']
488+
args: ['tag', 'gcr.io/ml-pipeline/argoexec:v3.4.17-license-compliance', 'gcr.io/ml-pipeline/google/pipelines-test/argoexecutor:$TAG_NAME']
489489
id: 'tagArgoExecutorForMarketplaceTest'
490490
waitFor: ['pullArgoExecutor']
491491
- id: 'tagArgoExecutorForMarketplaceMajorMinor'
@@ -495,20 +495,20 @@ steps:
495495
args:
496496
- -ceux
497497
- |
498-
docker tag gcr.io/ml-pipeline/argoexec:v3.4.16-license-compliance gcr.io/ml-pipeline/google/pipelines/argoexecutor:$(cat /workspace/mm.ver)
499-
docker tag gcr.io/ml-pipeline/argoexec:v3.4.16-license-compliance gcr.io/ml-pipeline/google/pipelines-test/argoexecutor:$(cat /workspace/mm.ver)
498+
docker tag gcr.io/ml-pipeline/argoexec:v3.4.17-license-compliance gcr.io/ml-pipeline/google/pipelines/argoexecutor:$(cat /workspace/mm.ver)
499+
docker tag gcr.io/ml-pipeline/argoexec:v3.4.17-license-compliance gcr.io/ml-pipeline/google/pipelines-test/argoexecutor:$(cat /workspace/mm.ver)
500500
docker push gcr.io/ml-pipeline/google/pipelines/argoexecutor:$(cat /workspace/mm.ver)
501501
docker push gcr.io/ml-pipeline/google/pipelines-test/argoexecutor:$(cat /workspace/mm.ver)
502502
503503
- name: 'gcr.io/cloud-builders/docker'
504-
args: ['pull', 'gcr.io/ml-pipeline/workflow-controller:v3.4.16-license-compliance']
504+
args: ['pull', 'gcr.io/ml-pipeline/workflow-controller:v3.4.17-license-compliance']
505505
id: 'pullArgoWorkflowController'
506506
- name: 'gcr.io/cloud-builders/docker'
507-
args: ['tag', 'gcr.io/ml-pipeline/workflow-controller:v3.4.16-license-compliance', 'gcr.io/ml-pipeline/google/pipelines/argoworkflowcontroller:$TAG_NAME']
507+
args: ['tag', 'gcr.io/ml-pipeline/workflow-controller:v3.4.17-license-compliance', 'gcr.io/ml-pipeline/google/pipelines/argoworkflowcontroller:$TAG_NAME']
508508
id: 'tagArgoWorkflowControllerForMarketplace'
509509
waitFor: ['pullArgoWorkflowController']
510510
- name: 'gcr.io/cloud-builders/docker'
511-
args: ['tag', 'gcr.io/ml-pipeline/workflow-controller:v3.4.16-license-compliance', 'gcr.io/ml-pipeline/google/pipelines-test/argoworkflowcontroller:$TAG_NAME']
511+
args: ['tag', 'gcr.io/ml-pipeline/workflow-controller:v3.4.17-license-compliance', 'gcr.io/ml-pipeline/google/pipelines-test/argoworkflowcontroller:$TAG_NAME']
512512
id: 'tagArgoWorkflowControllerForMarketplaceTest'
513513
waitFor: ['pullArgoWorkflowController']
514514
- id: 'tagArgoWorkflowControllerForMarketplaceMajorMinor'
@@ -518,8 +518,8 @@ steps:
518518
args:
519519
- -ceux
520520
- |
521-
docker tag gcr.io/ml-pipeline/workflow-controller:v3.4.16-license-compliance gcr.io/ml-pipeline/google/pipelines/argoworkflowcontroller:$(cat /workspace/mm.ver)
522-
docker tag gcr.io/ml-pipeline/workflow-controller:v3.4.16-license-compliance gcr.io/ml-pipeline/google/pipelines-test/argoworkflowcontroller:$(cat /workspace/mm.ver)
521+
docker tag gcr.io/ml-pipeline/workflow-controller:v3.4.17-license-compliance gcr.io/ml-pipeline/google/pipelines/argoworkflowcontroller:$(cat /workspace/mm.ver)
522+
docker tag gcr.io/ml-pipeline/workflow-controller:v3.4.17-license-compliance gcr.io/ml-pipeline/google/pipelines-test/argoworkflowcontroller:$(cat /workspace/mm.ver)
523523
docker push gcr.io/ml-pipeline/google/pipelines/argoworkflowcontroller:$(cat /workspace/mm.ver)
524524
docker push gcr.io/ml-pipeline/google/pipelines-test/argoworkflowcontroller:$(cat /workspace/mm.ver)
525525

backend/Dockerfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@ ARG SOURCE_CODE=.
1818
FROM registry.access.redhat.com/ubi8/go-toolset:1.21 as builder
1919

2020
USER root
21+
# Downloading Argo CLI so that the samples are validated
22+
ENV ARGO_VERSION v3.4.17
23+
RUN curl -sLO https://github.com/argoproj/argo-workflows/releases/download/${ARGO_VERSION}/argo-linux-amd64.gz && \
24+
gunzip argo-linux-amd64.gz && \
25+
chmod +x argo-linux-amd64 && \
26+
mv ./argo-linux-amd64 /usr/local/bin/argo
2127

2228
RUN dnf install -y cmake clang openssl
2329

backend/src/common/types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ package common
2121
type ExecutionPhase string
2222

2323
// borrow from Workflow.Status.Phase:
24-
// https://pkg.go.dev/github.com/argoproj/argo-workflows/[email protected].16/pkg/apis/workflow/v1alpha1#WorkflowPhase
24+
// https://pkg.go.dev/github.com/argoproj/argo-workflows/[email protected].17/pkg/apis/workflow/v1alpha1#WorkflowPhase
2525
const (
2626
ExecutionUnknown ExecutionPhase = ""
2727
ExecutionPending ExecutionPhase = "Pending" // pending some set-up - rarely used

backend/third_party_licenses/apiserver.csv

Lines changed: 32 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cloud.google.com/go/compute/metadata,https://github.com/googleapis/google-cloud-go/blob/compute/metadata/v0.2.3/compute/metadata/LICENSE,Apache-2.0
2-
cloud.google.com/go/iam,https://github.com/googleapis/google-cloud-go/blob/iam/v1.1.2/iam/LICENSE,Apache-2.0
3-
cloud.google.com/go/internal,https://github.com/googleapis/google-cloud-go/blob/v0.110.8/LICENSE,Apache-2.0
2+
cloud.google.com/go/iam,https://github.com/googleapis/google-cloud-go/blob/iam/v1.1.5/iam/LICENSE,Apache-2.0
3+
cloud.google.com/go/internal,https://github.com/googleapis/google-cloud-go/blob/v0.111.0/LICENSE,Apache-2.0
44
cloud.google.com/go/storage,https://github.com/googleapis/google-cloud-go/blob/storage/v1.30.1/storage/LICENSE,Apache-2.0
55
contrib.go.opencensus.io/exporter/ocagent,https://github.com/census-ecosystem/opencensus-go-exporter-ocagent/blob/05415f1de66d/LICENSE,Apache-2.0
66
contrib.go.opencensus.io/exporter/prometheus,https://github.com/census-ecosystem/opencensus-go-exporter-prometheus/blob/v0.4.0/LICENSE,Apache-2.0
@@ -10,8 +10,7 @@ github.com/Masterminds/sprig/v3,https://github.com/Masterminds/sprig/blob/v3.2.3
1010
github.com/Masterminds/squirrel,https://github.com/Masterminds/squirrel/blob/fa735ea14f09/LICENSE.txt,MIT
1111
github.com/VividCortex/mysqlerr,https://github.com/VividCortex/mysqlerr/blob/6c6b55f8796f/LICENSE,MIT
1212
github.com/antlr/antlr4/runtime/Go/antlr,https://github.com/antlr/antlr4/blob/runtime/Go/antlr/v1.4.10/runtime/Go/antlr/LICENSE,BSD-3-Clause
13-
github.com/antonmedv/expr,https://github.com/antonmedv/expr/blob/v1.12.6/LICENSE,MIT
14-
github.com/argoproj/argo-workflows/v3,https://github.com/argoproj/argo-workflows/blob/v3.4.16/LICENSE,Apache-2.0
13+
github.com/argoproj/argo-workflows/v3,https://github.com/argoproj/argo-workflows/blob/v3.4.17/LICENSE,Apache-2.0
1514
github.com/argoproj/pkg,https://github.com/argoproj/pkg/blob/v0.13.6/LICENSE,Apache-2.0
1615
github.com/asaskevich/govalidator,https://github.com/asaskevich/govalidator/blob/7a23bdc65eef/LICENSE,MIT
1716
github.com/aws/aws-sdk-go,https://github.com/aws/aws-sdk-go/blob/v1.45.25/LICENSE.txt,Apache-2.0
@@ -26,17 +25,20 @@ github.com/davecgh/go-spew/spew,https://github.com/davecgh/go-spew/blob/v1.1.1/L
2625
github.com/doublerebel/bellows,https://github.com/doublerebel/bellows/blob/f177d92a03d3/LICENSE,MIT
2726
github.com/emicklei/go-restful/v3,https://github.com/emicklei/go-restful/blob/v3.10.2/LICENSE,MIT
2827
github.com/evanphx/json-patch/v5,https://github.com/evanphx/json-patch/blob/v5.6.0/v5/LICENSE,BSD-3-Clause
28+
github.com/expr-lang/expr,https://github.com/expr-lang/expr/blob/v1.16.0/LICENSE,MIT
29+
github.com/felixge/httpsnoop,https://github.com/felixge/httpsnoop/blob/v1.0.4/LICENSE.txt,MIT
2930
github.com/fsnotify/fsnotify,https://github.com/fsnotify/fsnotify/blob/v1.6.0/LICENSE,BSD-3-Clause
3031
github.com/ghodss/yaml,https://github.com/ghodss/yaml/blob/25d852aebe32/LICENSE,MIT
3132
github.com/go-kit/log,https://github.com/go-kit/log/blob/v0.2.1/LICENSE,MIT
3233
github.com/go-logfmt/logfmt,https://github.com/go-logfmt/logfmt/blob/v0.5.1/LICENSE,MIT
33-
github.com/go-logr/logr,https://github.com/go-logr/logr/blob/v1.2.4/LICENSE,Apache-2.0
34+
github.com/go-logr/logr,https://github.com/go-logr/logr/blob/v1.3.0/LICENSE,Apache-2.0
35+
github.com/go-logr/stdr,https://github.com/go-logr/stdr/blob/v1.2.2/LICENSE,Apache-2.0
3436
github.com/go-openapi/errors,https://github.com/go-openapi/errors/blob/v0.20.2/LICENSE,Apache-2.0
35-
github.com/go-openapi/jsonpointer,https://github.com/go-openapi/jsonpointer/blob/v0.19.6/LICENSE,Apache-2.0
36-
github.com/go-openapi/jsonreference,https://github.com/go-openapi/jsonreference/blob/v0.20.2/LICENSE,Apache-2.0
37+
github.com/go-openapi/jsonpointer,https://github.com/go-openapi/jsonpointer/blob/v0.20.2/LICENSE,Apache-2.0
38+
github.com/go-openapi/jsonreference,https://github.com/go-openapi/jsonreference/blob/v0.20.4/LICENSE,Apache-2.0
3739
github.com/go-openapi/runtime,https://github.com/go-openapi/runtime/blob/v0.21.1/LICENSE,Apache-2.0
3840
github.com/go-openapi/strfmt,https://github.com/go-openapi/strfmt/blob/v0.21.1/LICENSE,Apache-2.0
39-
github.com/go-openapi/swag,https://github.com/go-openapi/swag/blob/v0.22.3/LICENSE,Apache-2.0
41+
github.com/go-openapi/swag,https://github.com/go-openapi/swag/blob/v0.22.6/LICENSE,Apache-2.0
4042
github.com/go-sql-driver/mysql,https://github.com/go-sql-driver/mysql/blob/v1.7.1/LICENSE,MPL-2.0
4143
github.com/go-stack/stack,https://github.com/go-stack/stack/blob/v1.8.0/LICENSE.md,MIT
4244
github.com/gogo/protobuf,https://github.com/gogo/protobuf/blob/v1.3.2/LICENSE,BSD-3-Clause
@@ -49,9 +51,9 @@ github.com/google/go-cmp/cmp,https://github.com/google/go-cmp/blob/v0.6.0/LICENS
4951
github.com/google/go-containerregistry/pkg/name,https://github.com/google/go-containerregistry/blob/v0.16.1/LICENSE,Apache-2.0
5052
github.com/google/gofuzz,https://github.com/google/gofuzz/blob/v1.2.0/LICENSE,Apache-2.0
5153
github.com/google/s2a-go,https://github.com/google/s2a-go/blob/v0.1.7/LICENSE.md,Apache-2.0
52-
github.com/google/uuid,https://github.com/google/uuid/blob/v1.3.1/LICENSE,BSD-3-Clause
54+
github.com/google/uuid,https://github.com/google/uuid/blob/v1.5.0/LICENSE,BSD-3-Clause
5355
github.com/google/wire,https://github.com/google/wire/blob/v0.4.0/LICENSE,Apache-2.0
54-
github.com/googleapis/enterprise-certificate-proxy/client,https://github.com/googleapis/enterprise-certificate-proxy/blob/v0.3.1/LICENSE,Apache-2.0
56+
github.com/googleapis/enterprise-certificate-proxy/client,https://github.com/googleapis/enterprise-certificate-proxy/blob/v0.3.2/LICENSE,Apache-2.0
5557
github.com/googleapis/gax-go/v2,https://github.com/googleapis/gax-go/blob/v2.12.0/v2/LICENSE,BSD-3-Clause
5658
github.com/gorilla/mux,https://github.com/gorilla/mux/blob/v1.8.0/LICENSE,BSD-3-Clause
5759
github.com/gorilla/websocket,https://github.com/gorilla/websocket/blob/v1.5.0/LICENSE,BSD-2-Clause
@@ -130,28 +132,33 @@ github.com/valyala/bytebufferpool,https://github.com/valyala/bytebufferpool/blob
130132
github.com/valyala/fasttemplate,https://github.com/valyala/fasttemplate/blob/v1.2.2/LICENSE,MIT
131133
go.mongodb.org/mongo-driver,https://github.com/mongodb/mongo-go-driver/blob/v1.7.5/LICENSE,Apache-2.0
132134
go.opencensus.io,https://github.com/census-instrumentation/opencensus-go/blob/v0.24.0/LICENSE,Apache-2.0
135+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc,https://github.com/open-telemetry/opentelemetry-go-contrib/blob/instrumentation/google.golang.org/grpc/otelgrpc/v0.46.1/instrumentation/google.golang.org/grpc/otelgrpc/LICENSE,Apache-2.0
136+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp,https://github.com/open-telemetry/opentelemetry-go-contrib/blob/instrumentation/net/http/otelhttp/v0.46.1/instrumentation/net/http/otelhttp/LICENSE,Apache-2.0
137+
go.opentelemetry.io/otel,https://github.com/open-telemetry/opentelemetry-go/blob/v1.21.0/LICENSE,Apache-2.0
138+
go.opentelemetry.io/otel/metric,https://github.com/open-telemetry/opentelemetry-go/blob/metric/v1.21.0/metric/LICENSE,Apache-2.0
139+
go.opentelemetry.io/otel/trace,https://github.com/open-telemetry/opentelemetry-go/blob/trace/v1.21.0/trace/LICENSE,Apache-2.0
133140
go.uber.org/atomic,https://github.com/uber-go/atomic/blob/v1.10.0/LICENSE.txt,MIT
134141
go.uber.org/multierr,https://github.com/uber-go/multierr/blob/v1.10.0/LICENSE.txt,MIT
135142
go.uber.org/zap,https://github.com/uber-go/zap/blob/v1.26.0/LICENSE.txt,MIT
136143
gocloud.dev,https://github.com/google/go-cloud/blob/v0.22.0/LICENSE,Apache-2.0
137-
golang.org/x/crypto,https://cs.opensource.google/go/x/crypto/+/v0.16.0:LICENSE,BSD-3-Clause
138-
golang.org/x/exp/maps,https://cs.opensource.google/go/x/exp/+/24139beb:LICENSE,BSD-3-Clause
139-
golang.org/x/net,https://cs.opensource.google/go/x/net/+/v0.19.0:LICENSE,BSD-3-Clause
140-
golang.org/x/oauth2,https://cs.opensource.google/go/x/oauth2/+/v0.13.0:LICENSE,BSD-3-Clause
141-
golang.org/x/sync/semaphore,https://cs.opensource.google/go/x/sync/+/v0.4.0:LICENSE,BSD-3-Clause
142-
golang.org/x/sys,https://cs.opensource.google/go/x/sys/+/v0.15.0:LICENSE,BSD-3-Clause
143-
golang.org/x/term,https://cs.opensource.google/go/x/term/+/v0.15.0:LICENSE,BSD-3-Clause
144+
golang.org/x/crypto,https://cs.opensource.google/go/x/crypto/+/v0.22.0:LICENSE,BSD-3-Clause
145+
golang.org/x/exp/maps,https://cs.opensource.google/go/x/exp/+/92128663:LICENSE,BSD-3-Clause
146+
golang.org/x/net,https://cs.opensource.google/go/x/net/+/v0.21.0:LICENSE,BSD-3-Clause
147+
golang.org/x/oauth2,https://cs.opensource.google/go/x/oauth2/+/v0.16.0:LICENSE,BSD-3-Clause
148+
golang.org/x/sync/semaphore,https://cs.opensource.google/go/x/sync/+/v0.6.0:LICENSE,BSD-3-Clause
149+
golang.org/x/sys,https://cs.opensource.google/go/x/sys/+/v0.19.0:LICENSE,BSD-3-Clause
150+
golang.org/x/term,https://cs.opensource.google/go/x/term/+/v0.19.0:LICENSE,BSD-3-Clause
144151
golang.org/x/text,https://cs.opensource.google/go/x/text/+/v0.14.0:LICENSE,BSD-3-Clause
145-
golang.org/x/time/rate,https://cs.opensource.google/go/x/time/+/v0.3.0:LICENSE,BSD-3-Clause
152+
golang.org/x/time/rate,https://cs.opensource.google/go/x/time/+/v0.5.0:LICENSE,BSD-3-Clause
146153
golang.org/x/xerrors,https://cs.opensource.google/go/x/xerrors/+/04be3eba:LICENSE,BSD-3-Clause
147154
gomodules.xyz/jsonpatch/v2,https://github.com/gomodules/jsonpatch/blob/v2.4.0/v2/LICENSE,Apache-2.0
148-
google.golang.org/api,https://github.com/googleapis/google-api-go-client/blob/v0.147.0/LICENSE,BSD-3-Clause
149-
google.golang.org/api/internal/third_party/uritemplates,https://github.com/googleapis/google-api-go-client/blob/v0.147.0/internal/third_party/uritemplates/LICENSE,BSD-3-Clause
150-
google.golang.org/genproto,https://github.com/googleapis/go-genproto/blob/d307bd883b97/LICENSE,Apache-2.0
151-
google.golang.org/genproto/googleapis/api,https://github.com/googleapis/go-genproto/blob/d307bd883b97/googleapis/api/LICENSE,Apache-2.0
152-
google.golang.org/genproto/googleapis/rpc,https://github.com/googleapis/go-genproto/blob/8bfb1ae86b6c/googleapis/rpc/LICENSE,Apache-2.0
153-
google.golang.org/grpc,https://github.com/grpc/grpc-go/blob/v1.58.3/LICENSE,Apache-2.0
154-
google.golang.org/protobuf,https://github.com/protocolbuffers/protobuf-go/blob/v1.31.0/LICENSE,BSD-3-Clause
155+
google.golang.org/api,https://github.com/googleapis/google-api-go-client/blob/v0.156.0/LICENSE,BSD-3-Clause
156+
google.golang.org/api/internal/third_party/uritemplates,https://github.com/googleapis/google-api-go-client/blob/v0.156.0/internal/third_party/uritemplates/LICENSE,BSD-3-Clause
157+
google.golang.org/genproto,https://github.com/googleapis/go-genproto/blob/995d672761c0/LICENSE,Apache-2.0
158+
google.golang.org/genproto/googleapis/api,https://github.com/googleapis/go-genproto/blob/995d672761c0/googleapis/api/LICENSE,Apache-2.0
159+
google.golang.org/genproto/googleapis/rpc,https://github.com/googleapis/go-genproto/blob/50ed04b92917/googleapis/rpc/LICENSE,Apache-2.0
160+
google.golang.org/grpc,https://github.com/grpc/grpc-go/blob/v1.60.1/LICENSE,Apache-2.0
161+
google.golang.org/protobuf,https://github.com/protocolbuffers/protobuf-go/blob/v1.32.0/LICENSE,BSD-3-Clause
155162
gopkg.in/inf.v0,https://github.com/go-inf/inf/blob/v0.9.1/LICENSE,BSD-3-Clause
156163
gopkg.in/ini.v1,https://github.com/go-ini/ini/blob/v1.67.0/LICENSE,Apache-2.0
157164
gopkg.in/yaml.v2,https://github.com/go-yaml/yaml/blob/v2.4.0/LICENSE,Apache-2.0

0 commit comments

Comments
 (0)