Skip to content

Commit 3cc4335

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #356 from elmiko/rebase-to-1.30
OCPCLOUD-2609: rebase for kubernetes 1.30
2 parents 1df0999 + 89c7d10 commit 3cc4335

File tree

1,666 files changed

+146116
-75711
lines changed

Some content is hidden

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

1,666 files changed

+146116
-75711
lines changed

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
IMG ?= controller:latest
44

55
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
6-
ENVTEST_K8S_VERSION = 1.29
6+
ENVTEST_K8S_VERSION = 1.30.1
77

88
PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
99
CONTROLLER_GEN = go run ${PROJECT_DIR}/vendor/sigs.k8s.io/controller-tools/cmd/controller-gen
@@ -34,7 +34,7 @@ verify: fmt vet lint
3434
test: generate verify manifests unit
3535

3636
unit:
37-
KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path --bin-dir $(PROJECT_DIR)/bin --remote-bucket openshift-kubebuilder-tools)" ./hack/ci-test.sh
37+
KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --use-deprecated-gcs=true -p path --bin-dir $(PROJECT_DIR)/bin --remote-bucket openshift-kubebuilder-tools)" ./hack/ci-test.sh
3838

3939
# Build operator binaries
4040
build: operator config-sync-controllers azure-config-credentials-injector

‎go.mod

Lines changed: 63 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
11
module github.com/openshift/cluster-cloud-controller-manager-operator
22

3-
go 1.22
3+
go 1.22.0
44

5-
toolchain go1.22.1
5+
toolchain go1.22.2
66

77
require (
88
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d
9-
github.com/go-logr/logr v1.4.1
9+
github.com/go-logr/logr v1.4.2
1010
github.com/golangci/golangci-lint v1.54.2
11-
github.com/onsi/ginkgo/v2 v2.15.0
12-
github.com/onsi/gomega v1.31.1
13-
github.com/openshift/api v0.0.0-20240115183315-0793e918179d
14-
github.com/openshift/client-go v0.0.0-20231218140158-47f6d749b9d9
15-
github.com/openshift/cluster-api-actuator-pkg/testutils v0.0.0-20240528211528-be89f29d8b62
16-
github.com/openshift/library-go v0.0.0-20240228143125-4602d24d27bc
11+
github.com/onsi/ginkgo/v2 v2.19.0
12+
github.com/onsi/gomega v1.33.1
13+
github.com/openshift/api v0.0.0-20240610131338-a837bee24500
14+
github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87
15+
github.com/openshift/cluster-api-actuator-pkg/testutils v0.0.0-20240607201500-81075cf8e11a
16+
github.com/openshift/library-go v0.0.0-20240607134135-aed018c215a1
1717
github.com/spf13/cobra v1.8.0
1818
github.com/spf13/pflag v1.0.5
19-
github.com/stretchr/testify v1.8.4
19+
github.com/stretchr/testify v1.9.0
2020
gopkg.in/gcfg.v1 v1.2.3
2121
gopkg.in/ini.v1 v1.67.0
2222
gopkg.in/yaml.v2 v2.4.0
23-
k8s.io/api v0.29.0
24-
k8s.io/apiextensions-apiserver v0.29.0
25-
k8s.io/apimachinery v0.29.0
26-
k8s.io/client-go v0.29.0
27-
k8s.io/cloud-provider-vsphere v1.28.0
28-
k8s.io/component-base v0.29.0
29-
k8s.io/controller-manager v0.29.0
30-
k8s.io/klog/v2 v2.110.1
31-
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
32-
sigs.k8s.io/cloud-provider-azure v1.29.0
33-
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.0-20240122180333-ce85431a6d56
34-
sigs.k8s.io/controller-runtime v0.17.0
35-
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20230926180527-c93e2abcb28e
36-
sigs.k8s.io/controller-tools v0.13.0
23+
k8s.io/api v0.30.1
24+
k8s.io/apiextensions-apiserver v0.30.1
25+
k8s.io/apimachinery v0.30.1
26+
k8s.io/client-go v0.30.1
27+
k8s.io/cloud-provider-vsphere v1.30.1
28+
k8s.io/component-base v0.30.1
29+
k8s.io/controller-manager v0.30.1
30+
k8s.io/klog/v2 v2.120.1
31+
k8s.io/utils v0.0.0-20240310230437-4693a0247e57
32+
sigs.k8s.io/cloud-provider-azure v1.30.3
33+
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.25
34+
sigs.k8s.io/controller-runtime v0.18.4
35+
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20240608161558-1f5b39fa59d1
36+
sigs.k8s.io/controller-tools v0.15.0
3737
sigs.k8s.io/yaml v1.4.0
3838
)
3939

