Skip to content

Commit eb9b96c

Browse files
hbelmirohbelmiro
committed
Revert "UPSTREAM: <carry>: Bump github.com/argoproj/argo-workflows/v3 from v3.3.10 to v3.5.8"
This reverts commit 38ce527.
1 parent 4a14766 commit eb9b96c

File tree

11 files changed

+580
-652
lines changed

11 files changed

+580
-652
lines changed

‎backend/src/apiserver/template/argo_template.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ func ValidateWorkflow(template []byte) (*util.Workflow, error) {
230230
if wf.Kind != argoK8sResource {
231231
return nil, util.NewInvalidInputError("Unexpected resource type. Expected: %v. Received: %v", argoK8sResource, wf.Kind)
232232
}
233-
err = validate.ValidateWorkflow(nil, nil, &wf, validate.ValidateOpts{
233+
_, err = validate.ValidateWorkflow(nil, nil, &wf, validate.ValidateOpts{
234234
Lint: true,
235235
IgnoreEntrypoint: true,
236236
WorkflowTemplateValidation: false, // not used by kubeflow

‎backend/src/common/util/workflow.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,7 @@ func (w *Workflow) IsV2Compatible() bool {
709709
}
710710

711711
func (w *Workflow) Validate(lint, ignoreEntrypoint bool) error {
712-
err := validate.ValidateWorkflow(nil, nil, w.Workflow, validate.ValidateOpts{
712+
_, err := validate.ValidateWorkflow(nil, nil, w.Workflow, validate.ValidateOpts{
713713
Lint: lint,
714714
IgnoreEntrypoint: ignoreEntrypoint,
715715
WorkflowTemplateValidation: false, // not used by kubeflow

‎backend/third_party_licenses/apiserver.csv

Lines changed: 72 additions & 76 deletions
Large diffs are not rendered by default.

‎backend/third_party_licenses/cache_server.csv

Lines changed: 52 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,105 +1,102 @@
11
github.com/Masterminds/goutils,https://github.com/Masterminds/goutils/blob/v1.1.1/LICENSE.txt,Apache-2.0
2-
github.com/Masterminds/semver/v3,https://github.com/Masterminds/semver/blob/v3.2.0/LICENSE.txt,MIT
3-
github.com/Masterminds/sprig/v3,https://github.com/Masterminds/sprig/blob/v3.2.3/LICENSE.txt,MIT
4-
github.com/argoproj/argo-workflows/v3,https://github.com/argoproj/argo-workflows/blob/v3.5.8/LICENSE,Apache-2.0
5-
github.com/argoproj/pkg,https://github.com/argoproj/pkg/blob/235a5432ec98/LICENSE,Apache-2.0
2+
github.com/Masterminds/semver/v3,https://github.com/Masterminds/semver/blob/v3.1.1/LICENSE.txt,MIT
3+
github.com/Masterminds/sprig/v3,https://github.com/Masterminds/sprig/blob/v3.2.2/LICENSE.txt,MIT
4+
github.com/PuerkitoBio/purell,https://github.com/PuerkitoBio/purell/blob/v1.1.1/LICENSE,BSD-3-Clause
5+
github.com/PuerkitoBio/urlesc,https://github.com/PuerkitoBio/urlesc/blob/de5bf2ad4578/LICENSE,BSD-3-Clause
6+
github.com/antonmedv/expr,https://github.com/antonmedv/expr/blob/v1.9.0/LICENSE,MIT
7+
github.com/argoproj/argo-workflows/v3,https://github.com/argoproj/argo-workflows/blob/v3.3.10/LICENSE,Apache-2.0
8+
github.com/argoproj/pkg,https://github.com/argoproj/pkg/blob/v0.11.0/LICENSE,Apache-2.0
69
github.com/asaskevich/govalidator,https://github.com/asaskevich/govalidator/blob/f21760c49a8d/LICENSE,MIT
710
github.com/beorn7/perks/quantile,https://github.com/beorn7/perks/blob/v1.0.1/LICENSE,MIT
811
github.com/cenkalti/backoff,https://github.com/cenkalti/backoff/blob/v2.2.1/LICENSE,MIT
912
github.com/cespare/xxhash/v2,https://github.com/cespare/xxhash/blob/v2.2.0/LICENSE.txt,MIT
10-
github.com/colinmarc/hdfs/v2,https://github.com/colinmarc/hdfs/blob/v2.4.0/LICENSE.txt,MIT
11-
github.com/davecgh/go-spew/spew,https://github.com/davecgh/go-spew/blob/d8f796af33cc/LICENSE,ISC
13+
github.com/colinmarc/hdfs,https://github.com/colinmarc/hdfs/blob/9746310a4d31/LICENSE.txt,MIT
14+
github.com/davecgh/go-spew/spew,https://github.com/davecgh/go-spew/blob/v1.1.1/LICENSE,ISC
1215
github.com/doublerebel/bellows,https://github.com/doublerebel/bellows/blob/f177d92a03d3/LICENSE,MIT
13-
github.com/emicklei/go-restful/v3,https://github.com/emicklei/go-restful/blob/v3.10.0/LICENSE,MIT
14-
github.com/evilmonkeyinc/jsonpath,https://github.com/evilmonkeyinc/jsonpath/blob/v0.8.1/LICENSE.md,MIT
15-
github.com/expr-lang/expr,https://github.com/expr-lang/expr/blob/v1.16.0/LICENSE,MIT
16+
github.com/emicklei/go-restful/v3,https://github.com/emicklei/go-restful/blob/v3.8.0/LICENSE,MIT
1617
github.com/go-logr/logr,https://github.com/go-logr/logr/blob/v1.2.4/LICENSE,Apache-2.0
1718
github.com/go-openapi/errors,https://github.com/go-openapi/errors/blob/v0.20.2/LICENSE,Apache-2.0
18-
github.com/go-openapi/jsonpointer,https://github.com/go-openapi/jsonpointer/blob/v0.19.6/LICENSE,Apache-2.0
19-
github.com/go-openapi/jsonreference,https://github.com/go-openapi/jsonreference/blob/v0.20.2/LICENSE,Apache-2.0
19+
github.com/go-openapi/jsonpointer,https://github.com/go-openapi/jsonpointer/blob/v0.19.5/LICENSE,Apache-2.0
20+
github.com/go-openapi/jsonreference,https://github.com/go-openapi/jsonreference/blob/v0.19.6/LICENSE,Apache-2.0
2021
github.com/go-openapi/runtime,https://github.com/go-openapi/runtime/blob/v0.21.1/LICENSE,Apache-2.0
2122
github.com/go-openapi/strfmt,https://github.com/go-openapi/strfmt/blob/v0.21.1/LICENSE,Apache-2.0
22-
github.com/go-openapi/swag,https://github.com/go-openapi/swag/blob/v0.22.3/LICENSE,Apache-2.0
23-
github.com/go-sql-driver/mysql,https://github.com/go-sql-driver/mysql/blob/v1.7.1/LICENSE,MPL-2.0
23+
github.com/go-openapi/swag,https://github.com/go-openapi/swag/blob/v0.19.15/LICENSE,Apache-2.0
24+
github.com/go-sql-driver/mysql,https://github.com/go-sql-driver/mysql/blob/v1.6.0/LICENSE,MPL-2.0
2425
github.com/go-stack/stack,https://github.com/go-stack/stack/blob/v1.8.1/LICENSE.md,MIT
2526
github.com/gogo/protobuf,https://github.com/gogo/protobuf/blob/v1.3.2/LICENSE,BSD-3-Clause
2627
github.com/golang/glog,https://github.com/golang/glog/blob/v1.1.0/LICENSE,Apache-2.0
27-
github.com/golang/protobuf,https://github.com/golang/protobuf/blob/v1.5.4/LICENSE,BSD-3-Clause
28-
github.com/google/gnostic,https://github.com/google/gnostic/blob/v0.6.9/LICENSE,Apache-2.0
28+
github.com/golang/protobuf,https://github.com/golang/protobuf/blob/v1.5.3/LICENSE,BSD-3-Clause
29+
github.com/google/gnostic,https://github.com/google/gnostic/blob/v0.5.7-v3refs/LICENSE,Apache-2.0
2930
github.com/google/go-cmp/cmp,https://github.com/google/go-cmp/blob/v0.6.0/LICENSE,BSD-3-Clause
3031
github.com/google/gofuzz,https://github.com/google/gofuzz/blob/v1.2.0/LICENSE,Apache-2.0
31-
github.com/google/uuid,https://github.com/google/uuid/blob/v1.6.0/LICENSE,BSD-3-Clause
32-
github.com/gorilla/websocket,https://github.com/gorilla/websocket/blob/v1.5.1/LICENSE,BSD-3-Clause
32+
github.com/google/uuid,https://github.com/google/uuid/blob/v1.3.0/LICENSE,BSD-3-Clause
33+
github.com/gorilla/websocket,https://github.com/gorilla/websocket/blob/v1.5.0/LICENSE,BSD-2-Clause
3334
github.com/grpc-ecosystem/grpc-gateway,https://github.com/grpc-ecosystem/grpc-gateway/blob/v1.16.0/LICENSE.txt,BSD-3-Clause
34-
github.com/hashicorp/go-uuid,https://github.com/hashicorp/go-uuid/blob/v1.0.3/LICENSE,MPL-2.0
35-
github.com/huandu/xstrings,https://github.com/huandu/xstrings/blob/v1.3.3/LICENSE,MIT
36-
github.com/imdario/mergo,https://github.com/imdario/mergo/blob/v0.3.13/LICENSE,BSD-3-Clause
37-
github.com/jcmturner/aescts/v2,https://github.com/jcmturner/aescts/blob/v2.0.0/v2/LICENSE,Apache-2.0
38-
github.com/jcmturner/dnsutils/v2,https://github.com/jcmturner/dnsutils/blob/v2.0.0/v2/LICENSE,Apache-2.0
39-
github.com/jcmturner/gofork,https://github.com/jcmturner/gofork/blob/v1.7.6/LICENSE,BSD-3-Clause
40-
github.com/jcmturner/goidentity/v6,https://github.com/jcmturner/goidentity/blob/v6.0.1/v6/LICENSE,Apache-2.0
41-
github.com/jcmturner/gokrb5/v8,https://github.com/jcmturner/gokrb5/blob/v8.4.4/v8/LICENSE,Apache-2.0
42-
github.com/jcmturner/rpc/v2,https://github.com/jcmturner/rpc/blob/v2.0.3/v2/LICENSE,Apache-2.0
35+
github.com/hashicorp/go-uuid,https://github.com/hashicorp/go-uuid/blob/v1.0.2/LICENSE,MPL-2.0
36+
github.com/huandu/xstrings,https://github.com/huandu/xstrings/blob/v1.3.2/LICENSE,MIT
37+
github.com/imdario/mergo,https://github.com/imdario/mergo/blob/v0.3.12/LICENSE,BSD-3-Clause
38+
github.com/jcmturner/gofork,https://github.com/jcmturner/gofork/blob/v1.0.0/LICENSE,BSD-3-Clause
4339
github.com/jinzhu/gorm,https://github.com/jinzhu/gorm/blob/v1.9.1/License,MIT
4440
github.com/jinzhu/inflection,https://github.com/jinzhu/inflection/blob/v1.0.0/LICENSE,MIT
4541
github.com/josharian/intern,https://github.com/josharian/intern/blob/v1.0.0/license.md,MIT
4642
github.com/json-iterator/go,https://github.com/json-iterator/go/blob/v1.1.12/LICENSE,MIT
47-
github.com/klauspost/compress/flate,https://github.com/klauspost/compress/blob/v1.17.0/LICENSE,Apache-2.0
48-
github.com/klauspost/pgzip,https://github.com/klauspost/pgzip/blob/v1.2.6/LICENSE,MIT
43+
github.com/klauspost/compress/flate,https://github.com/klauspost/compress/blob/v1.15.9/LICENSE,Apache-2.0
44+
github.com/klauspost/pgzip,https://github.com/klauspost/pgzip/blob/v1.2.5/LICENSE,MIT
4945
github.com/kubeflow/pipelines/backend,https://github.com/kubeflow/pipelines/blob/HEAD/LICENSE,Apache-2.0
5046
github.com/lestrrat-go/strftime,https://github.com/lestrrat-go/strftime/blob/v1.0.4/LICENSE,MIT
5147
github.com/mailru/easyjson,https://github.com/mailru/easyjson/blob/v0.7.7/LICENSE,MIT
5248
github.com/mattn/go-sqlite3,https://github.com/mattn/go-sqlite3/blob/v1.14.18/LICENSE,MIT
53-
github.com/matttproud/golang_protobuf_extensions/pbutil,https://github.com/matttproud/golang_protobuf_extensions/blob/v1.0.4/LICENSE,Apache-2.0
49+
github.com/matttproud/golang_protobuf_extensions/pbutil,https://github.com/matttproud/golang_protobuf_extensions/blob/c182affec369/LICENSE,Apache-2.0
5450
github.com/mitchellh/copystructure,https://github.com/mitchellh/copystructure/blob/v1.2.0/LICENSE,MIT
55-
github.com/mitchellh/mapstructure,https://github.com/mitchellh/mapstructure/blob/v1.5.0/LICENSE,MIT
51+
github.com/mitchellh/mapstructure,https://github.com/mitchellh/mapstructure/blob/v1.4.3/LICENSE,MIT
5652
github.com/mitchellh/reflectwalk,https://github.com/mitchellh/reflectwalk/blob/v1.0.2/LICENSE,MIT
5753
github.com/moby/spdystream,https://github.com/moby/spdystream/blob/v0.2.0/LICENSE,Apache-2.0
5854
github.com/modern-go/concurrent,https://github.com/modern-go/concurrent/blob/bacd9c7ef1dd/LICENSE,Apache-2.0
5955
github.com/modern-go/reflect2,https://github.com/modern-go/reflect2/blob/v1.0.2/LICENSE,Apache-2.0
6056
github.com/munnerz/goautoneg,https://github.com/munnerz/goautoneg/blob/a7dc8b61c822/LICENSE,BSD-3-Clause
6157
github.com/oklog/ulid,https://github.com/oklog/ulid/blob/v1.3.1/LICENSE,Apache-2.0
58+
github.com/oliveagle/jsonpath,https://github.com/oliveagle/jsonpath/blob/2e52cf6e6852/LICENSE,MIT
6259
github.com/peterhellberg/duration,https://github.com/peterhellberg/duration/blob/ec6baeebcd10/LICENSE,MIT
6360
github.com/pkg/errors,https://github.com/pkg/errors/blob/v0.9.1/LICENSE,BSD-2-Clause
64-
github.com/prometheus/client_golang/prometheus,https://github.com/prometheus/client_golang/blob/v1.16.0/LICENSE,Apache-2.0
61+
github.com/prometheus/client_golang/prometheus,https://github.com/prometheus/client_golang/blob/v1.12.1/LICENSE,Apache-2.0
6562
github.com/prometheus/client_model/go,https://github.com/prometheus/client_model/blob/v0.4.0/LICENSE,Apache-2.0
66-
github.com/prometheus/common,https://github.com/prometheus/common/blob/v0.42.0/LICENSE,Apache-2.0
67-
github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg,https://github.com/prometheus/common/blob/v0.42.0/internal/bitbucket.org/ww/goautoneg/README.txt,BSD-3-Clause
68-
github.com/prometheus/procfs,https://github.com/prometheus/procfs/blob/v0.10.1/LICENSE,Apache-2.0
63+
github.com/prometheus/common,https://github.com/prometheus/common/blob/v0.32.1/LICENSE,Apache-2.0
64+
github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg,https://github.com/prometheus/common/blob/v0.32.1/internal/bitbucket.org/ww/goautoneg/README.txt,BSD-3-Clause
65+
github.com/prometheus/procfs,https://github.com/prometheus/procfs/blob/v0.7.3/LICENSE,Apache-2.0
6966
github.com/robfig/cron/v3,https://github.com/robfig/cron/blob/v3.0.1/LICENSE,MIT
7067
github.com/shopspring/decimal,https://github.com/shopspring/decimal/blob/v1.2.0/LICENSE,MIT
71-
github.com/sirupsen/logrus,https://github.com/sirupsen/logrus/blob/v1.9.3/LICENSE,MIT
72-
github.com/spf13/cast,https://github.com/spf13/cast/blob/v1.5.1/LICENSE,MIT
68+
github.com/sirupsen/logrus,https://github.com/sirupsen/logrus/blob/v1.9.0/LICENSE,MIT
69+
github.com/spf13/cast,https://github.com/spf13/cast/blob/v1.4.1/LICENSE,MIT
7370
github.com/spf13/pflag,https://github.com/spf13/pflag/blob/v1.0.5/LICENSE,BSD-3-Clause
7471
github.com/valyala/bytebufferpool,https://github.com/valyala/bytebufferpool/blob/v1.0.0/LICENSE,MIT
75-
github.com/valyala/fasttemplate,https://github.com/valyala/fasttemplate/blob/v1.2.2/LICENSE,MIT
72+
github.com/valyala/fasttemplate,https://github.com/valyala/fasttemplate/blob/v1.2.1/LICENSE,MIT
7673
go.mongodb.org/mongo-driver,https://github.com/mongodb/mongo-go-driver/blob/v1.8.2/LICENSE,Apache-2.0
77-
golang.org/x/crypto,https://cs.opensource.google/go/x/crypto/+/v0.24.0:LICENSE,BSD-3-Clause
78-
golang.org/x/exp/maps,https://cs.opensource.google/go/x/exp/+/92128663:LICENSE,BSD-3-Clause
79-
golang.org/x/net,https://cs.opensource.google/go/x/net/+/v0.26.0:LICENSE,BSD-3-Clause
80-
golang.org/x/oauth2,https://cs.opensource.google/go/x/oauth2/+/v0.13.0:LICENSE,BSD-3-Clause
81-
golang.org/x/sys/unix,https://cs.opensource.google/go/x/sys/+/v0.21.0:LICENSE,BSD-3-Clause
82-
golang.org/x/term,https://cs.opensource.google/go/x/term/+/v0.21.0:LICENSE,BSD-3-Clause
83-
golang.org/x/text,https://cs.opensource.google/go/x/text/+/v0.16.0:LICENSE,BSD-3-Clause
84-
golang.org/x/time/rate,https://cs.opensource.google/go/x/time/+/v0.4.0:LICENSE,BSD-3-Clause
85-
google.golang.org/genproto/googleapis/api,https://github.com/googleapis/go-genproto/blob/49dd2c1f3d0b/googleapis/api/LICENSE,Apache-2.0
86-
google.golang.org/genproto/googleapis/rpc/status,https://github.com/googleapis/go-genproto/blob/d783a09b4405/googleapis/rpc/LICENSE,Apache-2.0
87-
google.golang.org/genproto/protobuf/field_mask,https://github.com/googleapis/go-genproto/blob/49dd2c1f3d0b/LICENSE,Apache-2.0
74+
golang.org/x/crypto,https://cs.opensource.google/go/x/crypto/+/v0.16.0:LICENSE,BSD-3-Clause
75+
golang.org/x/net,https://cs.opensource.google/go/x/net/+/v0.19.0:LICENSE,BSD-3-Clause
76+
golang.org/x/oauth2,https://cs.opensource.google/go/x/oauth2/+/v0.7.0:LICENSE,BSD-3-Clause
77+
golang.org/x/sys/unix,https://cs.opensource.google/go/x/sys/+/v0.15.0:LICENSE,BSD-3-Clause
78+
golang.org/x/term,https://cs.opensource.google/go/x/term/+/v0.15.0:LICENSE,BSD-3-Clause
79+
golang.org/x/text,https://cs.opensource.google/go/x/text/+/v0.14.0:LICENSE,BSD-3-Clause
80+
golang.org/x/time/rate,https://cs.opensource.google/go/x/time/+/v0.3.0:LICENSE,BSD-3-Clause
81+
google.golang.org/genproto,https://github.com/googleapis/go-genproto/blob/daa745c078e1/LICENSE,Apache-2.0
8882
google.golang.org/grpc,https://github.com/grpc/grpc-go/blob/v1.56.3/LICENSE,Apache-2.0
89-
google.golang.org/protobuf,https://github.com/protocolbuffers/protobuf-go/blob/v1.33.0/LICENSE,BSD-3-Clause
83+
google.golang.org/protobuf,https://github.com/protocolbuffers/protobuf-go/blob/v1.30.0/LICENSE,BSD-3-Clause
9084
gopkg.in/inf.v0,https://github.com/go-inf/inf/blob/v0.9.1/LICENSE,BSD-3-Clause
85+
gopkg.in/jcmturner/aescts.v1,https://github.com/jcmturner/aescts/blob/v1.0.1/LICENSE,Apache-2.0
86+
gopkg.in/jcmturner/dnsutils.v1,https://github.com/jcmturner/dnsutils/blob/v1.0.1/LICENSE,Apache-2.0
87+
gopkg.in/jcmturner/gokrb5.v5,https://github.com/jcmturner/gokrb5/blob/v5.3.0/LICENSE,Apache-2.0
88+
gopkg.in/jcmturner/rpc.v0/ndr,https://github.com/jcmturner/rpc/blob/v0.0.2/LICENSE,Apache-2.0
9189
gopkg.in/yaml.v2,https://github.com/go-yaml/yaml/blob/v2.4.0/LICENSE,Apache-2.0
9290
gopkg.in/yaml.v3,https://github.com/go-yaml/yaml/blob/v3.0.1/LICENSE,MIT
9391
k8s.io/api,https://github.com/kubernetes/api/blob/v0.24.17/LICENSE,Apache-2.0
9492
k8s.io/apimachinery/pkg,https://github.com/kubernetes/apimachinery/blob/v0.24.17/LICENSE,Apache-2.0
9593
k8s.io/apimachinery/third_party/forked/golang,https://github.com/kubernetes/apimachinery/blob/v0.24.17/third_party/forked/golang/LICENSE,BSD-3-Clause
9694
k8s.io/client-go,https://github.com/kubernetes/client-go/blob/v0.24.3/LICENSE,Apache-2.0
97-
k8s.io/klog/v2,https://github.com/kubernetes/klog/blob/v2.70.1/LICENSE,Apache-2.0
95+
k8s.io/klog/v2,https://github.com/kubernetes/klog/blob/v2.60.1/LICENSE,Apache-2.0
9896
k8s.io/kube-openapi/pkg,https://github.com/kubernetes/kube-openapi/blob/011e075b9cb8/LICENSE,Apache-2.0
9997
k8s.io/kube-openapi/pkg/validation/spec,https://github.com/kubernetes/kube-openapi/blob/011e075b9cb8/pkg/validation/spec/LICENSE,Apache-2.0
100-
k8s.io/utils,https://github.com/kubernetes/utils/blob/56c0de1e6f5e/LICENSE,Apache-2.0
101-
k8s.io/utils/internal/third_party/forked/golang/net,https://github.com/kubernetes/utils/blob/56c0de1e6f5e/internal/third_party/forked/golang/LICENSE,BSD-3-Clause
102-
sigs.k8s.io/json,https://github.com/kubernetes-sigs/json/blob/f223a00ba0e2/LICENSE,Apache-2.0
98+
k8s.io/utils,https://github.com/kubernetes/utils/blob/3a6ce19ff2f9/LICENSE,Apache-2.0
99+
k8s.io/utils/internal/third_party/forked/golang/net,https://github.com/kubernetes/utils/blob/3a6ce19ff2f9/internal/third_party/forked/golang/LICENSE,BSD-3-Clause
100+
sigs.k8s.io/json,https://github.com/kubernetes-sigs/json/blob/9f7c6b3444d2/LICENSE,Apache-2.0
103101
sigs.k8s.io/structured-merge-diff/v4,https://github.com/kubernetes-sigs/structured-merge-diff/blob/v4.2.3/LICENSE,Apache-2.0
104-
sigs.k8s.io/yaml,https://github.com/kubernetes-sigs/yaml/blob/v1.4.0/LICENSE,Apache-2.0
105-
sigs.k8s.io/yaml/goyaml.v2,https://github.com/kubernetes-sigs/yaml/blob/v1.4.0/goyaml.v2/LICENSE,Apache-2.0
102+
sigs.k8s.io/yaml,https://github.com/kubernetes-sigs/yaml/blob/v1.3.0/LICENSE,MIT

0 commit comments

Comments
 (0)