Skip to content

Commit b657d8b

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1325 from damdo/bump-k8s-1.32
OCPCLOUD-2830: Update dependencies to K8s 1.32
2 parents b397e88 + c3391c1 commit b657d8b

File tree

2,898 files changed

+119078
-83283
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,898 files changed

+119078
-83283
lines changed

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.ci.openshift.org/openshift/release:golang-1.22 AS builder
1+
FROM registry.ci.openshift.org/openshift/release:golang-1.23 AS builder
22
WORKDIR /go/src/github.com/openshift/machine-api-operator
33
COPY . .
44
RUN NO_DOCKER=1 make build

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ DBG ?= 0
33
VERSION ?= $(shell git describe --always --abbrev=7)
44
MUTABLE_TAG ?= latest
55
IMAGE = $(REGISTRY)machine-api-operator
6-
BUILD_IMAGE ?= registry.ci.openshift.org/openshift/release:golang-1.22
6+
BUILD_IMAGE ?= registry.ci.openshift.org/openshift/release:golang-1.23
77
GOLANGCI_LINT = go run ./vendor/github.com/golangci/golangci-lint/cmd/golangci-lint
8-
ENVTEST_K8S_VERSION = 1.31.1
8+
ENVTEST_K8S_VERSION = 1.32.1
99

1010
# Enable go modules and vendoring
1111
# https://github.com/golang/go/wiki/Modules#how-to-install-and-activate-module-support

‎go.mod

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

‎go.sum

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

‎vendor/github.com/4meepo/tagalign/.gitignore

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

‎vendor/github.com/4meepo/tagalign/.goreleaser.yml

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

‎vendor/github.com/4meepo/tagalign/options.go

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

‎vendor/github.com/4meepo/tagalign/tagalign.go

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

0 commit comments

Comments
 (0)