Skip to content

Commit 72b698c

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #113 from RadekManak/kube-1.30
OCPCLOUD-2614: Update to K8s 1.30
2 parents 30de862 + 1486e41 commit 72b698c

File tree

988 files changed

+99713
-21168
lines changed

Some content is hidden

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

988 files changed

+99713
-21168
lines changed

‎Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ endif
2424
VERSION ?= $(shell git describe --always --abbrev=7)
2525
REPO_PATH ?= github.com/openshift/machine-api-provider-azure
2626
LD_FLAGS ?= -X $(REPO_PATH)/pkg/version.Raw=$(VERSION) -extldflags -static
27-
BUILD_IMAGE ?= registry.ci.openshift.org/openshift/release:golang-1.21
27+
BUILD_IMAGE ?= registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17
2828

2929
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
30-
ENVTEST_K8S_VERSION = 1.29.1
30+
ENVTEST_K8S_VERSION = 1.30.1
3131

3232
PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
3333
CONTROLLER_GEN = go run ${PROJECT_DIR}/vendor/sigs.k8s.io/controller-tools/cmd/controller-gen
@@ -115,7 +115,7 @@ build: ## build binaries
115115
.PHONY: test
116116
test: ## Run tests
117117
@echo -e "\033[32mTesting...\033[0m"
118-
KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path --bin-dir $(PROJECT_DIR)/bin --remote-bucket openshift-kubebuilder-tools)" ./hack/ci-test.sh
118+
KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path --bin-dir $(PROJECT_DIR)/bin --remote-bucket openshift-kubebuilder-tools --use-deprecated-gcs)" ./hack/ci-test.sh
119119

120120
.PHONY: unit
121121
unit: # Run unit test

‎go.mod

Lines changed: 55 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/openshift/machine-api-provider-azure
22

3-
go 1.22
3+
go 1.22.0
44

55
toolchain go1.22.1
66

@@ -9,82 +9,83 @@ require (
99
github.com/Azure/go-autorest/autorest v0.11.29
1010
github.com/Azure/go-autorest/autorest/to v0.4.0
1111
github.com/ghodss/yaml v1.0.0
12-
github.com/go-logr/logr v1.4.1
12+
github.com/go-logr/logr v1.4.2
1313
github.com/golang/mock v1.6.0
1414
github.com/google/go-cmp v0.6.0
1515
github.com/hashicorp/golang-lru v1.0.2
1616
github.com/mitchellh/mapstructure v1.5.0
17-
github.com/onsi/ginkgo/v2 v2.14.0
18-
github.com/onsi/gomega v1.30.0
19-
github.com/openshift/api v0.0.0-20240521141249-8af21b7ed3e3
20-
github.com/openshift/machine-api-operator v0.2.1-0.20240125175440-c9de8bda0dd1
17+
github.com/onsi/ginkgo/v2 v2.19.0
18+
github.com/onsi/gomega v1.33.1
19+
github.com/openshift/api v0.0.0-20240611134040-5c2b46e4709a
20+
github.com/openshift/machine-api-operator v0.2.1-0.20240606171151-148e5dc759a6
2121
github.com/pkg/errors v0.9.1
2222
github.com/spf13/cobra v1.8.0
23-
golang.org/x/crypto v0.18.0
23+
golang.org/x/crypto v0.24.0
2424

25-
// kube 1.29
26-
k8s.io/api v0.29.0
27-
k8s.io/apimachinery v0.29.0
28-
k8s.io/client-go v0.29.0
29-
k8s.io/klog/v2 v2.110.1
30-
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
31-
sigs.k8s.io/controller-runtime v0.17.0
32-
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20240116121732-6747c42ce339
33-
sigs.k8s.io/controller-tools v0.14.0
25+
// kube 1.30
26+
k8s.io/api v0.30.1
27+
k8s.io/apimachinery v0.30.1
28+
k8s.io/client-go v0.30.1
29+
k8s.io/klog/v2 v2.120.1
30+
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0
31+
sigs.k8s.io/controller-runtime v0.18.4
32+
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20240608161558-1f5b39fa59d1
33+
sigs.k8s.io/controller-tools v0.15.0
3434
sigs.k8s.io/yaml v1.4.0
3535
)
3636

3737
require (
38-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.1
39-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1
38+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.12.0
39+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.6.0
4040
github.com/jongio/azidext/go/azidext v0.5.0
41-
github.com/openshift/client-go v0.0.0-20240115204758-e6bf7d631d5e
42-
github.com/openshift/library-go v0.0.0-20240116081341-964bcb3f545c
41+
github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87
42+
github.com/openshift/library-go v0.0.0-20240607134135-aed018c215a1
43+
go.uber.org/mock v0.4.0
4344
)
4445

