Skip to content

Commit 0d66079

Browse files
⚠️ Upgrade controller-runtime (v0.20.4 to v0.21.0) and k8s version ( 1.32 => 1.33 ) (#4813)
Upgrade controller-runtime (v0.20.4 to v0.21.0) and k8s version ( 1.32 => 1.33 )
1 parent 8f28571 commit 0d66079

File tree

49 files changed

+551
-485
lines changed

Some content is hidden

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

49 files changed

+551
-485
lines changed

build/.goreleaser.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ builds:
4646
- darwin_amd64
4747
- darwin_arm64
4848
env:
49-
- KUBERNETES_VERSION=1.32.1
49+
- KUBERNETES_VERSION=1.33.0
5050
- CGO_ENABLED=0
5151

5252
# Only binaries of the form "kubebuilder_${goos}_${goarch}" will be released.

cmd/version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const unknown = "unknown"
2727
// information in the release process
2828
var (
2929
kubeBuilderVersion = unknown
30-
kubernetesVendorVersion = "1.32.1"
30+
kubernetesVendorVersion = "1.33.0"
3131
goos = unknown
3232
goarch = unknown
3333
gitCommit = "$Format:%H$" // sha1 from git, output of $(git rev-parse HEAD)

docs/book/src/cronjob-tutorial/testdata/project/cmd/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ func main() {
155155

156156
// Metrics endpoint is enabled in 'config/default/kustomization.yaml'. The Metrics options configure the server.
157157
// More info:
158-
// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.20.4/pkg/metrics/server
158+
// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.21.0/pkg/metrics/server
159159
// - https://book.kubebuilder.io/reference/metrics.html
160160
metricsServerOptions := metricsserver.Options{
161161
BindAddress: metricsAddr,
@@ -167,7 +167,7 @@ func main() {
167167
// FilterProvider is used to protect the metrics endpoint with authn/authz.
168168
// These configurations ensure that only authorized users and service accounts
169169
// can access the metrics endpoint. The RBAC are configured in 'config/rbac/kustomization.yaml'. More info:
170-
// https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.20.4/pkg/metrics/filters#WithAuthenticationAndAuthorization
170+
// https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.21.0/pkg/metrics/filters#WithAuthenticationAndAuthorization
171171
metricsServerOptions.FilterProvider = filters.WithAuthenticationAndAuthorization
172172
}
173173

docs/book/src/cronjob-tutorial/testdata/project/config/crd/bases/batch.tutorial.kubebuilder.io_cronjobs.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -840,6 +840,8 @@ spec:
840840
- port
841841
type: object
842842
type: object
843+
stopSignal:
844+
type: string
843845
type: object
844846
livenessProbe:
845847
properties:
@@ -1550,6 +1552,8 @@ spec:
15501552
- port
15511553
type: object
15521554
type: object
1555+
stopSignal:
1556+
type: string
15531557
type: object
15541558
livenessProbe:
15551559
properties:
@@ -2274,6 +2278,8 @@ spec:
22742278
- port
22752279
type: object
22762280
type: object
2281+
stopSignal:
2282+
type: string
22772283
type: object
22782284
livenessProbe:
22792285
properties:

docs/book/src/cronjob-tutorial/testdata/project/dist/chart/templates/crd/batch.tutorial.kubebuilder.io_cronjobs.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -846,6 +846,8 @@ spec:
846846
- port
847847
type: object
848848
type: object
849+
stopSignal:
850+
type: string
849851
type: object
850852
livenessProbe:
851853
properties:
@@ -1556,6 +1558,8 @@ spec:
15561558
- port
15571559
type: object
15581560
type: object
1561+
stopSignal:
1562+
type: string
15591563
type: object
15601564
livenessProbe:
15611565
properties:
@@ -2280,6 +2284,8 @@ spec:
22802284
- port
22812285
type: object
22822286
type: object
2287+
stopSignal:
2288+
type: string
22832289
type: object
22842290
livenessProbe:
22852291
properties:

docs/book/src/cronjob-tutorial/testdata/project/dist/install.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -848,6 +848,8 @@ spec:
848848
- port
849849
type: object
850850
type: object
851+
stopSignal:
852+
type: string
851853
type: object
852854
livenessProbe:
853855
properties:
@@ -1558,6 +1560,8 @@ spec:
15581560
- port
15591561
type: object
15601562
type: object
1563+
stopSignal:
1564+
type: string
15611565
type: object
15621566
livenessProbe:
15631567
properties:
@@ -2282,6 +2286,8 @@ spec:
22822286
- port
22832287
type: object
22842288
type: object
2289+
stopSignal:
2290+
type: string
22852291
type: object
22862292
livenessProbe:
22872293
properties:

docs/book/src/cronjob-tutorial/testdata/project/go.mod

Lines changed: 39 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,20 @@ require (
66
github.com/onsi/ginkgo/v2 v2.22.0
77
github.com/onsi/gomega v1.36.1
88
github.com/robfig/cron v1.2.0
9-
k8s.io/api v0.32.1
10-
k8s.io/apimachinery v0.32.1
11-
k8s.io/client-go v0.32.1
12-
sigs.k8s.io/controller-runtime v0.20.4
9+
k8s.io/api v0.33.0
10+
k8s.io/apimachinery v0.33.0
11+
k8s.io/client-go v0.33.0
12+
sigs.k8s.io/controller-runtime v0.21.0
1313
)
1414

1515
require (
16-
cel.dev/expr v0.18.0 // indirect
16+
cel.dev/expr v0.19.1 // indirect
1717
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
18-
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
1918
github.com/beorn7/perks v1.0.1 // indirect
2019
github.com/blang/semver/v4 v4.0.0 // indirect
2120
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
2221
github.com/cespare/xxhash/v2 v2.3.0 // indirect
23-
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
22+
github.com/davecgh/go-spew v1.1.1 // indirect
2423
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
2524
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
2625
github.com/felixge/httpsnoop v1.0.4 // indirect
@@ -34,15 +33,13 @@ require (
3433
github.com/go-openapi/swag v0.23.0 // indirect
3534
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
3635
github.com/gogo/protobuf v1.3.2 // indirect
37-
github.com/golang/protobuf v1.5.4 // indirect
3836
github.com/google/btree v1.1.3 // indirect
39-
github.com/google/cel-go v0.22.0 // indirect
40-
github.com/google/gnostic-models v0.6.8 // indirect
41-
github.com/google/go-cmp v0.6.0 // indirect
42-
github.com/google/gofuzz v1.2.0 // indirect
37+
github.com/google/cel-go v0.23.2 // indirect
38+
github.com/google/gnostic-models v0.6.9 // indirect
39+
github.com/google/go-cmp v0.7.0 // indirect
4340
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
4441
github.com/google/uuid v1.6.0 // indirect
45-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
42+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
4643
github.com/inconshreveable/mousetrap v1.1.0 // indirect
4744
github.com/josharian/intern v1.0.0 // indirect
4845
github.com/json-iterator/go v1.1.12 // indirect
@@ -51,49 +48,51 @@ require (
5148
github.com/modern-go/reflect2 v1.0.2 // indirect
5249
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5350
github.com/pkg/errors v0.9.1 // indirect
54-
github.com/prometheus/client_golang v1.19.1 // indirect
51+
github.com/prometheus/client_golang v1.22.0 // indirect
5552
github.com/prometheus/client_model v0.6.1 // indirect
56-
github.com/prometheus/common v0.55.0 // indirect
53+
github.com/prometheus/common v0.62.0 // indirect
5754
github.com/prometheus/procfs v0.15.1 // indirect
5855
github.com/spf13/cobra v1.8.1 // indirect
5956
github.com/spf13/pflag v1.0.5 // indirect
6057
github.com/stoewer/go-strcase v1.3.0 // indirect
6158
github.com/x448/float16 v0.8.4 // indirect
62-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
63-
go.opentelemetry.io/otel v1.28.0 // indirect
64-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
65-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
66-
go.opentelemetry.io/otel/metric v1.28.0 // indirect
67-
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
68-
go.opentelemetry.io/otel/trace v1.28.0 // indirect
69-
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
59+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
60+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
61+
go.opentelemetry.io/otel v1.33.0 // indirect
62+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
63+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
64+
go.opentelemetry.io/otel/metric v1.33.0 // indirect
65+
go.opentelemetry.io/otel/sdk v1.33.0 // indirect
66+
go.opentelemetry.io/otel/trace v1.33.0 // indirect
67+
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
7068
go.uber.org/multierr v1.11.0 // indirect
7169
go.uber.org/zap v1.27.0 // indirect
7270
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
73-
golang.org/x/net v0.30.0 // indirect
74-
golang.org/x/oauth2 v0.23.0 // indirect
75-
golang.org/x/sync v0.8.0 // indirect
76-
golang.org/x/sys v0.26.0 // indirect
77-
golang.org/x/term v0.25.0 // indirect
78-
golang.org/x/text v0.19.0 // indirect
79-
golang.org/x/time v0.7.0 // indirect
71+
golang.org/x/net v0.38.0 // indirect
72+
golang.org/x/oauth2 v0.27.0 // indirect
73+
golang.org/x/sync v0.12.0 // indirect
74+
golang.org/x/sys v0.31.0 // indirect
75+
golang.org/x/term v0.30.0 // indirect
76+
golang.org/x/text v0.23.0 // indirect
77+
golang.org/x/time v0.9.0 // indirect
8078
golang.org/x/tools v0.26.0 // indirect
8179
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
82-
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect
83-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
84-
google.golang.org/grpc v1.65.0 // indirect
85-
google.golang.org/protobuf v1.35.1 // indirect
80+
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
81+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
82+
google.golang.org/grpc v1.68.1 // indirect
83+
google.golang.org/protobuf v1.36.5 // indirect
8684
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
8785
gopkg.in/inf.v0 v0.9.1 // indirect
8886
gopkg.in/yaml.v3 v3.0.1 // indirect
89-
k8s.io/apiextensions-apiserver v0.32.1 // indirect
90-
k8s.io/apiserver v0.32.1 // indirect
91-
k8s.io/component-base v0.32.1 // indirect
87+
k8s.io/apiextensions-apiserver v0.33.0 // indirect
88+
k8s.io/apiserver v0.33.0 // indirect
89+
k8s.io/component-base v0.33.0 // indirect
9290
k8s.io/klog/v2 v2.130.1 // indirect
93-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
91+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
9492
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
95-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
93+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
9694
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
97-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
95+
sigs.k8s.io/randfill v1.0.0 // indirect
96+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
9897
sigs.k8s.io/yaml v1.4.0 // indirect
9998
)

0 commit comments

Comments
 (0)