Skip to content

Commit 0e9b2be

Browse files
build(deps): bump kubernetes group to 0.36.1, controller-runtime to 0.24.1, Go to 1.26.3
Brings REL_5_8 in line with the dependency baseline already running on main (PRs #4479 and #4483) so that the branch picks up: - k8s.io/* 0.35.2 -> 0.36.1 - k8s.io/apiextensions-apiserver / apiserver 0.35.0 -> 0.36.0 - k8s.io/kube-openapi refreshed to the v0.36.1 timestamp - k8s.io/klog/v2 2.130.1 -> 2.140.0 - k8s.io/utils refreshed - sigs.k8s.io/controller-runtime 0.23.1 -> 0.24.1 - sigs.k8s.io/apiserver-network-proxy/konnectivity-client 0.31.2 -> 0.34.0 - sigs.k8s.io/structured-merge-diff/v6 to a stable v6.3.2 - go directive 1.25.0 -> 1.26.3 (matches main) - golang.org/x/time 0.9.0 -> 0.14.0 - google.golang.org/protobuf 1.36.11 -> 1.36.12 pre-release This supersedes Dependabot PR #4476: that PR mixes k8s 0.36.0 with controller-runtime 0.23.3, which fails to compile because client-go v0.36 added a HasSyncedChecker method to ResourceEventHandlerRegistration that controller-runtime 0.23.x does not implement. Bumping cr to 0.24.1 is the supported combination. Required source / config backports (mirror PR #4483 on main): - config/crd/bases/postgres-operator.crunchydata.com_postgresclusters.yaml: `make generate-crd` strips the now-obsolete "ProcMountType feature flag" sentence from the procMount field description, since the gate was promoted to GA in Kubernetes 1.36. - internal/controller/postgrescluster/volumes.go: handle the new `corev1.PersistentVolumeClaimUnused` condition (KEP-4901, K8s 1.36) in the existing no-op `case` so that the `exhaustive` linter is satisfied. - internal/controller/postgrescluster/pgbackrest.go: fix a `go vet` warning that surfaced under Go 1.26 by adding a %q verb to the `EventRecorder.Eventf` call that was passing `repoName` without a matching format directive. - .golangci.yaml: add SA1019 exclusions for two new deprecations: * `managed.FieldsV1.Raw` (k8s.io/apimachinery v0.36 deprecated direct field access; tests still exercise the legacy field). * `scheme.Builder` (controller-runtime v0.24 deprecated; the recommended replacement requires restructuring our api packages and is left for a follow-up). `generate-rbac` is unchanged from REL_5_8 and was not regenerated here because controller-gen tries to parse `internal/postgres/...`, which transitively imports `pg_query_go` and fails to build on macOS hosts (unrelated to this bump). Co-authored-by: Cursor <cursoragent@cursor.com>
1 parent 98ab425 commit 0e9b2be

6 files changed

Lines changed: 81 additions & 68 deletions

File tree

.golangci.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,19 @@ linters:
189189
text: >-
190190
client.Apply is deprecated
191191
192+
# k8s.io/apimachinery v0.36 deprecated direct access to managed.FieldsV1.Raw
193+
# in favor of GetRawBytes/SetRawBytes. Tests still use the old field.
194+
- linters: [staticcheck]
195+
path: internal/controller/postgrescluster/apply_test\.go
196+
text: managed.FieldsV1.Raw is deprecated
197+
198+
# controller-runtime v0.24 deprecated scheme.Builder, but the recommended
199+
# alternative requires restructuring our api packages. Allow current usage
200+
# until a follow-up migrates to the new helper.
201+
- linters: [staticcheck]
202+
path: pkg/apis/postgres-operator.crunchydata.com/.*/groupversion_info\.go
203+
text: scheme.Builder is deprecated
204+
192205
# https://golangci-lint.run/usage/formatters
193206
formatters:
194207
enable:

config/crd/bases/postgres-operator.crunchydata.com_postgresclusters.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10241,7 +10241,6 @@ spec:
1024110241
procMount denotes the type of proc mount to use for the containers.
1024210242
The default value is Default which uses the container runtime defaults for
1024310243
readonly paths and masked paths.
10244-
This requires the ProcMountType feature flag to be enabled.
1024510244
Note that this field cannot be set when spec.os.name is windows.
1024610245
type: string
1024710246
readOnlyRootFilesystem:
@@ -16060,7 +16059,6 @@ spec:
1606016059
procMount denotes the type of proc mount to use for the containers.
1606116060
The default value is Default which uses the container runtime defaults for
1606216061
readonly paths and masked paths.
16063-
This requires the ProcMountType feature flag to be enabled.
1606416062
Note that this field cannot be set when spec.os.name is windows.
1606516063
type: string
1606616064
readOnlyRootFilesystem:

go.mod

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module github.com/crunchydata/postgres-operator
22

33
// If this is changing when you don't want it to, see hack/go-get.sh
4-
go 1.25.0
4+
go 1.26.3
55

66
require (
77
github.com/go-logr/logr v1.4.3
@@ -22,12 +22,12 @@ require (
2222
golang.org/x/crypto v0.51.0
2323
golang.org/x/tools v0.45.0
2424
gotest.tools/v3 v3.5.2
25-
k8s.io/api v0.35.2
26-
k8s.io/apimachinery v0.35.2
27-
k8s.io/client-go v0.35.2
28-
k8s.io/component-base v0.35.2
29-
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912
30-
sigs.k8s.io/controller-runtime v0.23.1
25+
k8s.io/api v0.36.1
26+
k8s.io/apimachinery v0.36.1
27+
k8s.io/client-go v0.36.1
28+
k8s.io/component-base v0.36.1
29+
k8s.io/kube-openapi v0.0.0-20260317180543-43fb72c5454a
30+
sigs.k8s.io/controller-runtime v0.24.1
3131
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730
3232
sigs.k8s.io/yaml v1.6.0
3333
)
@@ -41,7 +41,7 @@ require (
4141
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
4242
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4343
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
44-
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
44+
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
4545
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
4646
github.com/felixge/httpsnoop v1.0.4 // indirect
4747
github.com/fsnotify/fsnotify v1.9.0 // indirect
@@ -51,7 +51,6 @@ require (
5151
github.com/go-openapi/jsonreference v0.21.0 // indirect
5252
github.com/go-openapi/swag v0.23.0 // indirect
5353
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
54-
github.com/google/btree v1.1.3 // indirect
5554
github.com/google/cel-go v0.26.0 // indirect
5655
github.com/google/gnostic-models v0.7.0 // indirect
5756
github.com/google/pprof v0.0.0-20260402051712-545e8a4df936 // indirect
@@ -62,18 +61,17 @@ require (
6261
github.com/josharian/intern v1.0.0 // indirect
6362
github.com/json-iterator/go v1.1.12 // indirect
6463
github.com/mailru/easyjson v0.7.7 // indirect
65-
github.com/moby/spdystream v0.5.0 // indirect
64+
github.com/moby/spdystream v0.5.1 // indirect
6665
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6766
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
6867
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
69-
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
7068
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
7169
github.com/prometheus/client_golang v1.23.2 // indirect
7270
github.com/prometheus/client_model v0.6.2 // indirect
7371
github.com/prometheus/common v0.67.5 // indirect
7472
github.com/prometheus/otlptranslator v1.0.0 // indirect
7573
github.com/prometheus/procfs v0.20.1 // indirect
76-
github.com/spf13/cobra v1.10.0 // indirect
74+
github.com/spf13/cobra v1.10.2 // indirect
7775
github.com/spf13/pflag v1.0.9 // indirect
7876
github.com/stoewer/go-strcase v1.3.0 // indirect
7977
github.com/x448/float16 v0.8.4 // indirect
@@ -102,28 +100,29 @@ require (
102100
go.uber.org/multierr v1.11.0 // indirect
103101
go.yaml.in/yaml/v2 v2.4.4 // indirect
104102
go.yaml.in/yaml/v3 v3.0.4 // indirect
105-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
103+
golang.org/x/exp v0.0.0-20251219203646-944ab1f22d93 // indirect
106104
golang.org/x/mod v0.36.0 // indirect
107105
golang.org/x/net v0.54.0 // indirect
108106
golang.org/x/oauth2 v0.35.0 // indirect
109107
golang.org/x/sync v0.20.0 // indirect
110108
golang.org/x/sys v0.44.0 // indirect
111109
golang.org/x/term v0.43.0 // indirect
112110
golang.org/x/text v0.37.0 // indirect
113-
golang.org/x/time v0.9.0 // indirect
111+
golang.org/x/time v0.14.0 // indirect
114112
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
115113
google.golang.org/genproto/googleapis/api v0.0.0-20260406210006-6f92a3bedf2d // indirect
116114
google.golang.org/genproto/googleapis/rpc v0.0.0-20260406210006-6f92a3bedf2d // indirect
117115
google.golang.org/grpc v1.80.0 // indirect
118-
google.golang.org/protobuf v1.36.11 // indirect
116+
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af // indirect
119117
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
120118
gopkg.in/inf.v0 v0.9.1 // indirect
121119
gopkg.in/yaml.v3 v3.0.1 // indirect
122-
k8s.io/apiextensions-apiserver v0.35.0 // indirect
123-
k8s.io/apiserver v0.35.0 // indirect
124-
k8s.io/klog/v2 v2.130.1 // indirect
125-
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
126-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
120+
k8s.io/apiextensions-apiserver v0.36.0 // indirect
121+
k8s.io/apiserver v0.36.0 // indirect
122+
k8s.io/klog/v2 v2.140.0 // indirect
123+
k8s.io/streaming v0.36.1 // indirect
124+
k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2 // indirect
125+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.34.0 // indirect
127126
sigs.k8s.io/randfill v1.0.0 // indirect
128-
sigs.k8s.io/structured-merge-diff/v6 v6.3.2-0.20260122202528-d9cc6641c482 // indirect
127+
sigs.k8s.io/structured-merge-diff/v6 v6.3.2 // indirect
129128
)

0 commit comments

Comments
 (0)