@@ -45,27 +45,29 @@ require (
4545
github.com/Antonboom/errname v0.1.12 // indirect
4646
github.com/Antonboom/nilnil v0.1.7 // indirect
4747
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible // indirect
48-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.1 // indirect
49-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1 // indirect
50-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.1 // indirect
51-
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5 v5.4.0 // indirect
48+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.12.0 // indirect
49+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.2 // indirect
50+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.9.0 // indirect
51+
github.com/Azure/azure-sdk-for-go/sdk/keyvault/azsecrets v0.12.0 // indirect
52+
github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.1 // indirect
53+
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5 v5.7.0 // indirect
5254
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerregistry/armcontainerregistry v1.2.0 // indirect
53-
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerservice/armcontainerservice/v4 v4.6.0 // indirect
55+
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerservice/armcontainerservice/v4 v4.8.0 // indirect
5456
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/keyvault/armkeyvault v1.4.0 // indirect
5557
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v4 v4.3.0 // indirect
5658
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/privatedns/armprivatedns v1.2.0 // indirect
5759
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.2.0 // indirect
5860
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.5.0 // indirect
5961
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
6062
github.com/Azure/go-autorest/autorest v0.11.29 // indirect
61-
github.com/Azure/go-autorest/autorest/adal v0.9.23 // indirect
63+
github.com/Azure/go-autorest/autorest/adal v0.9.24 // indirect
6264
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
6365
github.com/Azure/go-autorest/autorest/mocks v0.4.2 // indirect
6466
github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect
6567
github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect
6668
github.com/Azure/go-autorest/logger v0.2.1 // indirect
6769
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
68-
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1 // indirect
70+
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
6971
github.com/BurntSushi/toml v1.3.2 // indirect
7072
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
7173
github.com/GaijinEntertainment/go-exhaustruct/v3 v3.1.0 // indirect
@@ -93,22 +95,22 @@ require (
9395
github.com/daixiang0/gci v0.11.0 // indirect
9496
github.com/davecgh/go-spew v1.1.1 // indirect
9597
github.com/denis-tingaikin/go-header v0.4.3 // indirect
96-
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
98+
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
9799
github.com/esimonov/ifshort v1.0.4 // indirect
98100
github.com/ettle/strcase v0.1.1 // indirect
99-
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
100-
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
101-
github.com/fatih/color v1.15.0 // indirect
101+
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
102+
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
103+
github.com/fatih/color v1.16.0 // indirect
102104
github.com/fatih/structtag v1.2.0 // indirect
103105
github.com/firefart/nonamedreturns v1.0.4 // indirect
104106
github.com/fsnotify/fsnotify v1.7.0 // indirect
105107
github.com/fzipp/gocyclo v0.6.0 // indirect
106108
github.com/go-critic/go-critic v0.9.0 // indirect
107109
github.com/go-logr/zapr v1.3.0 // indirect
108-
github.com/go-openapi/jsonpointer v0.20.2 // indirect
109-
github.com/go-openapi/jsonreference v0.20.4 // indirect
110-
github.com/go-openapi/swag v0.22.7 // indirect
111-
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
110+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
111+
github.com/go-openapi/jsonreference v0.21.0 // indirect
112+
github.com/go-openapi/swag v0.23.0 // indirect
113+
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
112114
github.com/go-toolsmith/astcast v1.1.0 // indirect
113115
github.com/go-toolsmith/astcopy v1.1.0 // indirect
114116
github.com/go-toolsmith/astequal v1.1.0 // indirect
@@ -122,9 +124,9 @@ require (
122124
github.com/gofrs/flock v0.8.1 // indirect
123125
github.com/gogo/protobuf v1.3.2 // indirect
124126
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
125-
github.com/golang-jwt/jwt/v5 v5.2.0 // indirect
127+
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
126128
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
127-
github.com/golang/protobuf v1.5.3 // indirect
129+
github.com/golang/protobuf v1.5.4 // indirect
128130
github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 // indirect
129131
github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect
130132
github.com/golangci/go-misc v0.0.0-20220329215616-d24fe342adfe // indirect
@@ -137,8 +139,8 @@ require (
137139
github.com/google/gnostic-models v0.6.8 // indirect
138140
github.com/google/go-cmp v0.6.0 // indirect
139141
github.com/google/gofuzz v1.2.0 // indirect
140-
github.com/google/pprof v0.0.0-20230602010524-ada837c32108 // indirect
141-
github.com/google/uuid v1.5.0 // indirect
142+
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
143+
github.com/google/uuid v1.6.0 // indirect
142144
github.com/gordonklaus/ineffassign v0.0.0-20230610083614-0e73809eb601 // indirect
143145
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
144146
github.com/gostaticanalysis/comment v1.4.2 // indirect
@@ -174,7 +176,7 @@ require (
174176
github.com/maratori/testpackage v1.1.1 // indirect
175177
github.com/matoous/godox v0.0.0-20230222163458-006bad1f9d26 // indirect
176178
github.com/mattn/go-colorable v0.1.13 // indirect
177-
github.com/mattn/go-isatty v0.0.17 // indirect
179+
github.com/mattn/go-isatty v0.0.20 // indirect
178180
github.com/mattn/go-runewidth v0.0.9 // indirect
179181
github.com/mbilski/exhaustivestruct v1.2.0 // indirect
180182
github.com/mgechev/revive v1.3.2 // indirect
@@ -223,7 +225,7 @@ require (
223225
github.com/spf13/viper v1.12.0 // indirect
224226
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
225227
github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect
226-
github.com/stretchr/objx v0.5.0 // indirect
228+
github.com/stretchr/objx v0.5.2 // indirect
227229
github.com/subosito/gotenv v1.4.1 // indirect
228230
github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c // indirect
229231
github.com/tdakkota/asciicheck v0.2.0 // indirect
@@ -244,35 +246,35 @@ require (
244246
go.uber.org/mock v0.4.0 // indirect
245247
go.uber.org/multierr v1.11.0 // indirect
246248
go.uber.org/zap v1.26.0 // indirect
247-
golang.org/x/crypto v0.18.0 // indirect
249+
golang.org/x/crypto v0.24.0 // indirect
248250
golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 // indirect
249251
golang.org/x/exp/typeparams v0.0.0-20230307190834-24139beb5833 // indirect
250-
golang.org/x/mod v0.14.0 // indirect
251-
golang.org/x/net v0.20.0 // indirect
252-
golang.org/x/oauth2 v0.16.0 // indirect
253-
golang.org/x/sync v0.6.0 // indirect
254-
golang.org/x/sys v0.16.0 // indirect
255-
golang.org/x/term v0.16.0 // indirect
256-
golang.org/x/text v0.14.0 // indirect
252+
golang.org/x/mod v0.17.0 // indirect
253+
golang.org/x/net v0.26.0 // indirect
254+
golang.org/x/oauth2 v0.18.0 // indirect
255+
golang.org/x/sync v0.7.0 // indirect
256+
golang.org/x/sys v0.21.0 // indirect
257+
golang.org/x/term v0.21.0 // indirect
258+
golang.org/x/text v0.16.0 // indirect
257259
golang.org/x/time v0.5.0 // indirect
258-
golang.org/x/tools v0.17.0 // indirect
260+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
259261
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
260262
google.golang.org/appengine v1.6.8 // indirect
261-
google.golang.org/protobuf v1.32.0 // indirect
263+
google.golang.org/protobuf v1.33.0 // indirect
262264
gopkg.in/inf.v0 v0.9.1 // indirect
263265
gopkg.in/warnings.v0 v0.1.2 // indirect
264266
gopkg.in/yaml.v3 v3.0.1 // indirect
265267
honnef.co/go/tools v0.4.5 // indirect
266-
k8s.io/apiserver v0.29.0 // indirect
267-
k8s.io/cloud-provider v0.29.0 // indirect
268-
k8s.io/component-helpers v0.29.0 // indirect
269-
k8s.io/kube-aggregator v0.29.0 // indirect
270-
k8s.io/kube-openapi v0.0.0-20240105020646-a37d4de58910 // indirect
268+
k8s.io/apiserver v0.30.1 // indirect
269+
k8s.io/cloud-provider v0.30.1 // indirect
270+
k8s.io/component-helpers v0.30.1 // indirect
271+
k8s.io/kube-aggregator v0.30.1 // indirect
272+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
271273
mvdan.cc/gofumpt v0.5.0 // indirect
272274
mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed // indirect
273275
mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect
274276
mvdan.cc/unparam v0.0.0-20221223090309-7455f1af531d // indirect
275-
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.0.0-20231205023417-1ba5a224ab0e // indirect
277+
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.0.14 // indirect
276278
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
277279
sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96 // indirect
278280
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect

0 commit comments

Comments
 (0)