[stable/prometheus] Adding Vertical Pod Autoscaler support (#17742)

* Adding vertical Pod Autoscaler support to the chart

Signed-off-by: Ali Sattari <ali.sattari@gmail.com>

* EOF fixed in new file

Signed-off-by: Ali Sattari <ali.sattari@gmail.com>

* bumping the right version field!

Signed-off-by: Ali Sattari <ali.sattari@gmail.com>

* fixing a mistake in version bumping

Signed-off-by: Ali Sattari <ali.sattari@gmail.com>

* fixing wrong version bump

Signed-off-by: Ali Sattari <ali.sattari@gmail.com>

* Fixes loop issue

Signed-off-by: Ali Sattari <ali.sattari@gmail.com>

* Bumped chart version, synced app version with master.

Signed-off-by: Ali Sattari <ali.sattari@gmail.com>

* Bumping chart version

Signed-off-by: Ali Sattari <ali.sattari@gmail.com>

* Merge conflict cleanup

Signed-off-by: Ali Sattari <ali.sattari@gmail.com>
This commit is contained in:
Ali Sattari
2019-12-22 05:49:32 -08:00
committed by Kubernetes Prow Robot
parent 805a7aa30a
commit ebf360213f
4 changed files with 35 additions and 1 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
apiVersion: v1
name: prometheus
version: 9.7.1
version: 9.7.2
appVersion: 2.13.1
description: Prometheus is a monitoring system and time series database.
home: https://prometheus.io/
+1
View File
@@ -316,6 +316,7 @@ Parameter | Description | Default
`server.statefulSet.headless.labels` | labels for Prometheus server headless service | `{}`
`server.statefulSet.headless.servicePort` | Prometheus server headless service port | `80`
`server.resources` | Prometheus server resource requests and limits | `{}`
`server.verticalAutoscaler.enabled` | If true a VPA object will be created for the controller (either StatefulSet or Deployemnt, based on above configs) | `false`
`server.securityContext` | Custom [security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/) for server containers | `{}`
`server.service.annotations` | annotations for Prometheus server service | `{}`
`server.service.clusterIP` | internal Prometheus server cluster service IP | `""`
@@ -0,0 +1,24 @@
{{- if .Values.server.enabled -}}
{{- if .Values.server.verticalAutoscaler.enabled -}}
apiVersion: autoscaling.k8s.io/v1beta2
kind: VerticalPodAutoscaler
metadata:
labels:
{{- include "prometheus.server.labels" . | nindent 4 }}
name: {{ template "prometheus.server.fullname" . }}-vpa
spec:
targetRef:
{{- if .Values.server.statefulSet.enabled }}
apiVersion: "apps/v1"
kind: StatefulSet
{{- else }}
apiVersion: "extensions/v1beta1"
kind: Deployment
{{- end }}
name: {{ template "prometheus.server.fullname" . }}
updatePolicy:
updateMode: {{ .Values.server.verticalAutoscaler.updateMode | default "Off" | quote }}
resourcePolicy:
containerPolicies: {{ .Values.server.verticalAutoscaler.containerPolicies | default list | toYaml | trim | nindent 4 }}
{{- end -}} {{/* if .Values.server.verticalAutoscaler.enabled */}}
{{- end -}} {{/* .Values.server.enabled */}}
+9
View File
@@ -881,6 +881,15 @@ server:
# cpu: 500m
# memory: 512Mi
## Vertical Pod Autoscaler config
## Ref: https://github.com/kubernetes/autoscaler/tree/master/vertical-pod-autoscaler
verticalAutoscaler:
## If true a VPA object will be created for the controller (either StatefulSet or Deployemnt, based on above configs)
enabled: false
# updateMode: "Auto"
# containerPolicies:
# - containerName: 'prometheus-server'
## Security context to be added to server pods
##
securityContext: