diff --git a/charts/internal/shoot-system-components/charts/csi-driver-manila/templates/vpa-node.yaml b/charts/internal/shoot-system-components/charts/csi-driver-manila/templates/vpa-node.yaml deleted file mode 100644 index 10d1ecccc..000000000 --- a/charts/internal/shoot-system-components/charts/csi-driver-manila/templates/vpa-node.yaml +++ /dev/null @@ -1,24 +0,0 @@ -{{- if .Values.vpaEnabled }} -apiVersion: "autoscaling.k8s.io/v1" -kind: VerticalPodAutoscaler -metadata: - name: csi-driver-manila-node - namespace: {{ .Release.Namespace }} -spec: - resourcePolicy: - containerPolicies: - - containerName: driver-manila-nfs-node - controlledValues: RequestsOnly - - containerName: driver-nfs-nfs-node - controlledValues: RequestsOnly - - containerName: nfs-registrar - controlledValues: RequestsOnly - - containerName: nfs-liveness-probe - controlledValues: RequestsOnly - targetRef: - apiVersion: apps/v1 - kind: DaemonSet - name: csi-driver-manila-node - updatePolicy: - updateMode: "Auto" -{{- end }} \ No newline at end of file diff --git a/charts/internal/shoot-system-components/charts/csi-driver-manila/values.yaml b/charts/internal/shoot-system-components/charts/csi-driver-manila/values.yaml index 7627b6a0f..ecb332665 100644 --- a/charts/internal/shoot-system-components/charts/csi-driver-manila/values.yaml +++ b/charts/internal/shoot-system-components/charts/csi-driver-manila/values.yaml @@ -4,7 +4,6 @@ images: csi-node-driver-registrar: image-repository:image-tag csi-liveness-probe: image-repository:image-tag -vpaEnabled: false dnsPolicy: ClusterFirstWithHostNet # available values: Default, ClusterFirstWithHostNet, ClusterFirst timeout: 3m @@ -41,12 +40,6 @@ resources: cpu: 11m memory: 32Mi -vpa: - resourcePolicy: - livenessProbe: {} - driverNode: {} - nodeDriverRegistrar: {} - # Enabled Manila share protocols nfs: fsGroupPolicy: None diff --git a/pkg/controller/controlplane/valuesprovider.go b/pkg/controller/controlplane/valuesprovider.go index 9e19b13a3..5a35596bd 100644 --- a/pkg/controller/controlplane/valuesprovider.go +++ b/pkg/controller/controlplane/valuesprovider.go @@ -262,7 +262,6 @@ var ( {Type: &corev1.ServiceAccount{}, Name: openstack.CSIManilaNodeName}, {Type: &rbacv1.ClusterRole{}, Name: openstack.UsernamePrefix + openstack.CSIManilaNodeName}, {Type: &rbacv1.ClusterRoleBinding{}, Name: openstack.UsernamePrefix + openstack.CSIManilaNodeName}, - {Type: extensionscontroller.GetVerticalPodAutoscalerObject(), Name: openstack.CSIManilaNodeName}, }, }, }, @@ -941,8 +940,6 @@ func (vp *valuesProvider) getControlPlaneShootChartCSIManilaValues( } if csiManilaEnabled { - values["vpaEnabled"] = gardencorev1beta1helper.ShootWantsVerticalPodAutoscaler(cluster.Shoot) - if err := vp.addCSIManilaValues(values, cp, cluster, credentials); err != nil { return nil, err } diff --git a/pkg/controller/controlplane/valuesprovider_test.go b/pkg/controller/controlplane/valuesprovider_test.go index 9c51e5423..57cd1f137 100644 --- a/pkg/controller/controlplane/valuesprovider_test.go +++ b/pkg/controller/controlplane/valuesprovider_test.go @@ -175,9 +175,6 @@ var _ = Describe("ValuesProvider", func() { }, Kubernetes: gardencorev1beta1.Kubernetes{ Version: "1.28.4", - VerticalPodAutoscaler: &gardencorev1beta1.VerticalPodAutoscaler{ - Enabled: true, - }, }, Provider: gardencorev1beta1.Provider{ InfrastructureConfig: &runtime.RawExtension{ @@ -800,7 +797,6 @@ var _ = Describe("ValuesProvider", func() { "tlsInsecure": "", "caCert": "", }, - "vpaEnabled": true, }), })) })