Support for Kubernetes v1.25 (#232)

* Add Kubernetes 1.25 support to README.md

* Handle PodDisruptionBudget policy/v1

* Don't deploy PSPs if it's disabled in the shoot

* Run `make generate`

* Update cloud-controller-manager image

README.md

@@ -23,6 +23,7 @@ This extension controller supports the following Kubernetes versions:
 
 | Version         | Support     | Conformance test results |
 | --------------- | ----------- | ------------------------ |
+| Kubernetes 1.25 | untested    | N/A                      |
 | Kubernetes 1.24 | untested    | N/A                      |
 | Kubernetes 1.23 | untested    | N/A                      |
 | Kubernetes 1.22 | untested    | N/A                      |

charts/gardener-extension-provider-equinix-metal/templates/poddisruptionbudget.yaml

@@ -1,5 +1,9 @@
 {{- if gt (int .Values.replicaCount) 1 }}
+{{- if semverCompare ">= 1.21-0" .Capabilities.KubeVersion.GitVersion }}
+apiVersion: policy/v1
+{{- else }}
 apiVersion: policy/v1beta1
+{{- end }}
 kind: PodDisruptionBudget
 metadata:
   name: {{ include "name" . }}

charts/images.yaml

@@ -6,7 +6,7 @@ images:
 - name: cloud-controller-manager
   sourceRepository: github.com/equinix/cloud-provider-equinix-metal
   repository: docker.io/equinix/cloud-provider-equinix-metal
-  tag: v3.3.0
+  tag: v3.5.0
 - name: machine-controller-manager
   sourceRepository: github.com/gardener/machine-controller-manager
   repository: eu.gcr.io/gardener-project/gardener/machine-controller-manager

charts/internal/shoot-system-components/charts/metallb/templates/metallb.yaml

@@ -7,6 +7,7 @@ metadata:
   labels:
     app: metallb
 ---
+{{- if not .Values.pspDisabled }}
 apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
@@ -49,6 +50,8 @@ spec:
   - secret
   - emptyDir
 ---
+{{- end }}
+{{- if not .Values.pspDisabled }}
 apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
@@ -91,6 +94,7 @@ spec:
   - secret
   - emptyDir
 ---
+{{- end }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -136,6 +140,7 @@ rules:
   verbs:
   - create
   - patch
+{{- if not .Values.pspDisabled }}
 - apiGroups:
   - policy
   resourceNames:
@@ -144,6 +149,7 @@ rules:
   - podsecuritypolicies
   verbs:
   - use
+{{- end }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -169,6 +175,7 @@ rules:
   verbs:
   - create
   - patch
+{{- if not .Values.pspDisabled }}
 - apiGroups:
   - policy
   resourceNames:
@@ -177,6 +184,7 @@ rules:
   - podsecuritypolicies
   verbs:
   - use
+{{- end }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
@@ -405,6 +413,9 @@ spec:
       securityContext:
         runAsNonRoot: true
         runAsUser: 65534
+        supplementalGroups:
+        - 1
+        - 65535
       {{- if semverCompare ">= 1.19" .Capabilities.KubeVersion.GitVersion }}
         seccompProfile:
           type: RuntimeDefault

charts/internal/shoot-system-components/charts/metallb/values.yaml

@@ -1,3 +1,5 @@
 images:
   metallb-controller: image-repository:image-tag
   metallb-speaker: image-repository:image-tag
+
+pspDisabled: false

example/controller-registration.yaml

@@ -5,7 +5,7 @@ metadata:
   name: provider-equinix-metal
 type: helm
 providerConfig:
-  chart: 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
+  chart: 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
   values:
     image:
       tag: v2.5.0-dev

pkg/controller/controlplane/valuesprovider.go

@@ -25,6 +25,7 @@ import (
 	"github.com/gardener/gardener/extensions/pkg/controller/common"
 	"github.com/gardener/gardener/extensions/pkg/controller/controlplane/genericactuator"
 	v1beta1constants "github.com/gardener/gardener/pkg/apis/core/v1beta1/constants"
+	gardencorev1beta1helper "github.com/gardener/gardener/pkg/apis/core/v1beta1/helper"
 	extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1"
 	"github.com/gardener/gardener/pkg/utils/chart"
 	gutil "github.com/gardener/gardener/pkg/utils/gardener"
@@ -115,11 +116,11 @@ func (vp *valuesProvider) GetControlPlaneChartValues(
 func (vp *valuesProvider) GetControlPlaneShootChartValues(
 	_ context.Context,
 	_ *extensionsv1alpha1.ControlPlane,
-	_ *extensionscontroller.Cluster,
+	cluster *extensionscontroller.Cluster,
 	_ secretsmanager.Reader,
 	_ map[string]string,
 ) (map[string]interface{}, error) {
-	return nil, nil
+	return getControlPlaneShootChartValues(cluster)
 }
 
 // getCredentials determines the credentials from the secret referenced in the ControlPlane resource.
@@ -165,6 +166,17 @@ func getControlPlaneChartValues(
 	return values, nil
 }
 
+// getControlPlaneShootChartValues collects and returns the control plane shoot chart values.
+func getControlPlaneShootChartValues(
+	cluster *extensionscontroller.Cluster,
+) (map[string]interface{}, error) {
+	return map[string]interface{}{
+		"metallb": map[string]interface{}{
+			"pspDisabled": gardencorev1beta1helper.IsPSPDisabled(cluster.Shoot),
+		},
+	}, nil
+}
+
 func (vp *valuesProvider) decodeControlPlaneConfig(cp *extensionsv1alpha1.ControlPlane) (*api.ControlPlaneConfig, error) {
 	cpConfig := &api.ControlPlaneConfig{}
 

pkg/controller/controlplane/valuesprovider_test.go

@@ -31,6 +31,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/serializer"
+	"k8s.io/utils/pointer"
 	"sigs.k8s.io/controller-runtime/pkg/runtime/inject"
 )
 
@@ -160,12 +161,43 @@ var _ = Describe("ValuesProvider", func() {
 	})
 
 	Describe("#GetControlPlaneShootChartValues", func() {
-		It("should return nil", func() {
-			vp := NewValuesProvider()
-
-			values, err := vp.GetControlPlaneShootChartValues(context.TODO(), cp, cluster, nil, checksums)
-			Expect(err).NotTo(HaveOccurred())
-			Expect(values).To(BeNil())
+		Context("podSecurityPolicy", func() {
+			It("should return correct shoot control plane chart when PodSecurityPolicy admission plugin is not disabled in the shoot", func() {
+				cluster.Shoot.Spec.Kubernetes.KubeAPIServer = &gardencorev1beta1.KubeAPIServerConfig{
+					AdmissionPlugins: []gardencorev1beta1.AdmissionPlugin{
+						{
+							Name: "PodSecurityPolicy",
+						},
+					},
+				}
+				vp := NewValuesProvider()
+				values, err := vp.GetControlPlaneShootChartValues(context.TODO(), cp, cluster, nil, nil)
+				Expect(err).NotTo(HaveOccurred())
+				Expect(values).To(Equal(map[string]interface{}{
+					"metallb": map[string]interface{}{
+						"pspDisabled": false,
+					},
+				}))
+			})
+
+			It("should return correct shoot control plane chart when PodSecurityPolicy admission plugin is disabled in the shoot", func() {
+				cluster.Shoot.Spec.Kubernetes.KubeAPIServer = &gardencorev1beta1.KubeAPIServerConfig{
+					AdmissionPlugins: []gardencorev1beta1.AdmissionPlugin{
+						{
+							Name:     "PodSecurityPolicy",
+							Disabled: pointer.Bool(true),
+						},
+					},
+				}
+				vp := NewValuesProvider()
+				values, err := vp.GetControlPlaneShootChartValues(context.TODO(), cp, cluster, nil, nil)
+				Expect(err).NotTo(HaveOccurred())
+				Expect(values).To(Equal(map[string]interface{}{
+					"metallb": map[string]interface{}{
+						"pspDisabled": true,
+					},
+				}))
+			})
 		})
 	})
 })