Skip to content

Commit 2f90c4f

Browse files
openshift-ci[bot]openshift-ci[bot]
authored
Merge pull request #76 from odvarkadaniel/bump-k8s-1.28
OCPCLOUD-2192: Bump k8s packages to v1.28
2 parents 0bb179e + 00d55d8 commit 2f90c4f

File tree

879 files changed

+62192
-21897
lines changed

Some content is hidden

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

879 files changed

+62192
-21897
lines changed

‎Makefile

Lines changed: 2 additions & 2 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.19
27+
BUILD_IMAGE ?= registry.ci.openshift.org/openshift/release:golang-1.20
2828

2929
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
30-
ENVTEST_K8S_VERSION = 1.27
30+
ENVTEST_K8S_VERSION = 1.28
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

‎cmd/manager/main.go

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,12 @@ import (
4141
"k8s.io/klog/v2"
4242
"k8s.io/klog/v2/klogr"
4343
ctrl "sigs.k8s.io/controller-runtime"
44+
"sigs.k8s.io/controller-runtime/pkg/cache"
4445
"sigs.k8s.io/controller-runtime/pkg/client/config"
4546
"sigs.k8s.io/controller-runtime/pkg/controller"
4647
"sigs.k8s.io/controller-runtime/pkg/healthz"
4748
"sigs.k8s.io/controller-runtime/pkg/manager"
49+
"sigs.k8s.io/controller-runtime/pkg/metrics/server"
4850
)
4951

5052
// The default durations for the leader electrion operations.
@@ -104,16 +106,22 @@ func main() {
104106
LeaderElectionNamespace: *leaderElectResourceNamespace,
105107
LeaderElectionID: "cluster-api-provider-azure-leader",
106108
LeaseDuration: leaderElectLeaseDuration,
107-
MetricsBindAddress: *metricsAddress,
108-
SyncPeriod: &syncPeriod,
109+
Metrics: server.Options{
110+
BindAddress: *metricsAddress,
111+
},
112+
Cache: cache.Options{
113+
SyncPeriod: &syncPeriod,
114+
},
109115
// Slow the default retry and renew election rate to reduce etcd writes at idle: BZ 1858400
110116
RetryPeriod: &retryPeriod,
111117
RenewDeadline: &renewDealine,
112118
}
113119

114120
if *watchNamespace != "" {
115-
opts.Namespace = *watchNamespace
116-
klog.Infof("Watching machine-api objects only in namespace %q for reconciliation.", opts.Namespace)
121+
opts.Cache.DefaultNamespaces = map[string]cache.Config{
122+
*watchNamespace: {},
123+
}
124+
klog.Infof("Watching machine-api objects only in namespace %q for reconciliation.", *watchNamespace)
117125
}
118126

119127
// Setup a Manager

‎go.mod

Lines changed: 54 additions & 50 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.19
3+
go 1.20
44

