Skip to content

Commit 73d16d0

Browse files
RadekManakRadekManak
committed
Update dependencies to k8s 1.32
1 parent 17caa83 commit 73d16d0

File tree

4 files changed

+470
-160
lines changed

4 files changed

+470
-160
lines changed

Diff for: ‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.ci.openshift.org/openshift/release:golang-1.19 AS builder
1+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS builder
22
WORKDIR /go/src/github.com/openshift/machine-api-provider-aws
33
COPY . .
44
# VERSION env gets set in the openshift/release image and refers to the golang version, which interfers with our own

Diff for: ‎Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
16-
ENVTEST_K8S_VERSION = 1.31.0
16+
ENVTEST_K8S_VERSION = 1.32.0
1717

1818
PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
1919
ENVTEST = go run ${PROJECT_DIR}/vendor/sigs.k8s.io/controller-runtime/tools/setup-envtest
@@ -39,7 +39,7 @@ REPO_PATH ?= github.com/openshift/machine-api-provider-aws
3939
LD_FLAGS ?= -X $(REPO_PATH)/pkg/version.Raw=$(VERSION) -extldflags "-static"
4040
MUTABLE_TAG ?= latest
4141
IMAGE = origin-aws-machine-controllers
42-
BUILD_IMAGE ?= registry.ci.openshift.org/openshift/release:golang-1.21
42+
BUILD_IMAGE ?= registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
4343

4444
# race tests need CGO_ENABLED, everything else should have it disabled
4545
CGO_ENABLED = 0

Diff for: ‎go.mod

+48-52
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,27 @@
11
module github.com/openshift/machine-api-provider-aws
22

3-
go 1.22.0
4-
5-
toolchain go1.22.4
3+
go 1.23.0
64

75
require (
8-
github.com/aws/aws-sdk-go v1.50.0
6+
github.com/aws/aws-sdk-go v1.55.6
97
github.com/blang/semver v3.5.1+incompatible
108
github.com/go-logr/logr v1.4.2
119
github.com/golang/mock v1.6.0
12-
github.com/onsi/ginkgo/v2 v2.19.0
13-
github.com/onsi/gomega v1.33.1
14-
github.com/openshift/api v0.0.0-20240919193929-2669d1ebc910
15-
github.com/openshift/library-go v0.0.0-20240919205913-c96b82b3762b
16-
github.com/openshift/machine-api-operator v0.2.1-0.20240924110326-1efafa4a6615
17-
k8s.io/api v0.31.1
18-
k8s.io/apimachinery v0.31.1
19-
k8s.io/apiserver v0.31.1
20-
k8s.io/client-go v0.31.1
21-
k8s.io/component-base v0.31.1
10+
github.com/onsi/ginkgo/v2 v2.22.2
11+
github.com/onsi/gomega v1.36.2
12+
github.com/openshift/api v0.0.0-20250130171037-7bb8a0201a56
13+
github.com/openshift/library-go v0.0.0-20250129210218-fe56c2cf5d70
14+
github.com/openshift/machine-api-operator v0.2.1-0.20250203164435-b657d8bf9389
15+
k8s.io/api v0.32.1
16+
k8s.io/apimachinery v0.32.1
17+
k8s.io/apiserver v0.32.1
18+
k8s.io/client-go v0.32.1
19+
k8s.io/component-base v0.32.1
2220
k8s.io/klog/v2 v2.130.1
23-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
24-
sigs.k8s.io/controller-runtime v0.19.0
25-
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20240522175850-2e9781e9fc60
26-
sigs.k8s.io/controller-tools v0.14.0
21+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
22+
sigs.k8s.io/controller-runtime v0.20.1
23+
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20240923090159-236e448db12c
24+
sigs.k8s.io/controller-tools v0.17.1
2725
)
2826

