Skip to content

Commit a8dabfa

Browse files
Merge pull request #316 from dinhxuanvu/k8s-1.24
Bug 2094303: fix(vendor/scoped): bump k8s version to 1.24, go version to 1.18 and fix scoped client (#2794)
2 parents 7f8ad59 + 277973d commit a8dabfa

File tree

2,174 files changed

+124102
-52753
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,174 files changed

+124102
-52753
lines changed

.ci-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
build_root_image:
22
name: release
33
namespace: openshift
4-
tag: rhel-8-release-golang-1.17-openshift-4.11
4+
tag: rhel-8-release-golang-1.18-openshift-4.11

go.mod

Lines changed: 104 additions & 91 deletions
Large diffs are not rendered by default.

go.sum

Lines changed: 490 additions & 425 deletions
Large diffs are not rendered by default.

manifests/0000_50_olm_00-clusterserviceversions.crd.yaml

Lines changed: 214 additions & 210 deletions
Large diffs are not rendered by default.

manifests/0000_50_olm_00-subscriptions.crd.yaml

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

staging/api/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ cd $$TMP_DIR ;\
100100
go mod init tmp ;\
101101
echo "Downloading $(2)" ;\
102102
GOBIN=$(PROJECT_DIR)/bin go get $(2) ;\
103+
GOBIN=$(PROJECT_DIR)/bin go install $(2) ;\
103104
rm -rf $$TMP_DIR ;\
104105
}
105106
endef

staging/api/crds/operators.coreos.com_clusterserviceversions.yaml

Lines changed: 214 additions & 210 deletions
Large diffs are not rendered by default.

staging/api/crds/operators.coreos.com_subscriptions.yaml

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

staging/api/crds/zz_defs.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/api/go.mod

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ require (
77
github.com/blang/semver/v4 v4.0.0
88
github.com/ghodss/yaml v1.0.0
99
github.com/go-bindata/go-bindata/v3 v3.1.3
10-
github.com/google/cel-go v0.9.0
10+
github.com/google/cel-go v0.10.1
1111
github.com/google/go-cmp v0.5.6 // indirect
1212
github.com/sirupsen/logrus v1.8.1
13-
github.com/spf13/cobra v1.2.1
13+
github.com/spf13/cobra v1.4.0
1414
github.com/stretchr/testify v1.7.0
15-
google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2
16-
k8s.io/api v0.23.0
17-
k8s.io/apiextensions-apiserver v0.23.0
18-
k8s.io/apimachinery v0.23.0
19-
k8s.io/client-go v0.23.0
20-
sigs.k8s.io/controller-runtime v0.11.0
15+
google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368
16+
k8s.io/api v0.24.0
17+
k8s.io/apiextensions-apiserver v0.24.0
18+
k8s.io/apimachinery v0.24.0
19+
k8s.io/client-go v0.24.0
20+
sigs.k8s.io/controller-runtime v0.12.1
2121
)
2222

2323
require (
@@ -26,7 +26,7 @@ require (
2626
github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20210826220005-b48c857c3a0e // indirect
2727
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
2828
github.com/beorn7/perks v1.0.1 // indirect
29-
github.com/cespare/xxhash/v2 v2.1.1 // indirect
29+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
3030
github.com/davecgh/go-spew v1.1.1 // indirect
3131
github.com/felixge/httpsnoop v1.0.1 // indirect
3232
github.com/go-logr/logr v1.2.0 // indirect
@@ -36,8 +36,9 @@ require (
3636
github.com/gogo/protobuf v1.3.2 // indirect
3737
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3838
github.com/golang/protobuf v1.5.2 // indirect
39+
github.com/google/gnostic v0.5.7-v3refs // indirect
3940
github.com/google/gofuzz v1.1.0 // indirect
40-
github.com/googleapis/gnostic v0.5.5 // indirect
41+
github.com/google/uuid v1.1.2 // indirect
4142
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
4243
github.com/imdario/mergo v0.3.12 // indirect
4344
github.com/inconshreveable/mousetrap v1.0.0 // indirect
@@ -50,10 +51,10 @@ require (
5051
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5152
github.com/modern-go/reflect2 v1.0.2 // indirect
5253
github.com/pmezard/go-difflib v1.0.0 // indirect
53-
github.com/prometheus/client_golang v1.11.0 // indirect
54+
github.com/prometheus/client_golang v1.12.1 // indirect
5455
github.com/prometheus/client_model v0.2.0 // indirect
55-
github.com/prometheus/common v0.28.0 // indirect
56-
github.com/prometheus/procfs v0.6.0 // indirect
56+
github.com/prometheus/common v0.32.1 // indirect
57+
github.com/prometheus/procfs v0.7.3 // indirect
5758
github.com/spf13/pflag v1.0.5 // indirect
5859
github.com/stoewer/go-strcase v1.2.0 // indirect
5960
go.opentelemetry.io/contrib v0.20.0 // indirect
@@ -67,28 +68,28 @@ require (
6768
go.opentelemetry.io/otel/trace v0.20.0 // indirect
6869
go.opentelemetry.io/proto/otlp v0.7.0 // indirect
6970
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
70-
golang.org/x/mod v0.4.2 // indirect
71-
golang.org/x/net v0.0.0-20210825183410-e898025ed96a // indirect
72-
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
73-
golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8 // indirect
74-
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
71+
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
72+
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
73+
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
74+
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
75+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
7576
golang.org/x/text v0.3.7 // indirect
76-
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
77-
golang.org/x/tools v0.1.6-0.20210820212750-d4cc65f0b2ff // indirect
77+
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
78+
golang.org/x/tools v0.1.10-0.20220218145154-897bd77cd717 // indirect
7879
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
7980
google.golang.org/appengine v1.6.7 // indirect
8081
google.golang.org/grpc v1.40.0 // indirect
8182
google.golang.org/protobuf v1.27.1 // indirect
8283
gopkg.in/inf.v0 v0.9.1 // indirect
8384
gopkg.in/yaml.v2 v2.4.0 // indirect
8485
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
85-
k8s.io/apiserver v0.23.0 // indirect
86-
k8s.io/component-base v0.23.0 // indirect
87-
k8s.io/klog/v2 v2.30.0 // indirect
88-
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
89-
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect
90-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.25 // indirect
91-
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
92-
sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect
86+
k8s.io/apiserver v0.24.0 // indirect
87+
k8s.io/component-base v0.24.0 // indirect
88+
k8s.io/klog/v2 v2.60.1 // indirect
89+
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
90+
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
91+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30 // indirect
92+
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
93+
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
9394
sigs.k8s.io/yaml v1.3.0 // indirect
9495
)

0 commit comments

Comments
 (0)