Remove min/maxAllowed (#1070)

* Remove min/maxAllowed * Rm resourcePolicy condition * Rm resourcePolicy from values.yaml
gardener · Oct 15, 2024 · 3218917 · 3218917
1 parent d16180e
commit 3218917
Show file tree

Hide file tree

Showing 17 changed files with 15 additions and 142 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...l/seed-controlplane/charts/csi-driver-controller/templates/csi-driver-controller-vpa.yaml b/...l/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/...seed-controlplane/charts/csi-driver-controller/templates/csi-snapshot-controller-vpa.yaml b/...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/...trolplane/charts/csi-driver-controller/templates/csi-snapshot-validation-webhook-vpa.yaml b/...trolplane/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
@@ -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
@@ -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
@@ -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: {}