2927
require (
@@ -34,88 +32,86 @@ require (
3432
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3533
github.com/chai2010/gettext-go v1.0.2 // indirect
3634
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
37-
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
38-
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
35+
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
3936
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
4037
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
41-
github.com/fatih/color v1.17.0 // indirect
42-
github.com/fsnotify/fsnotify v1.7.0 // indirect
38+
github.com/fatih/color v1.18.0 // indirect
39+
github.com/fsnotify/fsnotify v1.8.0 // indirect
4340
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
4441
github.com/go-errors/errors v1.5.1 // indirect
4542
github.com/go-logr/zapr v1.3.0 // indirect
4643
github.com/go-openapi/jsonpointer v0.21.0 // indirect
4744
github.com/go-openapi/jsonreference v0.21.0 // indirect
4845
github.com/go-openapi/swag v0.23.0 // indirect
4946
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
50-
github.com/gobuffalo/flect v1.0.2 // indirect
47+
github.com/gobuffalo/flect v1.0.3 // indirect
5148
github.com/gogo/protobuf v1.3.2 // indirect
52-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5349
github.com/golang/protobuf v1.5.4 // indirect
54-
github.com/google/btree v1.1.2 // indirect
50+
github.com/google/btree v1.1.3 // indirect
5551
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
5652
github.com/google/go-cmp v0.6.0 // indirect
5753
github.com/google/gofuzz v1.2.0 // indirect
58-
github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af // indirect
54+
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
5955
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
6056
github.com/google/uuid v1.6.0 // indirect
6157
github.com/gorilla/websocket v1.5.0 // indirect
6258
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
63-
github.com/imdario/mergo v0.3.15 // indirect
6459
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6560
github.com/jmespath/go-jmespath v0.4.0 // indirect
6661
github.com/josharian/intern v1.0.0 // indirect
6762
github.com/json-iterator/go v1.1.12 // indirect
63+
github.com/klauspost/compress v1.17.9 // indirect
6864
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
6965
github.com/mailru/easyjson v0.7.7 // indirect
7066
github.com/mattn/go-colorable v0.1.13 // indirect
7167
github.com/mattn/go-isatty v0.0.20 // indirect
7268
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
73-
github.com/moby/spdystream v0.4.0 // indirect
69+
github.com/moby/spdystream v0.5.0 // indirect
7470
github.com/moby/term v0.5.0 // indirect
7571
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7672
github.com/modern-go/reflect2 v1.0.2 // indirect
7773
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
7874
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7975
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
80-
github.com/openshift/client-go v0.0.0-20240918182115-6a8ead8397fd // indirect
76+
github.com/openshift/client-go v0.0.0-20250125113824-8e1f0b8fa9a7 // indirect
8177
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
8278
github.com/pkg/errors v0.9.1 // indirect
83-
github.com/prometheus/client_golang v1.19.1 // indirect
79+
github.com/prometheus/client_golang v1.20.5 // indirect
8480
github.com/prometheus/client_model v0.6.1 // indirect
8581
github.com/prometheus/common v0.55.0 // indirect
8682
github.com/prometheus/procfs v0.15.1 // indirect
8783
github.com/russross/blackfriday/v2 v2.1.0 // indirect
8884
github.com/spf13/afero v1.11.0 // indirect
8985
github.com/spf13/cobra v1.8.1 // indirect
90-
github.com/spf13/pflag v1.0.5 // indirect
86+
github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace // indirect
9187
github.com/x448/float16 v0.8.4 // indirect
9288
github.com/xlab/treeprint v1.2.0 // indirect
93-
go.starlark.net v0.0.0-20231016134836-22325403fcb3 // indirect
89+
go.opentelemetry.io/otel v1.29.0 // indirect
90+
go.opentelemetry.io/otel/trace v1.29.0 // indirect
9491
go.uber.org/multierr v1.11.0 // indirect
95-
go.uber.org/zap v1.26.0 // indirect
96-
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect
97-
golang.org/x/mod v0.17.0 // indirect
98-
golang.org/x/net v0.26.0 // indirect
99-
golang.org/x/oauth2 v0.21.0 // indirect
100-
golang.org/x/sync v0.7.0 // indirect
101-
golang.org/x/sys v0.21.0 // indirect
102-
golang.org/x/term v0.21.0 // indirect
103-
golang.org/x/text v0.16.0 // indirect
104-
golang.org/x/time v0.5.0 // indirect
105-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
92+
go.uber.org/zap v1.27.0 // indirect
93+
golang.org/x/mod v0.22.0 // indirect
94+
golang.org/x/net v0.34.0 // indirect
95+
golang.org/x/oauth2 v0.24.0 // indirect
96+
golang.org/x/sync v0.10.0 // indirect
97+
golang.org/x/sys v0.29.0 // indirect
98+
golang.org/x/term v0.28.0 // indirect
99+
golang.org/x/text v0.21.0 // indirect
100+
golang.org/x/time v0.9.0 // indirect
101+
golang.org/x/tools v0.29.0 // indirect
106102
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
107-
google.golang.org/protobuf v1.34.2 // indirect
103+
google.golang.org/protobuf v1.36.1 // indirect
108104
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
109105
gopkg.in/inf.v0 v0.9.1 // indirect
110106
gopkg.in/yaml.v2 v2.4.0 // indirect
111107
gopkg.in/yaml.v3 v3.0.1 // indirect
112-
k8s.io/apiextensions-apiserver v0.31.1 // indirect
113-
k8s.io/cli-runtime v0.31.1 // indirect
114-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
115-
k8s.io/kubectl v0.31.1 // indirect
116-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
117-
sigs.k8s.io/kustomize/api v0.17.2 // indirect
118-
sigs.k8s.io/kustomize/kyaml v0.17.1 // indirect
119-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
108+
k8s.io/apiextensions-apiserver v0.32.1 // indirect
109+
k8s.io/cli-runtime v0.32.1 // indirect
110+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
111+
k8s.io/kubectl v0.32.1 // indirect
112+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
113+
sigs.k8s.io/kustomize/api v0.18.0 // indirect
114+
sigs.k8s.io/kustomize/kyaml v0.18.1 // indirect
115+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
120116
sigs.k8s.io/yaml v1.4.0 // indirect
121117
)

0 commit comments

Comments
 (0)