Skip to content

Commit fb142fa

Browse files
renormalizerenormalize
authored
Upgrade k8s.io/* and direct dependencies. (#1213)
* Upgrade to `k8s.io/<module>@v0.34.2`. * Upgrade to `k8s.io/utils@v0.0.0-20251002143259-bc988d571ff4`. * Upgrade to `github.com/prometheus/client_golang@v1.23.2`. * Upgrade to `github.com/spf13/pflag@v1.0.10`. * Upgrade to `golang.org/x/exp@v0.0.0-20251023183803-a4bb9ffd2546`. * Upgrade to `go.uber.org/mock@v0.6.0`. * Upgrade to `github.com/onsi/ginkgo/v2@v2.27.1`. * Upgrade to `github.com/onsi/gomega@v1.38.2`. Signed-off-by: Saketh Kalaga <saketh.kalaga@sap.com>
1 parent 9e12be0 commit fb142fa

11 files changed

Lines changed: 403 additions & 269 deletions

‎api/core/v1alpha1/crds/druid.gardener.cloud_etcdcopybackupstasks.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.5
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
name: etcdcopybackupstasks.druid.gardener.cloud
88
spec:
99
group: druid.gardener.cloud

‎api/core/v1alpha1/crds/druid.gardener.cloud_etcds.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.5
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
name: etcds.druid.gardener.cloud
88
spec:
99
group: druid.gardener.cloud
@@ -174,7 +174,7 @@ spec:
174174
Claims lists the names of resources, defined in spec.resourceClaims,
175175
that are used by this container.
176176
177-
This is an alpha field and requires enabling the
177+
This field depends on the
178178
DynamicResourceAllocation feature gate.
179179
180180
This field is immutable. It can only be set for containers.
@@ -244,7 +244,7 @@ spec:
244244
Claims lists the names of resources, defined in spec.resourceClaims,
245245
that are used by this container.
246246
247-
This is an alpha field and requires enabling the
247+
This field depends on the
248248
DynamicResourceAllocation feature gate.
249249
250250
This field is immutable. It can only be set for containers.
@@ -592,7 +592,7 @@ spec:
592592
Claims lists the names of resources, defined in spec.resourceClaims,
593593
that are used by this container.
594594
595-
This is an alpha field and requires enabling the
595+
This field depends on the
596596
DynamicResourceAllocation feature gate.
597597
598598
This field is immutable. It can only be set for containers.
@@ -1256,8 +1256,8 @@ spec:
12561256
most preferred is the one with the greatest sum of weights, i.e.
12571257
for each node that meets all of the scheduling requirements (resource
12581258
request, requiredDuringScheduling anti-affinity expressions, etc.),
1259-
compute a sum by iterating through the elements of this field and adding
1260-
"weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the
1259+
compute a sum by iterating through the elements of this field and subtracting
1260+
"weight" from the sum if the node has pods which matches the corresponding podAffinityTerm; the
12611261
node(s) with the highest sum are the most preferred.
12621262
items:
12631263
description: The weights of all of the matched WeightedPodAffinityTerm

‎api/core/v1alpha1/crds/druid.gardener.cloud_etcds_without_cel.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.5
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
name: etcds.druid.gardener.cloud
88
spec:
99
group: druid.gardener.cloud
@@ -160,7 +160,7 @@ spec:
160160
Claims lists the names of resources, defined in spec.resourceClaims,
161161
that are used by this container.
162162
163-
This is an alpha field and requires enabling the
163+
This field depends on the
164164
DynamicResourceAllocation feature gate.
165165
166166
This field is immutable. It can only be set for containers.
@@ -228,7 +228,7 @@ spec:
228228
Claims lists the names of resources, defined in spec.resourceClaims,
229229
that are used by this container.
230230
231-
This is an alpha field and requires enabling the
231+
This field depends on the
232232
DynamicResourceAllocation feature gate.
233233
234234
This field is immutable. It can only be set for containers.
@@ -532,7 +532,7 @@ spec:
532532
Claims lists the names of resources, defined in spec.resourceClaims,
533533
that are used by this container.
534534
535-
This is an alpha field and requires enabling the
535+
This field depends on the
536536
DynamicResourceAllocation feature gate.
537537
538538
This field is immutable. It can only be set for containers.
@@ -1161,8 +1161,8 @@ spec:
11611161
most preferred is the one with the greatest sum of weights, i.e.
11621162
for each node that meets all of the scheduling requirements (resource
11631163
request, requiredDuringScheduling anti-affinity expressions, etc.),
1164-
compute a sum by iterating through the elements of this field and adding
1165-
"weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the
1164+
compute a sum by iterating through the elements of this field and subtracting
1165+
"weight" from the sum if the node has pods which matches the corresponding podAffinityTerm; the
11661166
node(s) with the highest sum are the most preferred.
11671167
items:
11681168
description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most preferred node(s)

‎api/go.mod‎

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@ module github.com/gardener/etcd-druid/api
33
go 1.24.0
44

55
require (
6-
k8s.io/api v0.33.4
7-
k8s.io/apimachinery v0.33.4
8-
k8s.io/utils v0.0.0-20241210054802-24370beab758
6+
k8s.io/api v0.34.2
7+
k8s.io/apimachinery v0.34.2
8+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
99
)
1010

1111
// Test dependencies
12-
require github.com/onsi/gomega v1.37.0
12+
require github.com/onsi/gomega v1.38.2
1313

1414
require (
15-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
15+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
1616
github.com/fatih/color v1.18.0 // indirect
17-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
18-
github.com/go-logr/logr v1.4.2 // indirect
17+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
18+
github.com/go-logr/logr v1.4.3 // indirect
1919
github.com/go-openapi/jsonpointer v0.21.0 // indirect
2020
github.com/go-openapi/jsonreference v0.20.2 // indirect
2121
github.com/go-openapi/swag v0.23.0 // indirect
2222
github.com/gobuffalo/flect v1.0.3 // indirect
2323
github.com/gogo/protobuf v1.3.2 // indirect
24-
github.com/google/gnostic-models v0.6.9 // indirect
24+
github.com/google/gnostic-models v0.7.0 // indirect
2525
github.com/google/go-cmp v0.7.0 // indirect
2626
github.com/google/uuid v1.6.0 // indirect
2727
github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -31,30 +31,34 @@ require (
3131
github.com/mattn/go-colorable v0.1.13 // indirect
3232
github.com/mattn/go-isatty v0.0.20 // indirect
3333
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
34-
github.com/modern-go/reflect2 v1.0.2 // indirect
35-
github.com/spf13/cobra v1.8.1 // indirect
36-
github.com/spf13/pflag v1.0.5 // indirect
34+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
35+
github.com/onsi/ginkgo/v2 v2.27.1 // indirect
36+
github.com/spf13/cobra v1.9.1 // indirect
37+
github.com/spf13/pflag v1.0.7 // indirect
3738
github.com/x448/float16 v0.8.4 // indirect
38-
golang.org/x/mod v0.23.0 // indirect
39-
golang.org/x/net v0.38.0 // indirect
40-
golang.org/x/sync v0.12.0 // indirect
41-
golang.org/x/sys v0.31.0 // indirect
42-
golang.org/x/text v0.23.0 // indirect
43-
golang.org/x/tools v0.30.0 // indirect
44-
google.golang.org/protobuf v1.36.5 // indirect
39+
go.yaml.in/yaml/v2 v2.4.2 // indirect
40+
go.yaml.in/yaml/v3 v3.0.4 // indirect
41+
golang.org/x/mod v0.27.0 // indirect
42+
golang.org/x/net v0.43.0 // indirect
43+
golang.org/x/sync v0.16.0 // indirect
44+
golang.org/x/sys v0.35.0 // indirect
45+
golang.org/x/text v0.28.0 // indirect
46+
golang.org/x/tools v0.36.0 // indirect
47+
google.golang.org/protobuf v1.36.7 // indirect
4548
gopkg.in/inf.v0 v0.9.1 // indirect
4649
gopkg.in/yaml.v2 v2.4.0 // indirect
4750
gopkg.in/yaml.v3 v3.0.1 // indirect
48-
k8s.io/apiextensions-apiserver v0.32.0 // indirect
49-
k8s.io/code-generator v0.33.4 // indirect
50-
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7 // indirect
51+
k8s.io/apiextensions-apiserver v0.34.0 // indirect
52+
k8s.io/client-go v0.34.2 // indirect
53+
k8s.io/code-generator v0.34.2 // indirect
54+
k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f // indirect
5155
k8s.io/klog/v2 v2.130.1 // indirect
52-
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
53-
sigs.k8s.io/controller-tools v0.16.5 // indirect
54-
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
56+
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
57+
sigs.k8s.io/controller-tools v0.19.0 // indirect
58+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
5559
sigs.k8s.io/randfill v1.0.0 // indirect
56-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
57-
sigs.k8s.io/yaml v1.4.0 // indirect
60+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
61+
sigs.k8s.io/yaml v1.6.0 // indirect
5862
)
5963

6064
tool (

0 commit comments

Comments
 (0)