55
require (
66
github.com/Azure/azure-sdk-for-go v66.0.0+incompatible
@@ -13,33 +13,33 @@ require (
1313
github.com/google/go-cmp v0.5.9
1414
github.com/hashicorp/golang-lru v0.5.4
1515
github.com/mitchellh/mapstructure v1.5.0
16-
github.com/onsi/ginkgo/v2 v2.9.5
17-
github.com/onsi/gomega v1.27.7
18-
github.com/openshift/api v0.0.0-20230707123100-21c0ce73add5
19-
github.com/openshift/machine-api-operator v0.2.1-0.20230531233206-931f6f67c1c7
16+
github.com/onsi/ginkgo/v2 v2.12.1
17+
github.com/onsi/gomega v1.28.0
18+
github.com/openshift/api v0.0.0-20230928105710-23b54c280f99
19+
github.com/openshift/machine-api-operator v0.2.1-0.20230929171041-2cc7fcf262f3
2020
github.com/pkg/errors v0.9.1
2121
github.com/spf13/cobra v1.7.0
22-
golang.org/x/crypto v0.7.0
23-
golang.org/x/net v0.10.0 // indirect
22+
golang.org/x/crypto v0.13.0
23+
golang.org/x/net v0.15.0 // indirect
2424

25-
// kube 1.27
26-
k8s.io/api v0.27.2
27-
k8s.io/apimachinery v0.27.2
28-
k8s.io/client-go v0.27.2
25+
// kube 1.28
26+
k8s.io/api v0.28.2
27+
k8s.io/apimachinery v0.28.2
28+
k8s.io/client-go v0.28.2
2929
k8s.io/klog/v2 v2.100.1
30-
k8s.io/utils v0.0.0-20230505201702-9f6742963106
31-
sigs.k8s.io/controller-runtime v0.15.0
32-
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20230523032821-116a1b831fff
33-
sigs.k8s.io/controller-tools v0.12.0
30+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
31+
sigs.k8s.io/controller-runtime v0.16.2
32+
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20230926180527-c93e2abcb28e
33+
sigs.k8s.io/controller-tools v0.13.0
3434
sigs.k8s.io/yaml v1.3.0
3535
)
3636

3737
require (
3838
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.6.0
3939
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0
4040
github.com/jongio/azidext/go/azidext v0.4.0
41-
github.com/openshift/client-go v0.0.0-20230503144108-75015d2347cb
42-
github.com/openshift/library-go v0.0.0-20230508110756-9b7abe2c9cbf
41+
github.com/openshift/client-go v0.0.0-20230926161409-848405da69e1
42+
github.com/openshift/library-go v0.0.0-20230927113136-405c34317fa4
4343
)
4444

4545
require (
@@ -66,7 +66,7 @@ require (
6666
github.com/go-errors/errors v1.4.2 // indirect
6767
github.com/go-logr/zapr v1.2.4 // indirect
6868
github.com/go-openapi/jsonpointer v0.19.6 // indirect
69-
github.com/go-openapi/jsonreference v0.20.1 // indirect
69+
github.com/go-openapi/jsonreference v0.20.2 // indirect
7070
github.com/go-openapi/swag v0.22.3 // indirect
7171
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
7272
github.com/gobuffalo/flect v1.0.2 // indirect
@@ -75,9 +75,9 @@ require (
7575
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
7676
github.com/golang/protobuf v1.5.3 // indirect
7777
github.com/google/btree v1.0.1 // indirect
78-
github.com/google/gnostic v0.6.9 // indirect
78+
github.com/google/gnostic-models v0.6.8 // indirect
7979
github.com/google/gofuzz v1.2.0 // indirect
80-
github.com/google/pprof v0.0.0-20230207041349-798e818bf904 // indirect
80+
github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98 // indirect
8181
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
8282
github.com/google/uuid v1.3.0 // indirect
8383
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
@@ -89,9 +89,9 @@ require (
8989
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
9090
github.com/mailru/easyjson v0.7.7 // indirect
9191
github.com/mattn/go-colorable v0.1.13 // indirect
92-
github.com/mattn/go-isatty v0.0.17 // indirect
92+
github.com/mattn/go-isatty v0.0.19 // indirect
9393
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
94-
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
94+
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
9595
github.com/moby/spdystream v0.2.0 // indirect
9696
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
9797
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -100,42 +100,46 @@ require (
100100
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
101101
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
102102
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
103-
github.com/prometheus/client_golang v1.15.1 // indirect
104-
github.com/prometheus/client_model v0.4.0 // indirect
105-
github.com/prometheus/common v0.42.0 // indirect
106-
github.com/prometheus/procfs v0.9.0 // indirect
103+
github.com/prometheus/client_golang v1.17.0 // indirect
104+
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
105+
github.com/prometheus/common v0.44.0 // indirect
106+
github.com/prometheus/procfs v0.12.0 // indirect
107107
github.com/robfig/cron v1.2.0 // indirect
108+
github.com/rogpeppe/go-internal v1.11.0 // indirect
108109
github.com/russross/blackfriday/v2 v2.1.0 // indirect
109-
github.com/spf13/afero v1.9.3 // indirect
110+
github.com/spf13/afero v1.10.0 // indirect
110111
github.com/spf13/pflag v1.0.5 // indirect
111-
github.com/xlab/treeprint v1.1.0 // indirect
112-
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
113-
go.uber.org/atomic v1.10.0 // indirect
114-
go.uber.org/multierr v1.9.0 // indirect
115-
go.uber.org/zap v1.24.0 // indirect
116-
golang.org/x/mod v0.10.0 // indirect
117-
golang.org/x/oauth2 v0.6.0 // indirect
118-
golang.org/x/sys v0.8.0 // indirect
119-
golang.org/x/term v0.8.0 // indirect
120-
golang.org/x/text v0.9.0 // indirect
112+
github.com/stretchr/objx v0.5.1 // indirect
113+
github.com/stretchr/testify v1.8.4 // indirect
114+
github.com/xlab/treeprint v1.2.0 // indirect
115+
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
116+
go.uber.org/multierr v1.11.0 // indirect
117+
go.uber.org/zap v1.26.0 // indirect
118+
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
119+
golang.org/x/mod v0.12.0 // indirect
120+
golang.org/x/oauth2 v0.8.0 // indirect
121+
golang.org/x/sync v0.3.0 // indirect
122+
golang.org/x/sys v0.12.0 // indirect
123+
golang.org/x/term v0.12.0 // indirect
124+
golang.org/x/text v0.13.0 // indirect
121125
golang.org/x/time v0.3.0 // indirect
122-
golang.org/x/tools v0.9.1 // indirect
123-
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
126+
golang.org/x/tools v0.13.0 // indirect
127+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
124128
google.golang.org/appengine v1.6.7 // indirect
125-
google.golang.org/protobuf v1.30.0 // indirect
129+
google.golang.org/protobuf v1.31.0 // indirect
126130
gopkg.in/inf.v0 v0.9.1 // indirect
127131
gopkg.in/yaml.v2 v2.4.0 // indirect
128132
gopkg.in/yaml.v3 v3.0.1 // indirect
129-
k8s.io/apiextensions-apiserver v0.27.2 // indirect
130-
k8s.io/apiserver v0.27.2 // indirect
131-
k8s.io/cli-runtime v0.27.1 // indirect
132-
k8s.io/component-base v0.27.2 // indirect
133-
k8s.io/kube-aggregator v0.27.1 // indirect
134-
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
135-
k8s.io/kubectl v0.27.1 // indirect
133+
k8s.io/apiextensions-apiserver v0.28.2 // indirect
134+
k8s.io/apiserver v0.28.2 // indirect
135+
k8s.io/cli-runtime v0.28.2 // indirect
136+
k8s.io/component-base v0.28.2 // indirect
137+
k8s.io/kube-aggregator v0.28.2 // indirect
138+
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
139+
k8s.io/kubectl v0.28.2 // indirect
136140
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
137-
sigs.k8s.io/kube-storage-version-migrator v0.0.4 // indirect
138-
sigs.k8s.io/kustomize/api v0.13.4 // indirect
139-
sigs.k8s.io/kustomize/kyaml v0.14.2 // indirect
141+
sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96 // indirect
142+
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
143+
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
140144
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
141145
)

0 commit comments

Comments
 (0)