4546
require (
46-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.1 // indirect
47-
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
47+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.9.0 // indirect
48+
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
4849
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
4950
github.com/Azure/go-autorest/autorest/adal v0.9.23 // indirect
5051
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
5152
github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect
5253
github.com/Azure/go-autorest/logger v0.2.1 // indirect
5354
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
54-
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1 // indirect
55+
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
5556
github.com/MakeNowJust/heredoc v1.0.0 // indirect
5657
github.com/beorn7/perks v1.0.1 // indirect
5758
github.com/blang/semver/v4 v4.0.0 // indirect
5859
github.com/cespare/xxhash/v2 v2.2.0 // indirect
5960
github.com/chai2010/gettext-go v1.0.2 // indirect
60-
github.com/davecgh/go-spew v1.1.1 // indirect
61-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
61+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
62+
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
6263
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
63-
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
64+
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
6465
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
6566
github.com/fatih/color v1.16.0 // indirect
6667
github.com/fsnotify/fsnotify v1.7.0 // indirect
6768
github.com/go-errors/errors v1.4.2 // indirect
6869
github.com/go-logr/zapr v1.3.0 // indirect
69-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
70-
github.com/go-openapi/jsonreference v0.20.2 // indirect
71-
github.com/go-openapi/swag v0.22.3 // indirect
72-
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
70+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
71+
github.com/go-openapi/jsonreference v0.21.0 // indirect
72+
github.com/go-openapi/swag v0.23.0 // indirect
73+
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
7374
github.com/gobuffalo/flect v1.0.2 // indirect
7475
github.com/gogo/protobuf v1.3.2 // indirect
7576
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
76-
github.com/golang-jwt/jwt/v5 v5.2.0 // indirect
77+
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
7778
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
78-
github.com/golang/protobuf v1.5.3 // indirect
79+
github.com/golang/protobuf v1.5.4 // indirect
7980
github.com/google/btree v1.0.1 // indirect
8081
github.com/google/gnostic-models v0.6.8 // indirect
8182
github.com/google/gofuzz v1.2.0 // indirect
82-
github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98 // indirect
83+
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
8384
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
84-
github.com/google/uuid v1.5.0 // indirect
85+
github.com/google/uuid v1.6.0 // indirect
8586
github.com/gorilla/websocket v1.5.0 // indirect
8687
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
87-
github.com/imdario/mergo v0.3.13 // indirect
88+
github.com/imdario/mergo v0.3.15 // indirect
8889
github.com/inconshreveable/mousetrap v1.1.0 // indirect
8990
github.com/josharian/intern v1.0.0 // indirect
9091
github.com/json-iterator/go v1.1.12 // indirect
@@ -96,7 +97,7 @@ require (
9697
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
9798
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
9899
github.com/moby/spdystream v0.2.0 // indirect
99-
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
100+
github.com/moby/term v0.5.0 // indirect
100101
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
101102
github.com/modern-go/reflect2 v1.0.2 // indirect
102103
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
@@ -109,38 +110,36 @@ require (
109110
github.com/prometheus/common v0.45.0 // indirect
110111
github.com/prometheus/procfs v0.12.0 // indirect
111112
github.com/robfig/cron v1.2.0 // indirect
112-
github.com/rogpeppe/go-internal v1.11.0 // indirect
113113
github.com/russross/blackfriday/v2 v2.1.0 // indirect
114114
github.com/spf13/afero v1.10.0 // indirect
115115
github.com/spf13/pflag v1.0.5 // indirect
116-
github.com/stretchr/objx v0.5.1 // indirect
117116
github.com/xlab/treeprint v1.2.0 // indirect
118117
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
119118
go.uber.org/multierr v1.11.0 // indirect
120119
go.uber.org/zap v1.26.0 // indirect
121120
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
122-
golang.org/x/mod v0.14.0 // indirect
123-
golang.org/x/net v0.20.0 // indirect
124-
golang.org/x/oauth2 v0.12.0 // indirect
125-
golang.org/x/sync v0.5.0 // indirect
126-
golang.org/x/sys v0.16.0 // indirect
127-
golang.org/x/term v0.16.0 // indirect
128-
golang.org/x/text v0.14.0 // indirect
129-
golang.org/x/time v0.3.0 // indirect
130-
golang.org/x/tools v0.16.1 // indirect
121+
golang.org/x/mod v0.17.0 // indirect
122+
golang.org/x/net v0.26.0 // indirect
123+
golang.org/x/oauth2 v0.18.0 // indirect
124+
golang.org/x/sync v0.7.0 // indirect
125+
golang.org/x/sys v0.21.0 // indirect
126+
golang.org/x/term v0.21.0 // indirect
127+
golang.org/x/text v0.16.0 // indirect
128+
golang.org/x/time v0.5.0 // indirect
129+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
131130
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
132-
google.golang.org/appengine v1.6.7 // indirect
133-
google.golang.org/protobuf v1.31.0 // indirect
131+
google.golang.org/appengine v1.6.8 // indirect
132+
google.golang.org/protobuf v1.33.0 // indirect
134133
gopkg.in/inf.v0 v0.9.1 // indirect
135134
gopkg.in/yaml.v2 v2.4.0 // indirect
136135
gopkg.in/yaml.v3 v3.0.1 // indirect
137-
k8s.io/apiextensions-apiserver v0.29.0 // indirect
138-
k8s.io/apiserver v0.29.0 // indirect
139-
k8s.io/cli-runtime v0.29.0 // indirect
140-
k8s.io/component-base v0.29.0 // indirect
141-
k8s.io/kube-aggregator v0.29.0 // indirect
142-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
143-
k8s.io/kubectl v0.29.0 // indirect
136+
k8s.io/apiextensions-apiserver v0.30.1 // indirect
137+
k8s.io/apiserver v0.30.1 // indirect
138+
k8s.io/cli-runtime v0.30.0 // indirect
139+
k8s.io/component-base v0.30.1 // indirect
140+
k8s.io/kube-aggregator v0.30.1 // indirect
141+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
142+
k8s.io/kubectl v0.30.0 // indirect
144143
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
145144
sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96 // indirect
146145
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect

0 commit comments

Comments
 (0)