Merge pull request #8922 from monotek/updater-resources

vpa helm chart - add resources & extraArgs to updater

Author: k8s-ci-robot

vertical-pod-autoscaler/charts/vertical-pod-autoscaler/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.6.0
+version: 0.7.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

vertical-pod-autoscaler/charts/vertical-pod-autoscaler/README.md

@@ -4,13 +4,20 @@ WARNING: This chart is currently under development and is not ready for producti
 
 Automatically adjust resources for your workloads
 
-![Version: 0.6.0](https://img.shields.io/badge/Version-0.6.0-informational?style=flat-square)
+![Version: 0.7.0](https://img.shields.io/badge/Version-0.7.0-informational?style=flat-square)
 ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 ![AppVersion: 1.5.1](https://img.shields.io/badge/AppVersion-1.5.1-informational?style=flat-square)
 
 ## Introduction
 The Vertical Pod Autoscaler (VPA) automatically adjusts the CPU and memory resource requests of pods to match their actual resource utilization.
 
+## Helm Installation & upgrade
+
+```bash
+helm repo add autoscalers https://kubernetes.github.io/autoscaler
+helm upgrade -i vertical-pod-autoscaler autoscalers/vertical-pod-autoscaler
+```
+
 ## Maintainers
 
 | Name | Email | Url |
@@ -36,10 +43,7 @@ The Vertical Pod Autoscaler (VPA) automatically adjusts the CPU and memory resou
 | admissionController.podDisruptionBudget.minAvailable | int or string | `1` | Minimum number/percentage of pods that must be available after the eviction. IMPORTANT: You can specify either 'minAvailable' or 'maxUnavailable', but not both. |
 | admissionController.podLabels | object | `{}` |  |
 | admissionController.replicas | int | `2` |  |
-| admissionController.resources.limits.cpu | string | `"200m"` |  |
-| admissionController.resources.limits.memory | string | `"500Mi"` |  |
-| admissionController.resources.requests.cpu | string | `"50m"` |  |
-| admissionController.resources.requests.memory | string | `"200Mi"` |  |
+| admissionController.resources | object | `{}` |  |
 | admissionController.service.annotations | object | `{}` |  |
 | admissionController.service.name | string | `"vpa-webhook"` |  |
 | admissionController.service.ports[0].port | int | `443` |  |
@@ -88,15 +92,13 @@ The Vertical Pod Autoscaler (VPA) automatically adjusts the CPU and memory resou
 | recommender.podDisruptionBudget.minAvailable | int or string | `1` | Minimum number/percentage of pods that must be available after the eviction. IMPORTANT: You can specify either 'minAvailable' or 'maxUnavailable', but not both. |
 | recommender.podLabels | object | `{}` |  |
 | recommender.replicas | int | `2` |  |
-| recommender.resources.limits.cpu | string | `"200m"` |  |
-| recommender.resources.limits.memory | string | `"1000Mi"` |  |
-| recommender.resources.requests.cpu | string | `"50m"` |  |
-| recommender.resources.requests.memory | string | `"500Mi"` |  |
+| recommender.resources | object | `{}` |  |
 | recommender.serviceAccount.annotations | object | `{}` |  |
 | recommender.serviceAccount.create | bool | `true` |  |
 | recommender.serviceAccount.labels | object | `{}` |  |
 | recommender.tolerations | list | `[]` |  |
 | updater.enabled | bool | `true` |  |
+| updater.extraArgs | list | `[]` |  |
 | updater.image.pullPolicy | string | `"IfNotPresent"` |  |
 | updater.image.repository | string | `"registry.k8s.io/autoscaling/vpa-updater"` |  |
 | updater.image.tag | string | `nil` |  |
@@ -112,6 +114,7 @@ The Vertical Pod Autoscaler (VPA) automatically adjusts the CPU and memory resou
 | updater.podDisruptionBudget.minAvailable | int or string | `1` | Minimum number/percentage of pods that must be available after the eviction. IMPORTANT: You can specify either 'minAvailable' or 'maxUnavailable', but not both. |
 | updater.podLabels | object | `{}` |  |
 | updater.replicas | int | `2` |  |
+| updater.resources | object | `{}` |  |
 | updater.serviceAccount.annotations | object | `{}` |  |
 | updater.serviceAccount.create | bool | `true` |  |
 | updater.serviceAccount.labels | object | `{}` |  |

vertical-pod-autoscaler/charts/vertical-pod-autoscaler/README.md.gotmpl

@@ -11,6 +11,13 @@ WARNING: This chart is currently under development and is not ready for producti
 ## Introduction
 The Vertical Pod Autoscaler (VPA) automatically adjusts the CPU and memory resource requests of pods to match their actual resource utilization.
 
+## Helm Installation & upgrade
+
+```bash
+helm repo add autoscalers https://kubernetes.github.io/autoscaler
+helm upgrade -i vertical-pod-autoscaler autoscalers/vertical-pod-autoscaler
+```
+
 {{ template "chart.maintainersSection" . }}
 
 {{ template "chart.requirementsSection" . }}

vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/updater-deployment.yaml

@@ -52,9 +52,16 @@ spec:
           - --leader-elect-renew-deadline={{ .Values.updater.leaderElection.renewDeadline }}
           - --leader-elect-retry-period={{ .Values.updater.leaderElection.retryPeriod }}
           {{- end }}
+          {{- with .Values.updater.extraArgs }}
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           ports:
             - name: prometheus
               containerPort: 8943
+          {{- with .Values.updater.resources }}
+          resources:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           livenessProbe:
             httpGet:
               path: /health-check

vertical-pod-autoscaler/charts/vertical-pod-autoscaler/values.yaml

@@ -63,13 +63,13 @@ admissionController:
   extraArgs: []
 
   # Resources for the Admission Controller default container.
-  resources:
-    limits:
-      cpu: 200m
-      memory: 500Mi
-    requests:
-      cpu: 50m
-      memory: 200Mi
+  resources: {}
+    # limits:
+    #   cpu: 200m
+    #   memory: 500Mi
+    # requests:
+    #   cpu: 50m
+    #   memory: 200Mi
 
   # Node selector labels for scheduling the Admission Controller.
   nodeSelector: {}
@@ -142,13 +142,13 @@ recommender:
   extraArgs: []
 
   # Resources for the Recommender default container.
-  resources:
-    limits:
-      cpu: 200m
-      memory: 1000Mi
-    requests:
-      cpu: 50m
-      memory: 500Mi
+  resources: {}
+    # limits:
+    #   cpu: 200m
+    #   memory: 1000Mi
+    # requests:
+    #   cpu: 50m
+    #   memory: 500Mi
 
   # Node selector labels for scheduling the Recommender.
   nodeSelector: {}
@@ -188,6 +188,10 @@ recommender:
 
 updater:
   enabled: true
+
+  # Additional args for the updater
+  extraArgs: []
+
   image:
     # Image repository for the Updater default container.
     repository: registry.k8s.io/autoscaling/vpa-updater
@@ -237,3 +241,12 @@ updater:
     # -- (int or string) Maximum number/percentage of pods that can be unavailable after the eviction.
     # IMPORTANT: You can specify either 'minAvailable' or 'maxUnavailable', but not both.
     maxUnavailable:
+
+  # Resources for the updater Controller
+  resources: {}
+    # limits:
+    #   cpu: 200m
+    #   memory: 500Mi
+    # requests:
+    #   cpu: 50m
+    #   memory: 200Mi