add vpa crs for keda-operator and metrics-server

Signed-off-by: QuantumEnigmaa <[email protected]>
kedacore · Nov 9, 2023 · 3f9c812 · 3f9c812
1 parent 56f161c
commit 3f9c812
Show file tree

Hide file tree

Showing 11 changed files with 188 additions and 74 deletions.
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ $ helm repo add kedacore https://kedacore.github.io/charts
 $ helm search repo kedacore
 NAME                                            CHART VERSION   APP VERSION     DESCRIPTION
 kedacore/external-scaler-azure-cosmos-db        0.1.0           0.1.0           Event-based autoscaler for Azure Cosmos DB chan...
-kedacore/keda                                   2.12.0          2.12.0          Event-based autoscaler for workloads on Kubernetes
+kedacore/keda                                   2.13.0          2.12.0          Event-based autoscaler for workloads on Kubernetes
 kedacore/keda-add-ons-http                      0.6.0           0.6.0           Event-based autoscaler for HTTP workloads on Ku...
 ```
 

diff --git a/docs/external-scaler-azure-cosmos-db-0.1.0.tgz b/docs/external-scaler-azure-cosmos-db-0.1.0.tgz
diff --git a/docs/index.yaml b/docs/index.yaml
diff --git a/docs/keda-2.13.0.tgz b/docs/keda-2.13.0.tgz
diff --git a/docs/keda-add-ons-http-0.6.0.tgz b/docs/keda-add-ons-http-0.6.0.tgz
diff --git a/keda/Chart.yaml b/keda/Chart.yaml
@@ -8,7 +8,7 @@ kubeVersion: ">=v1.23.0-0"
 
 # 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.
-version: 2.12.0
+version: 2.13.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.

diff --git a/keda/README.md b/keda/README.md
@@ -130,6 +130,11 @@ their default values.
 | `securityContext.operator` | object | [See below](#KEDA-is-secure-by-default) | [Security context] of the operator container |
 | `topologySpreadConstraints.operator` | list | `[]` | [Pod Topology Constraints] of KEDA operator pod |
 | `upgradeStrategy.operator` | object | `{}` | Capability to configure [Deployment upgrade strategy] for operator |
+| `verticalPodAutoscaler.keda.cpu.maxAllowed` | int | `2` |  |
+| `verticalPodAutoscaler.keda.cpu.minAllowed` | string | `"20m"` |  |
+| `verticalPodAutoscaler.keda.enabled` | bool | `true` | Enables the creation of a vpa for the keda-operator |
+| `verticalPodAutoscaler.keda.memory.maxAllowed` | string | `"2Gi"` |  |
+| `verticalPodAutoscaler.keda.memory.minAllowed` | string | `"200Mi"` |  |
 | `volumes.keda.extraVolumeMounts` | list | `[]` | Extra volume mounts for KEDA deployment |
 | `volumes.keda.extraVolumes` | list | `[]` | Extra volumes for KEDA deployment |
 
@@ -162,6 +167,11 @@ their default values.
 | `service.type` | string | `"ClusterIP"` | KEDA Metric Server service type |
 | `topologySpreadConstraints.metricsServer` | list | `[]` | [Pod Topology Constraints] of KEDA metrics apiserver pod |
 | `upgradeStrategy.metricsApiServer` | object | `{}` | Capability to configure [Deployment upgrade strategy] for Metrics Api Server |
+| `verticalPodAutoscaler.metricsApiServer.cpu.maxAllowed` | int | `2` |  |
+| `verticalPodAutoscaler.metricsApiServer.cpu.minAllowed` | string | `"20m"` |  |
+| `verticalPodAutoscaler.metricsApiServer.enabled` | bool | `true` | Enables the creation of a vpa for the keda-operator-metrics-apiserver |
+| `verticalPodAutoscaler.metricsApiServer.memory.maxAllowed` | string | `"2Gi"` |  |
+| `verticalPodAutoscaler.metricsApiServer.memory.minAllowed` | string | `"200Mi"` |  |
 | `volumes.metricsApiServer.extraVolumeMounts` | list | `[]` | Extra volume mounts for metric server deployment |
 | `volumes.metricsApiServer.extraVolumes` | list | `[]` | Extra volumes for metric server deployment |
 

diff --git a/keda/templates/NOTES.txt b/keda/templates/NOTES.txt
@@ -55,7 +55,7 @@ WARNING - prometheus.webhooks.serviceMonitor.relabellings is deprecated, please
 
 {{- if lt .Capabilities.KubeVersion.Minor "26" }}
 -------------------------------------------------------------------------------------
-WARNING - Running on unsupported Kubernetes version "1.{{.Capabilities.KubeVersion.Minor}}". KEDA 2.12 is supported and tested on Kubernetes "1.26" or higher. See https://keda.sh/docs/2.12/operate/cluster/ for details.
+WARNING - Running on unsupported Kubernetes version "1.{{.Capabilities.KubeVersion.Minor}}". KEDA 2.13 is supported and tested on Kubernetes "1.26" or higher. See https://keda.sh/docs/2.13/operate/cluster/ for details.
 -------------------------------------------------------------------------------------
 {{- end }}
 

diff --git a/keda/templates/manager/verticalpodautoscaler.yaml b/keda/templates/manager/verticalpodautoscaler.yaml
@@ -0,0 +1,30 @@
+{{- if .Values.verticalPodAutoscaler.keda.enabled }}
+apiVersion: autoscaling.k8s.io/v1
+kind: VerticalPodAutoscaler
+metadata:
+  name: {{ .Values.operator.name }}-vpa
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    {{- toYaml .Values.additionalAnnotations | nindent 4 }}
+  labels:
+    {{- include "keda.labels" . | indent 4 }}
+spec:
+  targetRef:
+    apiVersion: "apps/v1"
+    kind: Deployment
+    name: {{ .Values.operator.name }}
+  resourcePolicy:
+    containerPolicies:
+      - containerName: '*'
+        controlledResources:
+          - cpu
+          - memory
+        maxAllowed:
+          cpu: {{ .Values.verticalPodAutoscaler.keda.cpu.maxAllowed }}
+          memory: {{ .Values.verticalPodAutoscaler.keda.memory.maxAllowed }}
+        minAllowed:
+          cpu: {{ .Values.verticalPodAutoscaler.keda.cpu.minAllowed }}
+          memory: {{ .Values.verticalPodAutoscaler.keda.memory.minAllowed }}
+  updatePolicy:
+    updateMode: "Auto"
+{{- end }}
diff --git a/keda/templates/metrics-server/verticalpodautoscaler.yaml b/keda/templates/metrics-server/verticalpodautoscaler.yaml
@@ -0,0 +1,30 @@
+{{- if .Values.verticalPodAutoscaler.metricsApiServer.enabled }}
+apiVersion: autoscaling.k8s.io/v1
+kind: VerticalPodAutoscaler
+metadata:
+  name: {{ .Values.operator.name }}-metrics-apiserver-vpa
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    {{- toYaml .Values.additionalAnnotations | nindent 4 }}
+  labels:
+    {{- include "keda.labels" . | indent 4 }}
+spec:
+  targetRef:
+    apiVersion: "apps/v1"
+    kind: Deployment
+    name: {{ .Values.operator.name }}-metrics-apiserver
+  resourcePolicy:
+    containerPolicies:
+      - containerName: '*'
+        controlledResources:
+          - cpu
+          - memory
+        maxAllowed:
+          cpu: {{ .Values.verticalPodAutoscaler.metricsApiServer.cpu.maxAllowed }}
+          memory: {{ .Values.verticalPodAutoscaler.metricsApiServer.memory.maxAllowed }}
+        minAllowed:
+          cpu: {{ .Values.verticalPodAutoscaler.metricsApiServer.cpu.minAllowed }}
+          memory: {{ .Values.verticalPodAutoscaler.metricsApiServer.memory.minAllowed }}
+  updatePolicy:
+    updateMode: "Auto"
+{{- end }}
diff --git a/keda/values.yaml b/keda/values.yaml
@@ -24,6 +24,26 @@ image:
 # -- Kubernetes cluster domain
 clusterDomain: cluster.local
 
+verticalPodAutoscaler:
+  keda:
+    # -- Enables the creation of a vpa for the keda-operator
+    enabled: true
+    cpu:
+      minAllowed: 20m
+      maxAllowed: 2
+    memory:
+      minAllowed: 200Mi
+      maxAllowed: 2Gi
+  metricsApiServer:
+    # -- Enables the creation of a vpa for the keda-operator-metrics-apiserver
+    enabled: true
+    cpu:
+      minAllowed: 20m
+      maxAllowed: 2
+    memory:
+      minAllowed: 200Mi
+      maxAllowed: 2Gi
+
 crds:
   # -- Defines whether the KEDA CRDs have to be installed or not.
   install: true