Skip to content

Commit e5e2da5

Browse files
authored
fix: Upgrades Kubernetes libraries to 1.32 (#664)
This upgrades the Kubernetes API library to 1.32. This also updates the Controller Runtime library, including some superficial code changes to make the operator compatible with breaking changes in the Controller Runtime.
1 parent b321992 commit e5e2da5

File tree

12 files changed

+215
-196
lines changed

12 files changed

+215
-196
lines changed

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
- name: Setup Go
4848
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
4949
with:
50-
go-version: "1.23"
50+
go-version: "1.24"
5151
if: ${{ matrix.language == 'go' }}
5252

5353
# Initializes the CodeQL tools for scanning.

.github/workflows/tests-main.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
- name: Setup Go
4141
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
4242
with:
43-
go-version: "1.23"
43+
go-version: "1.24"
4444
- name: Set up build.env with phony secrets.
4545
run: cp build.sample.env build.env
4646
- name: make test
@@ -90,7 +90,7 @@ jobs:
9090
- name: "Setup Go"
9191
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
9292
with:
93-
go-version: "1.23"
93+
go-version: "1.24"
9494
- name: Set up QEMU
9595
uses: docker/setup-qemu-action@2b82ce82d56a2a04d2637cd93a637ae1b359c0a7 # v2.2.0
9696
- name: Set up Docker Buildx

.github/workflows/tests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Setup Go
2929
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
3030
with:
31-
go-version: "1.23"
31+
go-version: "1.24"
3232
- name: Checkout code
3333
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
3434
with:
@@ -69,7 +69,7 @@ jobs:
6969
- name: Setup Go
7070
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
7171
with:
72-
go-version: "1.23"
72+
go-version: "1.24"
7373
- name: Set up QEMU
7474
uses: docker/setup-qemu-action@2b82ce82d56a2a04d2637cd93a637ae1b359c0a7 # v2.2.0
7575
- name: Set up Docker Buildx

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -438,15 +438,15 @@ CRD_REF_DOCS ?= $(LOCALBIN)/crd-ref-docs
438438
# Important note: avoid adding spaces in the macro declarations as any
439439
# additional whitespace will break the renovate regex rules.
440440

441-
KUBECTL_VERSION=v1.29.3# renovate datasource=github-tags depName=kubernetes/kubernetes
441+
KUBECTL_VERSION=v1.32.2# renovate datasource=github-tags depName=kubernetes/kubernetes
442442
TERRAFORM_VERSION=v1.8.5# renovate datasource=github-tags depName=hashicorp/terraform
443443

444-
CONTROLLER_TOOLS_VERSION=v0.14.0# renovate datasource=go depName=sigs.k8s.io/controller-tools
445-
CRD_REF_DOCS_VERSION=v0.0.12# renovate datasource=go depName=github.com/elastic/crd-ref-docs
446-
GOLANGCI_LINT_VERSION=v1.59.1# renovate datasource=go depName=github.com/golangci/golangci-lint/cmd/golangci-lint
444+
CONTROLLER_TOOLS_VERSION=v0.17.3# renovate datasource=go depName=sigs.k8s.io/controller-tools
445+
CRD_REF_DOCS_VERSION=v0.1.0# renovate datasource=go depName=github.com/elastic/crd-ref-docs
446+
GOLANGCI_LINT_VERSION=v1.64.6# renovate datasource=go depName=github.com/golangci/golangci-lint/cmd/golangci-lint
447447
GO_LICENSES_VERSION=v1.6.0# renovate datasource=go depName=github.com/google/go-licenses
448448

449-
KUSTOMIZE_VERSION=v4.5.2# don't manage with renovate, this repo has non-standard tags
449+
KUSTOMIZE_VERSION=v5.6.0# don't manage with renovate, this repo has non-standard tags
450450

451451
GOOS?=$(shell go env GOOS | tr -d '\n')
452452
GOARCH?=$(shell go env GOARCH | tr -d '\n')

go.mod

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,69 @@
11
module github.com/GoogleCloudPlatform/cloud-sql-proxy-operator
22

3-
go 1.23.0
3+
go 1.24
44

55
require (
6-
github.com/go-logr/logr v1.4.1
6+
github.com/go-logr/logr v1.4.2
77
go.uber.org/zap v1.27.0
8-
k8s.io/api v0.29.3
9-
k8s.io/apimachinery v0.29.3
10-
k8s.io/client-go v0.29.3
11-
sigs.k8s.io/controller-runtime v0.17.2
8+
k8s.io/api v0.32.3
9+
k8s.io/apimachinery v0.32.3
10+
k8s.io/client-go v0.32.3
11+
sigs.k8s.io/controller-runtime v0.20.4
1212
sigs.k8s.io/yaml v1.4.0
1313
)
1414

1515
require (
1616
github.com/beorn7/perks v1.0.1 // indirect
17-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
18-
github.com/davecgh/go-spew v1.1.1 // indirect
19-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
17+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
18+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
19+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
2020
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
21-
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
22-
github.com/fsnotify/fsnotify v1.7.0 // indirect
21+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
22+
github.com/fsnotify/fsnotify v1.9.0 // indirect
23+
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
2324
github.com/go-logr/zapr v1.3.0 // indirect
24-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
25-
github.com/go-openapi/jsonreference v0.20.2 // indirect
26-
github.com/go-openapi/swag v0.22.3 // indirect
25+
github.com/go-openapi/jsonpointer v0.21.1 // indirect
26+
github.com/go-openapi/jsonreference v0.21.0 // indirect
27+
github.com/go-openapi/swag v0.23.1 // indirect
2728
github.com/gogo/protobuf v1.3.2 // indirect
28-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
2929
github.com/golang/protobuf v1.5.4 // indirect
30-
github.com/google/gnostic-models v0.6.8 // indirect
31-
github.com/google/go-cmp v0.6.0 // indirect
30+
github.com/google/btree v1.1.3 // indirect
31+
github.com/google/gnostic-models v0.6.9 // indirect
32+
github.com/google/go-cmp v0.7.0 // indirect
3233
github.com/google/gofuzz v1.2.0 // indirect
33-
github.com/google/uuid v1.3.0 // indirect
34-
github.com/imdario/mergo v0.3.12 // indirect
34+
github.com/google/uuid v1.6.0 // indirect
3535
github.com/josharian/intern v1.0.0 // indirect
3636
github.com/json-iterator/go v1.1.12 // indirect
37-
github.com/mailru/easyjson v0.7.7 // indirect
38-
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
37+
github.com/mailru/easyjson v0.9.0 // indirect
3938
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4039
github.com/modern-go/reflect2 v1.0.2 // indirect
4140
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4241
github.com/pkg/errors v0.9.1 // indirect
43-
github.com/prometheus/client_golang v1.18.0 // indirect
44-
github.com/prometheus/client_model v0.5.0 // indirect
45-
github.com/prometheus/common v0.45.0 // indirect
46-
github.com/prometheus/procfs v0.12.0 // indirect
47-
github.com/spf13/pflag v1.0.5 // indirect
42+
github.com/prometheus/client_golang v1.22.0 // indirect
43+
github.com/prometheus/client_model v0.6.2 // indirect
44+
github.com/prometheus/common v0.63.0 // indirect
45+
github.com/prometheus/procfs v0.16.1 // indirect
46+
github.com/spf13/pflag v1.0.6 // indirect
47+
github.com/x448/float16 v0.8.4 // indirect
4848
go.uber.org/multierr v1.11.0 // indirect
49-
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
50-
golang.org/x/net v0.23.0 // indirect
51-
golang.org/x/oauth2 v0.12.0 // indirect
52-
golang.org/x/sys v0.18.0 // indirect
53-
golang.org/x/term v0.18.0 // indirect
54-
golang.org/x/text v0.14.0 // indirect
55-
golang.org/x/time v0.3.0 // indirect
56-
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
57-
google.golang.org/appengine v1.6.7 // indirect
58-
google.golang.org/protobuf v1.33.0 // indirect
49+
golang.org/x/net v0.39.0 // indirect
50+
golang.org/x/oauth2 v0.29.0 // indirect
51+
golang.org/x/sync v0.13.0 // indirect
52+
golang.org/x/sys v0.32.0 // indirect
53+
golang.org/x/term v0.31.0 // indirect
54+
golang.org/x/text v0.24.0 // indirect
55+
golang.org/x/time v0.11.0 // indirect
56+
golang.org/x/tools v0.32.0 // indirect
57+
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
58+
google.golang.org/protobuf v1.36.6 // indirect
59+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
5960
gopkg.in/inf.v0 v0.9.1 // indirect
60-
gopkg.in/yaml.v2 v2.4.0 // indirect
6161
gopkg.in/yaml.v3 v3.0.1 // indirect
62-
k8s.io/apiextensions-apiserver v0.29.0 // indirect
63-
k8s.io/component-base v0.29.0 // indirect
64-
k8s.io/klog/v2 v2.110.1 // indirect
65-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
66-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
67-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
68-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
62+
k8s.io/apiextensions-apiserver v0.32.3 // indirect
63+
k8s.io/klog/v2 v2.130.1 // indirect
64+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
65+
k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e // indirect
66+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
67+
sigs.k8s.io/randfill v1.0.0 // indirect
68+
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
6969
)

0 commit comments

Comments
 (0)