Skip to content

Commit 86af17b

Browse files
authored
[GEP-33] Adoption of Capabilities Cloudprofile-API Change (#1480)
* api-change: replace CapabilitySets with CapabilityFlavors in cloud profile and related structures * api-change: replace CapabilitySets with CapabilityFlavors in cloud profile and related structures * refactor: dont use external constants in tests * refactor: adopt improvements from gardener/gardener provider local * feat: add capability based image selection to bastion options * feat: implement CloudProfile mutator to add capability flavors from provider config * test: add unit test for merging extended machineImages with capability flavors * test: enhance cloudprofile mutator unit test by using matchers * Bump github.com/gardener/gardener from 1.127.1 to 1.128.2 * fix: correct typo in MachineImageFlavor description * adopt upstream changes for machineDeployment priority from int to *int * fix: reorder parameters in validateRegions function * test: add validation for empty regions in cloud profile machine images
1 parent acbb40f commit 86af17b

30 files changed

+1070
-955
lines changed

example/20-crd-extensions.gardener.cloud_workers.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,6 @@ spec:
725725
- maximum
726726
- minimum
727727
- name
728-
- priority
729728
- userDataSecretRef
730729
type: object
731730
type: array
@@ -908,7 +907,6 @@ spec:
908907
- maximum
909908
- minimum
910909
- name
911-
- priority
912910
type: object
913911
type: array
914912
machineDeploymentsLastUpdateTime:

go.mod

Lines changed: 41 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ require (
2020
github.com/aws/aws-sdk-go-v2/service/sts v1.34.1
2121
github.com/aws/smithy-go v1.22.5
2222
github.com/coreos/go-systemd/v22 v22.6.0
23-
github.com/gardener/etcd-druid/api v0.31.0
23+
github.com/gardener/etcd-druid/api v0.32.0
2424
github.com/gardener/external-dns-management v0.27.0
25-
github.com/gardener/gardener v1.127.1
25+
github.com/gardener/gardener v1.128.2
2626
github.com/gardener/machine-controller-manager v0.60.0
2727
github.com/go-logr/logr v1.4.3
2828
github.com/google/go-cmp v0.7.0
@@ -33,17 +33,17 @@ require (
3333
github.com/spf13/pflag v1.0.10
3434
go.uber.org/atomic v1.11.0
3535
go.uber.org/mock v0.6.0
36-
golang.org/x/time v0.12.0
37-
golang.org/x/tools v0.36.0
36+
golang.org/x/time v0.13.0
37+
golang.org/x/tools v0.37.0
3838
gopkg.in/inf.v0 v0.9.1
39-
k8s.io/api v0.33.4
40-
k8s.io/apiextensions-apiserver v0.33.4
41-
k8s.io/apimachinery v0.33.4
39+
k8s.io/api v0.33.5
40+
k8s.io/apiextensions-apiserver v0.33.5
41+
k8s.io/apimachinery v0.33.5
4242
k8s.io/autoscaler/vertical-pod-autoscaler v1.4.2
43-
k8s.io/client-go v0.33.4
44-
k8s.io/code-generator v0.33.4
45-
k8s.io/component-base v0.33.4
46-
k8s.io/kubelet v0.33.4
43+
k8s.io/client-go v0.33.5
44+
k8s.io/code-generator v0.33.5
45+
k8s.io/component-base v0.33.5
46+
k8s.io/kubelet v0.33.5
4747
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d
4848
sigs.k8s.io/controller-runtime v0.21.0
4949
sigs.k8s.io/controller-tools v0.18.0
@@ -85,8 +85,8 @@ require (
8585
github.com/fluent/fluent-operator/v3 v3.3.0 // indirect
8686
github.com/fsnotify/fsnotify v1.9.0 // indirect
8787
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
88-
github.com/gardener/cert-management v0.17.8 // indirect
89-
github.com/go-jose/go-jose/v4 v4.1.0 // indirect
88+
github.com/gardener/cert-management v0.18.0 // indirect
89+
github.com/go-jose/go-jose/v4 v4.1.1 // indirect
9090
github.com/go-logr/stdr v1.2.2 // indirect
9191
github.com/go-logr/zapr v1.3.0 // indirect
9292
github.com/go-openapi/errors v0.22.0 // indirect
@@ -136,26 +136,26 @@ require (
136136
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
137137
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
138138
github.com/nexucis/lamenv v0.5.2 // indirect
139-
github.com/open-telemetry/opentelemetry-operator v0.131.0 // indirect
139+
github.com/open-telemetry/opentelemetry-operator v0.132.0 // indirect
140140
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
141141
github.com/perses/common v0.27.1-0.20250326140707-96e439b14e0e // indirect
142142
github.com/perses/perses v0.51.0 // indirect
143143
github.com/perses/perses-operator v0.2.0 // indirect
144144
github.com/pkg/errors v0.9.1 // indirect
145145
github.com/prometheus/client_golang v1.23.0 // indirect
146146
github.com/prometheus/client_model v0.6.2 // indirect
147-
github.com/prometheus/common v0.65.0 // indirect
147+
github.com/prometheus/common v0.66.1 // indirect
148148
github.com/prometheus/otlptranslator v0.0.0-20250717125610-8549f4ab4f8f // indirect
149149
github.com/prometheus/procfs v0.17.0 // indirect
150150
github.com/russross/blackfriday/v2 v2.1.0 // indirect
151-
github.com/sagikazarmark/locafero v0.7.0 // indirect
151+
github.com/sagikazarmark/locafero v0.11.0 // indirect
152152
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
153153
github.com/shopspring/decimal v1.4.0 // indirect
154154
github.com/sirupsen/logrus v1.9.3 // indirect
155-
github.com/sourcegraph/conc v0.3.0 // indirect
156-
github.com/spf13/afero v1.14.0 // indirect
157-
github.com/spf13/cast v1.7.1 // indirect
158-
github.com/spf13/viper v1.20.1 // indirect
155+
github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect
156+
github.com/spf13/afero v1.15.0 // indirect
157+
github.com/spf13/cast v1.10.0 // indirect
158+
github.com/spf13/viper v1.21.0 // indirect
159159
github.com/stoewer/go-strcase v1.3.0 // indirect
160160
github.com/subosito/gotenv v1.6.0 // indirect
161161
github.com/valyala/bytebufferpool v1.0.0 // indirect
@@ -164,7 +164,7 @@ require (
164164
github.com/zitadel/oidc/v3 v3.38.1 // indirect
165165
github.com/zitadel/schema v1.3.1 // indirect
166166
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
167-
go.opentelemetry.io/collector/featuregate v1.36.0 // indirect
167+
go.opentelemetry.io/collector/featuregate v1.37.0 // indirect
168168
go.opentelemetry.io/contrib/otelconf v0.17.0 // indirect
169169
go.opentelemetry.io/otel v1.37.0 // indirect
170170
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.13.0 // indirect
@@ -189,37 +189,39 @@ require (
189189
go.uber.org/multierr v1.11.0 // indirect
190190
go.uber.org/zap v1.27.0 // indirect
191191
go.yaml.in/yaml/v2 v2.4.2 // indirect
192-
go.yaml.in/yaml/v3 v3.0.3 // indirect
193-
golang.org/x/crypto v0.41.0 // indirect
194-
golang.org/x/exp v0.0.0-20250819193227-8b4c13bb791b // indirect
195-
golang.org/x/mod v0.27.0 // indirect
196-
golang.org/x/net v0.43.0 // indirect
192+
go.yaml.in/yaml/v3 v3.0.4 // indirect
193+
go.yaml.in/yaml/v4 v4.0.0-rc.2 // indirect
194+
golang.org/x/crypto v0.42.0 // indirect
195+
golang.org/x/exp v0.0.0-20250911091902-df9299821621 // indirect
196+
golang.org/x/mod v0.28.0 // indirect
197+
golang.org/x/net v0.44.0 // indirect
197198
golang.org/x/oauth2 v0.30.0 // indirect
198-
golang.org/x/sync v0.16.0 // indirect
199-
golang.org/x/sys v0.35.0 // indirect
200-
golang.org/x/term v0.34.0 // indirect
201-
golang.org/x/text v0.28.0 // indirect
199+
golang.org/x/sync v0.17.0 // indirect
200+
golang.org/x/sys v0.36.0 // indirect
201+
golang.org/x/telemetry v0.0.0-20250908211612-aef8a434d053 // indirect
202+
golang.org/x/term v0.35.0 // indirect
203+
golang.org/x/text v0.29.0 // indirect
202204
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
203-
google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect
204-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
205+
google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
206+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
205207
google.golang.org/grpc v1.73.0 // indirect
206-
google.golang.org/protobuf v1.36.6 // indirect
208+
google.golang.org/protobuf v1.36.8 // indirect
207209
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
208210
gopkg.in/yaml.v2 v2.4.0 // indirect
209211
gopkg.in/yaml.v3 v3.0.1 // indirect
210212
helm.sh/helm/v3 v3.18.6 // indirect
211-
istio.io/api v1.25.4 // indirect
213+
istio.io/api v1.25.5 // indirect
212214
istio.io/client-go v1.25.1 // indirect
213-
k8s.io/apiserver v0.33.4 // indirect
214-
k8s.io/cluster-bootstrap v0.33.4 // indirect
215-
k8s.io/component-helpers v0.33.4 // indirect
215+
k8s.io/apiserver v0.33.5 // indirect
216+
k8s.io/cluster-bootstrap v0.33.5 // indirect
217+
k8s.io/component-helpers v0.33.5 // indirect
216218
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect
217219
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7 // indirect
218220
k8s.io/klog v1.0.0 // indirect
219221
k8s.io/klog/v2 v2.130.1 // indirect
220-
k8s.io/kube-aggregator v0.33.4 // indirect
222+
k8s.io/kube-aggregator v0.33.5 // indirect
221223
k8s.io/kube-openapi v0.0.0-20250701173324-9bd5c66d9911 // indirect
222-
k8s.io/metrics v0.33.4 // indirect
224+
k8s.io/metrics v0.33.5 // indirect
223225
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
224226
sigs.k8s.io/randfill v1.0.0 // indirect
225227
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect

0 commit comments

Comments
 (0)