diff --git a/charts/gardener-extension-admission-aws/charts/runtime/templates/vpa.yaml b/charts/gardener-extension-admission-aws/charts/runtime/templates/vpa.yaml index b4012a539..0e54b7588 100644 --- a/charts/gardener-extension-admission-aws/charts/runtime/templates/vpa.yaml +++ b/charts/gardener-extension-admission-aws/charts/runtime/templates/vpa.yaml @@ -5,13 +5,10 @@ metadata: name: {{ include "name" . }}-vpa namespace: {{ .Release.Namespace }} spec: - {{- if .Values.global.vpa.resourcePolicy }} resourcePolicy: containerPolicies: - containerName: '*' - minAllowed: - memory: {{ required ".Values.global.vpa.resourcePolicy.minAllowed.memory is required" .Values.global.vpa.resourcePolicy.minAllowed.memory }} - {{- end }} + controlledValues: RequestsOnly targetRef: apiVersion: apps/v1 kind: Deployment diff --git a/charts/gardener-extension-admission-aws/values.yaml b/charts/gardener-extension-admission-aws/values.yaml index 3f1e8e00e..89484fbee 100644 --- a/charts/gardener-extension-admission-aws/values.yaml +++ b/charts/gardener-extension-admission-aws/values.yaml @@ -14,9 +14,6 @@ global: healthPort: 8081 vpa: enabled: true - resourcePolicy: - minAllowed: - memory: 64Mi updatePolicy: updateMode: "Auto" webhookConfig: diff --git a/charts/gardener-extension-provider-aws/templates/vpa.yaml b/charts/gardener-extension-provider-aws/templates/vpa.yaml index 3bad87d66..0bbba76d9 100644 --- a/charts/gardener-extension-provider-aws/templates/vpa.yaml +++ b/charts/gardener-extension-provider-aws/templates/vpa.yaml @@ -5,13 +5,10 @@ metadata: name: {{ include "name" . }}-vpa namespace: {{ .Release.Namespace }} spec: - {{- if .Values.vpa.resourcePolicy }} resourcePolicy: containerPolicies: - containerName: '*' - minAllowed: - memory: {{ required ".Values.vpa.resourcePolicy.minAllowed.memory is required" .Values.vpa.resourcePolicy.minAllowed.memory }} - {{- end }} + controlledValues: RequestsOnly targetRef: apiVersion: apps/v1 kind: Deployment diff --git a/charts/gardener-extension-provider-aws/values.yaml b/charts/gardener-extension-provider-aws/values.yaml index b5666dad1..6ab6d2eff 100644 --- a/charts/gardener-extension-provider-aws/values.yaml +++ b/charts/gardener-extension-provider-aws/values.yaml @@ -14,9 +14,6 @@ maxSurge: 50% resources: {} vpa: enabled: true - resourcePolicy: - minAllowed: - memory: 64Mi updatePolicy: updateMode: "Auto" diff --git a/charts/internal/seed-controlplane/charts/aws-custom-route-controller/templates/vpa.yaml b/charts/internal/seed-controlplane/charts/aws-custom-route-controller/templates/vpa.yaml index ba09cd542..73e15c086 100644 --- a/charts/internal/seed-controlplane/charts/aws-custom-route-controller/templates/vpa.yaml +++ b/charts/internal/seed-controlplane/charts/aws-custom-route-controller/templates/vpa.yaml @@ -14,7 +14,5 @@ spec: resourcePolicy: containerPolicies: - containerName: aws-custom-route-controller - minAllowed: - memory: {{ .Values.resources.requests.memory }} controlledValues: RequestsOnly {{- end }} diff --git a/charts/internal/seed-controlplane/charts/aws-load-balancer-controller/templates/vpa.yaml b/charts/internal/seed-controlplane/charts/aws-load-balancer-controller/templates/vpa.yaml index 0338c4287..bc7ac1db6 100644 --- a/charts/internal/seed-controlplane/charts/aws-load-balancer-controller/templates/vpa.yaml +++ b/charts/internal/seed-controlplane/charts/aws-load-balancer-controller/templates/vpa.yaml @@ -14,7 +14,5 @@ spec: resourcePolicy: containerPolicies: - containerName: {{ .Chart.Name }} - minAllowed: - memory: {{ .Values.resources.requests.memory }} controlledValues: RequestsOnly {{- end }} diff --git a/charts/internal/seed-controlplane/charts/cloud-controller-manager/templates/vpa.yaml b/charts/internal/seed-controlplane/charts/cloud-controller-manager/templates/vpa.yaml index 8c13e1753..94278b412 100644 --- a/charts/internal/seed-controlplane/charts/cloud-controller-manager/templates/vpa.yaml +++ b/charts/internal/seed-controlplane/charts/cloud-controller-manager/templates/vpa.yaml @@ -13,9 +13,4 @@ spec: resourcePolicy: containerPolicies: - containerName: aws-cloud-controller-manager - minAllowed: - memory: {{ .Values.resources.requests.memory }} - maxAllowed: - cpu: {{ .Values.vpa.resourcePolicy.maxAllowed.cpu }} - memory: {{ .Values.vpa.resourcePolicy.maxAllowed.memory }} controlledValues: RequestsOnly diff --git a/charts/internal/seed-controlplane/charts/cloud-controller-manager/values.yaml b/charts/internal/seed-controlplane/charts/cloud-controller-manager/values.yaml index da7444a36..58f574803 100644 --- a/charts/internal/seed-controlplane/charts/cloud-controller-manager/values.yaml +++ b/charts/internal/seed-controlplane/charts/cloud-controller-manager/values.yaml @@ -15,10 +15,7 @@ tlsCipherSuites: [] secrets: server: cloud-controller-manager-server vpa: - resourcePolicy: - maxAllowed: - cpu: 4 - memory: 10G + resourcePolicy: {} # TODO(rfranzke): Remove this field after August 2024. gep19Monitoring: false diff --git a/charts/internal/seed-controlplane/charts/csi-driver-controller/templates/csi-driver-controller-vpa.yaml b/charts/internal/seed-controlplane/charts/csi-driver-controller/templates/csi-driver-controller-vpa.yaml index faf91e82b..b3b079c00 100644 --- a/charts/internal/seed-controlplane/charts/csi-driver-controller/templates/csi-driver-controller-vpa.yaml +++ b/charts/internal/seed-controlplane/charts/csi-driver-controller/templates/csi-driver-controller-vpa.yaml @@ -8,53 +8,18 @@ spec: resourcePolicy: containerPolicies: - containerName: aws-csi-driver - minAllowed: - memory: {{ .Values.resources.driver.requests.memory }} - maxAllowed: - cpu: {{ .Values.vpa.resourcePolicy.driver.maxAllowed.cpu }} - memory: {{ .Values.vpa.resourcePolicy.driver.maxAllowed.memory }} controlledValues: RequestsOnly - containerName: aws-csi-provisioner - minAllowed: - memory: {{ .Values.resources.provisioner.requests.memory }} - maxAllowed: - cpu: {{ .Values.vpa.resourcePolicy.provisioner.maxAllowed.cpu }} - memory: {{ .Values.vpa.resourcePolicy.provisioner.maxAllowed.memory }} controlledValues: RequestsOnly - containerName: aws-csi-attacher - minAllowed: - memory: {{ .Values.resources.attacher.requests.memory }} - maxAllowed: - cpu: {{ .Values.vpa.resourcePolicy.attacher.maxAllowed.cpu }} - memory: {{ .Values.vpa.resourcePolicy.attacher.maxAllowed.memory }} controlledValues: RequestsOnly - containerName: aws-csi-snapshotter - minAllowed: - memory: {{ .Values.resources.snapshotter.requests.memory }} - maxAllowed: - cpu: {{ .Values.vpa.resourcePolicy.snapshotter.maxAllowed.cpu }} - memory: {{ .Values.vpa.resourcePolicy.snapshotter.maxAllowed.memory }} controlledValues: RequestsOnly - containerName: aws-csi-resizer - minAllowed: - memory: {{ .Values.resources.resizer.requests.memory }} - maxAllowed: - cpu: {{ .Values.vpa.resourcePolicy.resizer.maxAllowed.cpu }} - memory: {{ .Values.vpa.resourcePolicy.resizer.maxAllowed.memory }} controlledValues: RequestsOnly - containerName: aws-csi-liveness-probe - minAllowed: - memory: {{ .Values.resources.livenessProbe.requests.memory }} - maxAllowed: - cpu: {{ .Values.vpa.resourcePolicy.livenessProbe.maxAllowed.cpu }} - memory: {{ .Values.vpa.resourcePolicy.livenessProbe.maxAllowed.memory }} controlledValues: RequestsOnly - containerName: aws-csi-volume-modifier - minAllowed: - memory: {{ .Values.resources.volumeModifier.requests.memory }} - maxAllowed: - cpu: {{ .Values.vpa.resourcePolicy.volumemodifier.maxAllowed.cpu }} - memory: {{ .Values.vpa.resourcePolicy.volumemodifier.maxAllowed.memory }} controlledValues: RequestsOnly targetRef: apiVersion: apps/v1 diff --git a/charts/internal/seed-controlplane/charts/csi-driver-controller/templates/csi-snapshot-controller-vpa.yaml b/charts/internal/seed-controlplane/charts/csi-driver-controller/templates/csi-snapshot-controller-vpa.yaml index 320fb408b..d13381c15 100644 --- a/charts/internal/seed-controlplane/charts/csi-driver-controller/templates/csi-snapshot-controller-vpa.yaml +++ b/charts/internal/seed-controlplane/charts/csi-driver-controller/templates/csi-snapshot-controller-vpa.yaml @@ -8,8 +8,6 @@ spec: resourcePolicy: containerPolicies: - containerName: aws-csi-snapshot-controller - minAllowed: - memory: {{ .Values.csiSnapshotController.resources.requests.memory }} controlledValues: RequestsOnly targetRef: apiVersion: apps/v1 diff --git a/charts/internal/seed-controlplane/charts/csi-driver-controller/templates/csi-snapshot-validation-webhook-vpa.yaml b/charts/internal/seed-controlplane/charts/csi-driver-controller/templates/csi-snapshot-validation-webhook-vpa.yaml index e2cdb374b..7a676fa7e 100644 --- a/charts/internal/seed-controlplane/charts/csi-driver-controller/templates/csi-snapshot-validation-webhook-vpa.yaml +++ b/charts/internal/seed-controlplane/charts/csi-driver-controller/templates/csi-snapshot-validation-webhook-vpa.yaml @@ -7,8 +7,6 @@ spec: resourcePolicy: containerPolicies: - containerName: aws-csi-snapshot-validation - minAllowed: - memory: {{ .Values.csiSnapshotValidationWebhook.resources.requests.memory }} controlledValues: RequestsOnly targetRef: apiVersion: apps/v1 diff --git a/charts/internal/seed-controlplane/charts/csi-driver-controller/values.yaml b/charts/internal/seed-controlplane/charts/csi-driver-controller/values.yaml index 18d29c8ce..7a492e387 100644 --- a/charts/internal/seed-controlplane/charts/csi-driver-controller/values.yaml +++ b/charts/internal/seed-controlplane/charts/csi-driver-controller/values.yaml @@ -46,34 +46,13 @@ resources: memory: 50Mi vpa: resourcePolicy: - driver: - maxAllowed: - cpu: 800m - memory: 4G - provisioner: - maxAllowed: - cpu: 800m - memory: 4G - attacher: - maxAllowed: - cpu: 500m - memory: 4G - snapshotter: - maxAllowed: - cpu: 700m - memory: 3G - resizer: - maxAllowed: - cpu: 700m - memory: 3G - livenessProbe: - maxAllowed: - cpu: 500m - memory: 2G - volumemodifier: - maxAllowed: - cpu: 500m - memory: 2G + driver: {} + provisioner: {} + attacher: {} + snapshotter: {} + resizer: {} + livenessProbe: {} + volumemodifier: {} csiSnapshotController: replicas: 1 diff --git a/charts/internal/shoot-system-components/charts/csi-driver-node/templates/vpa.yaml b/charts/internal/shoot-system-components/charts/csi-driver-node/templates/vpa.yaml index f4bb96d7a..f03c811cc 100644 --- a/charts/internal/shoot-system-components/charts/csi-driver-node/templates/vpa.yaml +++ b/charts/internal/shoot-system-components/charts/csi-driver-node/templates/vpa.yaml @@ -8,25 +8,10 @@ spec: resourcePolicy: containerPolicies: - containerName: csi-driver - minAllowed: - memory: {{ .Values.resources.driver.requests.memory }} - maxAllowed: - cpu: {{ .Values.vpa.resourcePolicy.driver.maxAllowed.cpu }} - memory: {{ .Values.vpa.resourcePolicy.driver.maxAllowed.memory }} controlledValues: RequestsOnly - containerName: csi-node-driver-registrar - minAllowed: - memory: {{ .Values.resources.nodeDriverRegistrar.requests.memory }} - maxAllowed: - cpu: {{ .Values.vpa.resourcePolicy.nodeDriverRegistrar.maxAllowed.cpu }} - memory: {{ .Values.vpa.resourcePolicy.nodeDriverRegistrar.maxAllowed.memory }} controlledValues: RequestsOnly - containerName: csi-liveness-probe - minAllowed: - memory: {{ .Values.resources.livenessProbe.requests.memory }} - maxAllowed: - cpu: {{ .Values.vpa.resourcePolicy.livenessProbe.maxAllowed.cpu }} - memory: {{ .Values.vpa.resourcePolicy.livenessProbe.maxAllowed.memory }} controlledValues: RequestsOnly targetRef: apiVersion: apps/v1 diff --git a/charts/internal/shoot-system-components/charts/csi-driver-node/values.yaml b/charts/internal/shoot-system-components/charts/csi-driver-node/values.yaml index 0c3347ca6..5289fcff5 100644 --- a/charts/internal/shoot-system-components/charts/csi-driver-node/values.yaml +++ b/charts/internal/shoot-system-components/charts/csi-driver-node/values.yaml @@ -32,15 +32,6 @@ resources: vpa: resourcePolicy: - driver: - maxAllowed: - cpu: 2 - memory: 4G - nodeDriverRegistrar: - maxAllowed: - cpu: 1 - memory: 3G - livenessProbe: - maxAllowed: - cpu: 1 - memory: 3G + driver: {} + nodeDriverRegistrar: {} + livenessProbe: {} diff --git a/example/controller-registration.yaml b/example/controller-registration.yaml index 7a123fdef..936c6a452 100644 --- a/example/controller-registration.yaml +++ b/example/controller-registration.yaml @@ -4,7 +4,7 @@ kind: ControllerDeployment metadata: name: provider-aws helm: - rawChart: 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 + rawChart: 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 values: image: tag: v1.58.0-dev diff --git a/pkg/webhook/controlplane/ensurer.go b/pkg/webhook/controlplane/ensurer.go index 4d8b9dd89..ad7d9fc7e 100644 --- a/pkg/webhook/controlplane/ensurer.go +++ b/pkg/webhook/controlplane/ensurer.go @@ -25,7 +25,6 @@ import ( "github.com/go-logr/logr" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" utilruntime "k8s.io/apimachinery/pkg/util/runtime" vpaautoscalingv1 "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/apis/autoscaling.k8s.io/v1" @@ -91,23 +90,13 @@ func (e *ensurer) EnsureMachineControllerManagerDeployment(_ context.Context, _ // EnsureMachineControllerManagerVPA ensures that the machine-controller-manager VPA conforms to the provider requirements. func (e *ensurer) EnsureMachineControllerManagerVPA(_ context.Context, _ gcontext.GardenContext, newObj, _ *vpaautoscalingv1.VerticalPodAutoscaler) error { - var ( - minAllowed = corev1.ResourceList{ - corev1.ResourceMemory: resource.MustParse("64Mi"), - } - maxAllowed = corev1.ResourceList{ - corev1.ResourceCPU: resource.MustParse("2"), - corev1.ResourceMemory: resource.MustParse("5G"), - } - ) - if newObj.Spec.ResourcePolicy == nil { newObj.Spec.ResourcePolicy = &vpaautoscalingv1.PodResourcePolicy{} } newObj.Spec.ResourcePolicy.ContainerPolicies = extensionswebhook.EnsureVPAContainerResourcePolicyWithName( newObj.Spec.ResourcePolicy.ContainerPolicies, - machinecontrollermanager.ProviderSidecarVPAContainerPolicy(aws.Name, minAllowed, maxAllowed), + machinecontrollermanager.ProviderSidecarVPAContainerPolicy(aws.Name, nil, nil), ) return nil } diff --git a/pkg/webhook/controlplane/ensurer_test.go b/pkg/webhook/controlplane/ensurer_test.go index f023dc979..6ef10c5df 100644 --- a/pkg/webhook/controlplane/ensurer_test.go +++ b/pkg/webhook/controlplane/ensurer_test.go @@ -28,7 +28,6 @@ import ( "go.uber.org/mock/gomock" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" vpaautoscalingv1 "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/apis/autoscaling.k8s.io/v1" @@ -828,13 +827,6 @@ done Expect(vpa.Spec.ResourcePolicy.ContainerPolicies).To(ConsistOf(vpaautoscalingv1.ContainerResourcePolicy{ ContainerName: "machine-controller-manager-provider-aws", ControlledValues: &ccv, - MinAllowed: corev1.ResourceList{ - corev1.ResourceMemory: resource.MustParse("64Mi"), - }, - MaxAllowed: corev1.ResourceList{ - corev1.ResourceCPU: resource.MustParse("2"), - corev1.ResourceMemory: resource.MustParse("5G"), - }, })) }) })