Skip to content

Commit c660d6f

Browse files
tobschlikon-angelo
andauthored
Add support for Kubernetes 1.34 (#1591)
* Bump `gardener/gardener` to `v1.133.0` * Align Renaming to `gardener/gardener` * Bump images for Kubernetes `1.34` * Update `README.md` * [make generate] * [make tidy] * Switch to moved helper functions Co-authored-by: Konstantinos Angelopoulos <konstantinos.angelopoulos@sap.com> * Remove unneeded function This was changed with gardener/gardener#13329 Co-authored-by: Konstantinos Angelopoulos <konstantinos.angelopoulos@sap.com> * Remove k8s version dependent check We do not support 1.29 clusters anymore. This means we also don't need the version check, as well as the cluster info here anymore. Renaming was suggested by Konstantinos <3 Co-authored-by: Konstantinos Angelopoulos <konstantinos.angelopoulos@sap.com> * Remove test that checked for the, now removed, k8s version check Co-authored-by: Konstantinos Angelopoulos <konstantinos.angelopoulos@sap.com> * Drop support for Kubernetes 1.29 --------- Co-authored-by: Konstantinos Angelopoulos <konstantinos.angelopoulos@sap.com>
1 parent 71a24a5 commit c660d6f

35 files changed

Lines changed: 269 additions & 288 deletions

.github/ISSUE_TEMPLATE/bug.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ about: Report a bug encountered while working with this Gardener extension
44

55
---
66

7+
<!-- Please ensure that you do not include company internal information. -->
8+
79
**How to categorize this issue?**
810
<!--
911
Please select area, kind, and priority for this issue. This helps the community categorizing it.

.github/ISSUE_TEMPLATE/feature.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ about: Suggest an enhancement for this extension
44

55
---
66

7+
<!-- Please ensure that you do not include company internal information. -->
8+
79
**How to categorize this issue?**
810
<!--
911
Please select area, kind, and priority for this issue. This helps the community categorizing it.

.github/ISSUE_TEMPLATE/flaking-test.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ title: "[Flaky Test] FLAKING TEST/SUITE"
55

66
---
77

8+
<!-- Please ensure that you do not include company internal information. -->
9+
810
<!-- Please only use this template for submitting reports about flaky tests or jobs (pass or fail with no underlying change in code) in Gardener CI -->
911

1012
**How to categorize this issue?**

.github/pull_request_template.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
<!-- Please ensure that you do not include company internal information. -->
2+
13
**How to categorize this PR?**
24
<!--
35
Please select area, kind, and priority for this pull request. This helps the community categorizing it.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ This extension controller supports the following Kubernetes versions:
2323

2424
| Version | Support | Conformance test results |
2525
|-----------------|---------|--------------------------|
26+
| Kubernetes 1.34 | 1.34.0+ | N/A |
2627
| Kubernetes 1.33 | 1.33.0+ | [![Gardener v1.33 Conformance Tests](https://testgrid.k8s.io/q/summary/conformance-gardener/Gardener,%20v1.33%20AWS/tests_status?style=svg)](https://testgrid.k8s.io/conformance-gardener#Gardener,%20v1.33%20AWS) |
2728
| Kubernetes 1.32 | 1.32.0+ | [![Gardener v1.32 Conformance Tests](https://testgrid.k8s.io/q/summary/conformance-gardener/Gardener,%20v1.32%20AWS/tests_status?style=svg)](https://testgrid.k8s.io/conformance-gardener#Gardener,%20v1.32%20AWS) |
2829
| Kubernetes 1.31 | 1.31.0+ | [![Gardener v1.31 Conformance Tests](https://testgrid.k8s.io/q/summary/conformance-gardener/Gardener,%20v1.31%20AWS/tests_status?style=svg)](https://testgrid.k8s.io/conformance-gardener#Gardener,%20v1.31%20AWS) |
2930
| Kubernetes 1.30 | 1.30.0+ | [![Gardener v1.30 Conformance Tests](https://testgrid.k8s.io/q/summary/conformance-gardener/Gardener,%20v1.30%20AWS/tests_status?style=svg)](https://testgrid.k8s.io/conformance-gardener#Gardener,%20v1.30%20AWS) |
30-
| Kubernetes 1.29 | 1.29.0+ | [![Gardener v1.29 Conformance Tests](https://testgrid.k8s.io/q/summary/conformance-gardener/Gardener,%20v1.29%20AWS/tests_status?style=svg)](https://testgrid.k8s.io/conformance-gardener#Gardener,%20v1.29%20AWS) |
3131

3232
Please take a look [here](https://github.com/gardener/gardener/blob/master/docs/usage/shoot-operations/supported_k8s_versions.md) to see which versions are supported by Gardener in general.
3333

charts/gardener-extension-provider-aws/templates/deployment.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ spec:
8282
- --metrics-bind-address=:{{ tpl .Values.metricsPort . }}
8383
- --health-bind-address=:{{ tpl .Values.healthPort . }}
8484
- --gardener-version={{ .Values.gardener.version }}
85-
{{- if .Values.gardener.autonomousShootCluster }}
86-
- --autonomous-shoot-cluster={{ .Values.gardener.autonomousShootCluster }}
85+
{{- if .Values.gardener.selfHostedShootCluster }}
86+
- --self-hosted-shoot-cluster={{ .Values.gardener.selfHostedShootCluster }}
8787
{{- end }}
8888
env:
8989
- name: LEADER_ELECTION_NAMESPACE

charts/gardener-extension-provider-aws/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ gardener:
100100
# runtimeCluster:
101101
# enabled: true
102102
# priorityClassName: gardener-garden-system-200
103-
# autonomousShootCluster: false
103+
# selfHostedShootCluster: false
104104

105105
usablePorts:
106106
- 8080 # metrics

cmd/gardener-extension-provider-aws/app/app.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,9 +244,9 @@ func NewControllerManagerCommand(ctx context.Context) *cobra.Command {
244244
reconcileOpts.Completed().Apply(&awsdnsrecord.DefaultAddOptions.IgnoreOperationAnnotation, &awsdnsrecord.DefaultAddOptions.ExtensionClass)
245245
workerCtrlOpts.Completed().Apply(&awsworker.DefaultAddOptions.Controller)
246246
awsworker.DefaultAddOptions.GardenCluster = gardenCluster
247-
awsworker.DefaultAddOptions.AutonomousShootCluster = generalOpts.Completed().AutonomousShootCluster
247+
awsworker.DefaultAddOptions.SelfHostedShootCluster = generalOpts.Completed().SelfHostedShootCluster
248248

249-
atomicShootWebhookConfig, err := webhookOptions.Completed().AddToManager(ctx, mgr, nil, generalOpts.Completed().AutonomousShootCluster)
249+
atomicShootWebhookConfig, err := webhookOptions.Completed().AddToManager(ctx, mgr, nil, generalOpts.Completed().SelfHostedShootCluster)
250250
if err != nil {
251251
return fmt.Errorf("could not add webhooks to manager: %w", err)
252252
}

example/20-crd-extensions.gardener.cloud_backupbuckets.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.18.0
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
name: backupbuckets.extensions.gardener.cloud
88
spec:
99
group: extensions.gardener.cloud

example/20-crd-extensions.gardener.cloud_backupentries.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.18.0
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
name: backupentries.extensions.gardener.cloud
88
spec:
99
group: extensions.gardener.cloud

0 commit comments

Comments
 (0)