Drop support for Shoots with Kubernetes version <= 1.26 (#393)

* Adapt PDBs to use unhealthyPodEvictionPolicy: AlwaysAllow unconditionally * Adapt service.kubernetes.io/topology-mode annotation * Update version in service.json * Run make generate
gardener · Feb 25, 2025 · 50d5e55 · 50d5e55
1 parent 77c543f
commit 50d5e55
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 18 deletions.
diff --git a/...r-extension-admission-shoot-dns-service/charts/runtime/templates/poddisruptionbudget.yaml b/...r-extension-admission-shoot-dns-service/charts/runtime/templates/poddisruptionbudget.yaml
@@ -10,6 +10,4 @@ spec:
   selector:
     matchLabels:
 {{ include "labels" . | indent 6 }}
-{{- if semverCompare ">= 1.26-0" .Capabilities.KubeVersion.GitVersion }}
-  unhealthyPodEvictionPolicy: AlwaysAllow
-{{- end }}
+  unhealthyPodEvictionPolicy: AlwaysAllow
diff --git a/charts/gardener-extension-admission-shoot-dns-service/charts/runtime/templates/service.yaml b/charts/gardener-extension-admission-shoot-dns-service/charts/runtime/templates/service.yaml
@@ -6,11 +6,7 @@ metadata:
   annotations:
     networking.resources.gardener.cloud/from-all-webhook-targets-allowed-ports: '[{"protocol":"TCP","port":{{ .Values.webhookConfig.serverPort }}}]'
     {{- if .Values.service.topologyAwareRouting.enabled }}
-    {{- if semverCompare ">= 1.27-0" .Capabilities.KubeVersion.GitVersion }}
     service.kubernetes.io/topology-mode: "auto"
-    {{- else }}
-    service.kubernetes.io/topology-aware-hints: "auto"
-    {{- end }}
     {{- end }}
   labels:
 {{ include "labels" . | indent 4 }}

diff --git a/charts/gardener-extension-shoot-dns-service/templates/dnsman-poddisruptionbudget.yaml b/charts/gardener-extension-shoot-dns-service/templates/dnsman-poddisruptionbudget.yaml
@@ -13,6 +13,4 @@ spec:
     matchLabels:
 {{ include "dnsmanLabels" . | indent 6 }}
 {{- end }}
-{{- if semverCompare ">= 1.26-0" .Capabilities.KubeVersion.GitVersion }}
-  unhealthyPodEvictionPolicy: AlwaysAllow
-{{- end }}
+  unhealthyPodEvictionPolicy: AlwaysAllow
diff --git a/charts/gardener-extension-shoot-dns-service/templates/poddisruptionbudget.yaml b/charts/gardener-extension-shoot-dns-service/templates/poddisruptionbudget.yaml
@@ -10,6 +10,4 @@ spec:
   selector:
     matchLabels:
 {{ include "labels" . | indent 6 }}
-{{- if semverCompare ">= 1.26-0" .Capabilities.KubeVersion.GitVersion }}
-  unhealthyPodEvictionPolicy: AlwaysAllow
-{{- end }}
+  unhealthyPodEvictionPolicy: AlwaysAllow
diff --git a/charts/internal/shoot-dns-service-seed/templates/poddisruptionbudget.yaml b/charts/internal/shoot-dns-service-seed/templates/poddisruptionbudget.yaml
@@ -12,6 +12,4 @@ spec:
     matchLabels:
       app: {{ template "service.name" . }}
       release: {{ .Release.Name }}
-{{- if semverCompare ">= 1.26-0" .Capabilities.KubeVersion.GitVersion }}
-  unhealthyPodEvictionPolicy: AlwaysAllow
-{{- end }}
+  unhealthyPodEvictionPolicy: AlwaysAllow
diff --git a/example/controller-registration.yaml b/example/controller-registration.yaml
diff --git a/hack/api-reference/service.json b/hack/api-reference/service.json
@@ -9,7 +9,7 @@
     "externalPackages": [
         {
             "typeMatchPrefix": "^k8s\\.io/(api|apimachinery/pkg/apis)/",
-            "docsURLTemplate": "https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.25/#{{lower .TypeIdentifier}}-{{arrIndex .PackageSegments -1}}-{{arrIndex .PackageSegments -2}}"
+            "docsURLTemplate": "https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#{{lower .TypeIdentifier}}-{{arrIndex .PackageSegments -1}}-{{arrIndex .PackageSegments -2}}"
         },
         {
             "typeMatchPrefix": "github.com/gardener/gardener/extensions/pkg/apis/config",