diff --git a/charts/vertical-pod-autoscaler/Chart.yaml b/charts/vertical-pod-autoscaler/Chart.yaml index 137188981..4986cf4c2 100644 --- a/charts/vertical-pod-autoscaler/Chart.yaml +++ b/charts/vertical-pod-autoscaler/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 1.1.2 +appVersion: 1.2.1 description: Set of components that automatically adjust the amount of CPU and memory requested by pods running in the Kubernetes Cluster home: https://github.com/kubernetes/autoscaler icon: https://raw.githubusercontent.com/kubernetes/kubernetes/master/logo/logo.svg @@ -10,10 +10,10 @@ name: vertical-pod-autoscaler sources: - https://github.com/kubernetes/autoscaler - https://github.com/cowboysysop/charts/tree/master/charts/vertical-pod-autoscaler -version: 9.8.3 +version: 9.9.0 dependencies: - name: common - version: 2.19.1 + version: 2.21.0 repository: https://charts.bitnami.com/bitnami/ annotations: artifacthub.io/signKey: | diff --git a/charts/vertical-pod-autoscaler/README.md b/charts/vertical-pod-autoscaler/README.md index a539bfeb1..d25254c16 100644 --- a/charts/vertical-pod-autoscaler/README.md +++ b/charts/vertical-pod-autoscaler/README.md @@ -147,7 +147,7 @@ $ kubectl delete crd verticalpodautoscalercheckpoints.autoscaling.k8s.io | `admissionController.replicaCount` | Number of replicas | `1` | | `admissionController.image.registry` | Image registry | `registry.k8s.io` | | `admissionController.image.repository` | Image repository | `autoscaling/vpa-admission-controller` | -| `admissionController.image.tag` | Image tag | `1.1.2` | +| `admissionController.image.tag` | Image tag | `1.2.1` | | `admissionController.image.digest` | Image digest | `""` | | `admissionController.image.pullPolicy` | Image pull policy | `IfNotPresent` | | `admissionController.pdb.create` | Specifies whether a pod disruption budget should be created | `false` | @@ -156,6 +156,7 @@ $ kubectl delete crd verticalpodautoscalercheckpoints.autoscaling.k8s.io | `admissionController.serviceAccount.create` | Specifies whether a service account should be created | `true` | | `admissionController.serviceAccount.annotations` | Service account annotations | `{}` | | `admissionController.serviceAccount.name` | The name of the service account to use (Generated using the `vertical-pod-autoscaler.fullname` template if not set) | `nil` | +| `admissionController.hostAliases` | Pod host aliases | `[]` | | `admissionController.deploymentAnnotations` | Additional deployment annotations | `{}` | | `admissionController.podAnnotations` | Additional pod annotations | `{}` | | `admissionController.podLabels` | Additional pod labels | `{}` | @@ -203,6 +204,8 @@ $ kubectl delete crd verticalpodautoscalercheckpoints.autoscaling.k8s.io | `admissionController.extraEnvVars` | Additional container environment variables | `[]` | | `admissionController.extraEnvVarsCM` | Name of existing ConfigMap containing additional container environment variables | `nil` | | `admissionController.extraEnvVarsSecret` | Name of existing Secret containing additional container environment variables | `nil` | +| `admissionController.extraVolumes` | Optionally specify extra list of additional volumes | `[]` | +| `admissionController.extraVolumeMounts` | Optionally specify extra list of additional volumeMounts | `[]` | | `admissionController.metrics.service.annotations` | Metrics service annotations | `{}` | | `admissionController.metrics.service.type` | Metrics service type | `ClusterIP` | | `admissionController.metrics.service.clusterIP` | Metrics static cluster IP address or None for headless service when service type is ClusterIP | `nil` | @@ -229,7 +232,7 @@ $ kubectl delete crd verticalpodautoscalercheckpoints.autoscaling.k8s.io | `recommender.replicaCount` | Number of replicas | `1` | | `recommender.image.registry` | Image registry | `registry.k8s.io` | | `recommender.image.repository` | Image repository | `autoscaling/vpa-recommender` | -| `recommender.image.tag` | Image tag | `1.1.2` | +| `recommender.image.tag` | Image tag | `1.2.1` | | `recommender.image.digest` | Image digest | `""` | | `recommender.image.pullPolicy` | Image pull policy | `IfNotPresent` | | `recommender.pdb.create` | Specifies whether a pod disruption budget should be created | `false` | @@ -238,6 +241,7 @@ $ kubectl delete crd verticalpodautoscalercheckpoints.autoscaling.k8s.io | `recommender.serviceAccount.create` | Specifies whether a service account should be created | `true` | | `recommender.serviceAccount.annotations` | Service account annotations | `{}` | | `recommender.serviceAccount.name` | The name of the service account to use (Generated using the `vertical-pod-autoscaler.fullname` template if not set) | `nil` | +| `recommender.hostAliases` | Pod host aliases | `[]` | | `recommender.deploymentAnnotations` | Additional deployment annotations | `{}` | | `recommender.podAnnotations` | Additional pod annotations | `{}` | | `recommender.podLabels` | Additional pod labels | `{}` | @@ -277,6 +281,8 @@ $ kubectl delete crd verticalpodautoscalercheckpoints.autoscaling.k8s.io | `recommender.extraEnvVars` | Additional container environment variables | `[]` | | `recommender.extraEnvVarsCM` | Name of existing ConfigMap containing additional container environment variables | `nil` | | `recommender.extraEnvVarsSecret` | Name of existing Secret containing additional container environment variables | `nil` | +| `recommender.extraVolumes` | Optionally specify extra list of additional volumes | `[]` | +| `recommender.extraVolumeMounts` | Optionally specify extra list of additional volumeMounts | `[]` | | `recommender.metrics.service.annotations` | Metrics service annotations | `{}` | | `recommender.metrics.service.type` | Metrics service type | `ClusterIP` | | `recommender.metrics.service.clusterIP` | Metrics static cluster IP address or None for headless service when service type is ClusterIP | `nil` | @@ -300,7 +306,7 @@ $ kubectl delete crd verticalpodautoscalercheckpoints.autoscaling.k8s.io | `updater.replicaCount` | Number of replicas | `1` | | `updater.image.registry` | Image registry | `registry.k8s.io` | | `updater.image.repository` | Image repository | `autoscaling/vpa-updater` | -| `updater.image.tag` | Image tag | `1.1.2` | +| `updater.image.tag` | Image tag | `1.2.1` | | `updater.image.digest` | Image digest | `""` | | `updater.image.pullPolicy` | Image pull policy | `IfNotPresent` | | `updater.pdb.create` | Specifies whether a pod disruption budget should be created | `false` | @@ -309,6 +315,7 @@ $ kubectl delete crd verticalpodautoscalercheckpoints.autoscaling.k8s.io | `updater.serviceAccount.create` | Specifies whether a service account should be created | `true` | | `updater.serviceAccount.annotations` | Service account annotations | `{}` | | `updater.serviceAccount.name` | The name of the service account to use (Generated using the `vertical-pod-autoscaler.fullname` template if not set) | `nil` | +| `updater.hostAliases` | Pod host aliases | `[]` | | `updater.deploymentAnnotations` | Additional deployment annotations | `{}` | | `updater.podAnnotations` | Additional pod annotations | `{}` | | `updater.podLabels` | Additional pod labels | `{}` | @@ -348,6 +355,8 @@ $ kubectl delete crd verticalpodautoscalercheckpoints.autoscaling.k8s.io | `updater.extraEnvVars` | Additional container environment variables | `[]` | | `updater.extraEnvVarsCM` | Name of existing ConfigMap containing additional container environment variables | `nil` | | `updater.extraEnvVarsSecret` | Name of existing Secret containing additional container environment variables | `nil` | +| `updater.extraVolumes` | Optionally specify extra list of additional volumes | `[]` | +| `updater.extraVolumeMounts` | Optionally specify extra list of additional volumeMounts | `[]` | | `updater.metrics.service.annotations` | Metrics service annotations | `{}` | | `updater.metrics.service.type` | Metrics service type | `ClusterIP` | | `updater.metrics.service.clusterIP` | Metrics static cluster IP address or None for headless service when service type is ClusterIP | `nil` | @@ -421,3 +430,9 @@ Due to hard-coded values in Vertical Pod Autoscaler, the chart configuration has - Admission controller component service name is `vpa-webhook` - Admission controller component service port is `443` - Mutating webhook configuration name automatically created by admission controller component is `vpa-webhook-config` + +## License + +The source code of this chart is under [MIT License](LICENSE). + +It also uses source code under Apache 2.0 License from the [Bitnami repository](https://github.com/bitnami/charts). diff --git a/charts/vertical-pod-autoscaler/templates/admission-controller/clusterrole.yaml b/charts/vertical-pod-autoscaler/templates/admission-controller/clusterrole.yaml index 8a049a766..7ce7822c8 100644 --- a/charts/vertical-pod-autoscaler/templates/admission-controller/clusterrole.yaml +++ b/charts/vertical-pod-autoscaler/templates/admission-controller/clusterrole.yaml @@ -9,8 +9,7 @@ metadata: {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} {{- end }} {{- if .Values.commonAnnotations }} - annotations: - {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} {{- end }} rules: # system:vpa-target-reader diff --git a/charts/vertical-pod-autoscaler/templates/admission-controller/clusterrolebinding.yaml b/charts/vertical-pod-autoscaler/templates/admission-controller/clusterrolebinding.yaml index 41470566c..c0e012ea7 100644 --- a/charts/vertical-pod-autoscaler/templates/admission-controller/clusterrolebinding.yaml +++ b/charts/vertical-pod-autoscaler/templates/admission-controller/clusterrolebinding.yaml @@ -9,8 +9,7 @@ metadata: {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} {{- end }} {{- if .Values.commonAnnotations }} - annotations: - {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} {{- end }} roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/charts/vertical-pod-autoscaler/templates/admission-controller/deployment.yaml b/charts/vertical-pod-autoscaler/templates/admission-controller/deployment.yaml index 99209baed..b0c44ea87 100644 --- a/charts/vertical-pod-autoscaler/templates/admission-controller/deployment.yaml +++ b/charts/vertical-pod-autoscaler/templates/admission-controller/deployment.yaml @@ -39,6 +39,9 @@ spec: {{- end }} spec: {{- include "common.images.pullSecrets" ( dict "images" ( list .Values.admissionController.image ) "global" .Values.global ) | nindent 6 }} + {{- if .Values.admissionController.hostAliases }} + hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.admissionController.hostAliases "context" $) | nindent 8 }} + {{- end }} {{- if .Values.admissionController.hostNetwork }} dnsPolicy: ClusterFirstWithHostNet hostNetwork: true @@ -133,6 +136,9 @@ spec: - name: tls-secret mountPath: /tls-secret readOnly: true + {{- if .Values.admissionController.extraVolumeMounts }} + {{- include "common.tplvalues.render" (dict "value" .Values.admissionController.extraVolumeMounts "context" $) | nindent 12 }} + {{- end }} {{- with .Values.admissionController.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} @@ -149,4 +155,7 @@ spec: - name: tls-secret secret: secretName: {{ include "vertical-pod-autoscaler.admissionController.tls.secretName" . }} + {{- if .Values.admissionController.extraVolumes }} + {{- include "common.tplvalues.render" (dict "value" .Values.admissionController.extraVolumes "context" $) | nindent 8 }} + {{- end }} {{- end }} diff --git a/charts/vertical-pod-autoscaler/templates/admission-controller/pdb.yaml b/charts/vertical-pod-autoscaler/templates/admission-controller/pdb.yaml index b9894de96..4c4813281 100644 --- a/charts/vertical-pod-autoscaler/templates/admission-controller/pdb.yaml +++ b/charts/vertical-pod-autoscaler/templates/admission-controller/pdb.yaml @@ -10,8 +10,7 @@ metadata: {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} {{- end }} {{- if .Values.commonAnnotations }} - annotations: - {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} {{- end }} spec: {{- if .Values.admissionController.pdb.minAvailable }} diff --git a/charts/vertical-pod-autoscaler/templates/admission-controller/servicemonitor.yaml b/charts/vertical-pod-autoscaler/templates/admission-controller/servicemonitor.yaml index 9d2d912ce..085461c43 100644 --- a/charts/vertical-pod-autoscaler/templates/admission-controller/servicemonitor.yaml +++ b/charts/vertical-pod-autoscaler/templates/admission-controller/servicemonitor.yaml @@ -1,5 +1,5 @@ {{- if .Values.admissionController.enabled }} -{{- if .Values.admissionController.metrics.serviceMonitor.enabled -}} +{{- if .Values.admissionController.metrics.serviceMonitor.enabled }} apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: diff --git a/charts/vertical-pod-autoscaler/templates/admission-controller/tls-secret.yaml b/charts/vertical-pod-autoscaler/templates/admission-controller/tls-secret.yaml index ee8f28e53..690f74785 100644 --- a/charts/vertical-pod-autoscaler/templates/admission-controller/tls-secret.yaml +++ b/charts/vertical-pod-autoscaler/templates/admission-controller/tls-secret.yaml @@ -13,8 +13,7 @@ metadata: {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} {{- end }} {{- if .Values.commonAnnotations }} - annotations: - {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} {{- end }} type: Opaque data: diff --git a/charts/vertical-pod-autoscaler/templates/recommender/clusterrole.yaml b/charts/vertical-pod-autoscaler/templates/recommender/clusterrole.yaml index 450bd9e08..00719b9dd 100644 --- a/charts/vertical-pod-autoscaler/templates/recommender/clusterrole.yaml +++ b/charts/vertical-pod-autoscaler/templates/recommender/clusterrole.yaml @@ -8,8 +8,7 @@ metadata: {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} {{- end }} {{- if .Values.commonAnnotations }} - annotations: - {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} {{- end }} rules: # system:metrics-reader @@ -130,3 +129,20 @@ rules: - get - list - watch + # system:leader-locking-vpa-recommender + - apiGroups: + - "coordination.k8s.io" + resources: + - leases + verbs: + - create + - apiGroups: + - "coordination.k8s.io" + resourceNames: + - vpa-recommender + resources: + - leases + verbs: + - get + - watch + - update diff --git a/charts/vertical-pod-autoscaler/templates/recommender/clusterrolebinding.yaml b/charts/vertical-pod-autoscaler/templates/recommender/clusterrolebinding.yaml index 07ee07cca..594a06c79 100644 --- a/charts/vertical-pod-autoscaler/templates/recommender/clusterrolebinding.yaml +++ b/charts/vertical-pod-autoscaler/templates/recommender/clusterrolebinding.yaml @@ -8,8 +8,7 @@ metadata: {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} {{- end }} {{- if .Values.commonAnnotations }} - annotations: - {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} {{- end }} roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/charts/vertical-pod-autoscaler/templates/recommender/deployment.yaml b/charts/vertical-pod-autoscaler/templates/recommender/deployment.yaml index e2bc3a4e0..beccaa660 100644 --- a/charts/vertical-pod-autoscaler/templates/recommender/deployment.yaml +++ b/charts/vertical-pod-autoscaler/templates/recommender/deployment.yaml @@ -37,6 +37,9 @@ spec: {{- end }} spec: {{- include "common.images.pullSecrets" ( dict "images" ( list .Values.recommender.image ) "global" .Values.global ) | nindent 6 }} + {{- if .Values.recommender.hostAliases }} + hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.recommender.hostAliases "context" $) | nindent 8 }} + {{- end }} {{- if .Values.recommender.priorityClassName }} priorityClassName: {{ .Values.recommender.priorityClassName | quote }} {{- end }} @@ -114,6 +117,10 @@ spec: {{- end }} resources: {{- toYaml .Values.recommender.resources | nindent 12 }} + volumeMounts: + {{- if .Values.recommender.extraVolumeMounts }} + {{- include "common.tplvalues.render" (dict "value" .Values.recommender.extraVolumeMounts "context" $) | nindent 12 }} + {{- end }} {{- with .Values.recommender.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} @@ -126,3 +133,7 @@ spec: tolerations: {{- toYaml . | nindent 8 }} {{- end }} + volumes: + {{- if .Values.recommender.extraVolumes }} + {{- include "common.tplvalues.render" (dict "value" .Values.recommender.extraVolumes "context" $) | nindent 8 }} + {{- end }} diff --git a/charts/vertical-pod-autoscaler/templates/recommender/pdb.yaml b/charts/vertical-pod-autoscaler/templates/recommender/pdb.yaml index c34307011..aa0238fa2 100644 --- a/charts/vertical-pod-autoscaler/templates/recommender/pdb.yaml +++ b/charts/vertical-pod-autoscaler/templates/recommender/pdb.yaml @@ -9,8 +9,7 @@ metadata: {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} {{- end }} {{- if .Values.commonAnnotations }} - annotations: - {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} {{- end }} spec: {{- if .Values.recommender.pdb.minAvailable }} diff --git a/charts/vertical-pod-autoscaler/templates/recommender/servicemonitor.yaml b/charts/vertical-pod-autoscaler/templates/recommender/servicemonitor.yaml index b7bfa9755..df70a7809 100644 --- a/charts/vertical-pod-autoscaler/templates/recommender/servicemonitor.yaml +++ b/charts/vertical-pod-autoscaler/templates/recommender/servicemonitor.yaml @@ -1,4 +1,4 @@ -{{- if .Values.recommender.metrics.serviceMonitor.enabled -}} +{{- if .Values.recommender.metrics.serviceMonitor.enabled }} apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: diff --git a/charts/vertical-pod-autoscaler/templates/updater/clusterrole.yaml b/charts/vertical-pod-autoscaler/templates/updater/clusterrole.yaml index aaa241803..b1fe0fd63 100644 --- a/charts/vertical-pod-autoscaler/templates/updater/clusterrole.yaml +++ b/charts/vertical-pod-autoscaler/templates/updater/clusterrole.yaml @@ -9,8 +9,7 @@ metadata: {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} {{- end }} {{- if .Values.commonAnnotations }} - annotations: - {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} {{- end }} rules: # system:vpa-actor @@ -108,4 +107,21 @@ rules: - get - list - watch + # system:leader-locking-vpa-updater + - apiGroups: + - "coordination.k8s.io" + resources: + - leases + verbs: + - create + - apiGroups: + - "coordination.k8s.io" + resourceNames: + - vpa-updater + resources: + - leases + verbs: + - get + - watch + - update {{- end }} diff --git a/charts/vertical-pod-autoscaler/templates/updater/clusterrolebinding.yaml b/charts/vertical-pod-autoscaler/templates/updater/clusterrolebinding.yaml index 0f1003daf..c0d3f13b6 100644 --- a/charts/vertical-pod-autoscaler/templates/updater/clusterrolebinding.yaml +++ b/charts/vertical-pod-autoscaler/templates/updater/clusterrolebinding.yaml @@ -9,8 +9,7 @@ metadata: {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} {{- end }} {{- if .Values.commonAnnotations }} - annotations: - {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} {{- end }} roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/charts/vertical-pod-autoscaler/templates/updater/deployment.yaml b/charts/vertical-pod-autoscaler/templates/updater/deployment.yaml index 6ef46391e..2b25d2939 100644 --- a/charts/vertical-pod-autoscaler/templates/updater/deployment.yaml +++ b/charts/vertical-pod-autoscaler/templates/updater/deployment.yaml @@ -38,6 +38,9 @@ spec: {{- end }} spec: {{- include "common.images.pullSecrets" ( dict "images" ( list .Values.updater.image ) "global" .Values.global ) | nindent 6 }} + {{- if .Values.updater.hostAliases }} + hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.updater.hostAliases "context" $) | nindent 8 }} + {{- end }} {{- if .Values.updater.priorityClassName }} priorityClassName: {{ .Values.updater.priorityClassName | quote }} {{- end }} @@ -117,6 +120,10 @@ spec: {{- end }} resources: {{- toYaml .Values.updater.resources | nindent 12 }} + volumeMounts: + {{- if .Values.updater.extraVolumeMounts }} + {{- include "common.tplvalues.render" (dict "value" .Values.updater.extraVolumeMounts "context" $) | nindent 12 }} + {{- end }} {{- with .Values.updater.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} @@ -129,4 +136,8 @@ spec: tolerations: {{- toYaml . | nindent 8 }} {{- end }} + volumes: + {{- if .Values.updater.extraVolumes }} + {{- include "common.tplvalues.render" (dict "value" .Values.updater.extraVolumes "context" $) | nindent 8 }} + {{- end }} {{- end }} diff --git a/charts/vertical-pod-autoscaler/templates/updater/pdb.yaml b/charts/vertical-pod-autoscaler/templates/updater/pdb.yaml index e6f8834d2..723af070c 100644 --- a/charts/vertical-pod-autoscaler/templates/updater/pdb.yaml +++ b/charts/vertical-pod-autoscaler/templates/updater/pdb.yaml @@ -10,8 +10,7 @@ metadata: {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} {{- end }} {{- if .Values.commonAnnotations }} - annotations: - {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} {{- end }} spec: {{- if .Values.updater.pdb.minAvailable }} diff --git a/charts/vertical-pod-autoscaler/templates/updater/servicemonitor.yaml b/charts/vertical-pod-autoscaler/templates/updater/servicemonitor.yaml index 8a1bf059f..306a94bfd 100644 --- a/charts/vertical-pod-autoscaler/templates/updater/servicemonitor.yaml +++ b/charts/vertical-pod-autoscaler/templates/updater/servicemonitor.yaml @@ -1,5 +1,5 @@ {{- if .Values.updater.enabled }} -{{- if .Values.updater.metrics.serviceMonitor.enabled -}} +{{- if .Values.updater.metrics.serviceMonitor.enabled }} apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: diff --git a/charts/vertical-pod-autoscaler/values.yaml b/charts/vertical-pod-autoscaler/values.yaml index 3ed41342c..225d93f30 100644 --- a/charts/vertical-pod-autoscaler/values.yaml +++ b/charts/vertical-pod-autoscaler/values.yaml @@ -48,7 +48,7 @@ admissionController: repository: autoscaling/vpa-admission-controller ## @param admissionController.image.tag Image tag - tag: 1.1.2 + tag: 1.2.1 ## @param admissionController.image.digest Image digest digest: "" @@ -77,6 +77,9 @@ admissionController: ## @param admissionController.serviceAccount.name The name of the service account to use (Generated using the `vertical-pod-autoscaler.fullname` template if not set) name: + ## @param admissionController.hostAliases Pod host aliases + hostAliases: [] + ## @param admissionController.deploymentAnnotations Additional deployment annotations deploymentAnnotations: {} @@ -241,6 +244,12 @@ admissionController: ## @param admissionController.extraEnvVarsSecret Name of existing Secret containing additional container environment variables extraEnvVarsSecret: + ## @param admissionController.extraVolumes Optionally specify extra list of additional volumes + extraVolumes: [] + + ## @param admissionController.extraVolumeMounts Optionally specify extra list of additional volumeMounts + extraVolumeMounts: [] + metrics: service: ## @param admissionController.metrics.service.annotations Metrics service annotations @@ -315,7 +324,7 @@ recommender: repository: autoscaling/vpa-recommender ## @param recommender.image.tag Image tag - tag: 1.1.2 + tag: 1.2.1 ## @param recommender.image.digest Image digest digest: "" @@ -344,6 +353,9 @@ recommender: ## @param recommender.serviceAccount.name The name of the service account to use (Generated using the `vertical-pod-autoscaler.fullname` template if not set) name: + ## @param recommender.hostAliases Pod host aliases + hostAliases: [] + ## @param recommender.deploymentAnnotations Additional deployment annotations deploymentAnnotations: {} @@ -475,8 +487,16 @@ recommender: # external-metrics-memory-metric: "" # history-length: 8d # history-resolution: 1h + # ignored-vpa-object-namespaces: "" # kube-api-burst: 10 # kube-api-qps: 5 + # leader-elect: false + # leader-elect-lease-duration: 15s + # leader-elect-renew-deadline: 10s + # leader-elect-resource-lock: leases + # leader-elect-resource-name: vpa-recommender + # leader-elect-resource-namespace: kube-system + # leader-elect-retry-period: 2s # memory-aggregation-interval: 24h0m0s # memory-aggregation-interval-count: 8 # memory-histogram-decay-half-life: 24h0m0s @@ -494,11 +514,16 @@ recommender: # prometheus-address: "" # prometheus-cadvisor-job-name: kubernetes-cadvisor # prometheus-query-timeout: 5m + # recommendation-lower-bound-cpu-percentile: 0.5 + # recommendation-lower-bound-memory-percentile: 0.5 # recommendation-margin-fraction: 0.15 + # recommendation-upper-bound-cpu-percentile: 0.95 + # recommendation-upper-bound-memory-percentile: 0.95 # recommender-interval: 1m0s # recommender-name: default # storage: checkpoint # target-cpu-percentile: 0.9 + # target-memory-percentile: 0.9 # use-external-metrics: false # username: "" v: 2 @@ -515,6 +540,12 @@ recommender: ## @param recommender.extraEnvVarsSecret Name of existing Secret containing additional container environment variables extraEnvVarsSecret: + ## @param recommender.extraVolumes Optionally specify extra list of additional volumes + extraVolumes: [] + + ## @param recommender.extraVolumeMounts Optionally specify extra list of additional volumeMounts + extraVolumeMounts: [] + metrics: service: ## @param recommender.metrics.service.annotations Metrics service annotations @@ -579,7 +610,7 @@ updater: repository: autoscaling/vpa-updater ## @param updater.image.tag Image tag - tag: 1.1.2 + tag: 1.2.1 ## @param updater.image.digest Image digest digest: "" @@ -608,6 +639,9 @@ updater: ## @param updater.serviceAccount.name The name of the service account to use (Generated using the `vertical-pod-autoscaler.fullname` template if not set) name: + ## @param updater.hostAliases Pod host aliases + hostAliases: [] + ## @param updater.deploymentAnnotations Additional deployment annotations deploymentAnnotations: {} @@ -732,9 +766,17 @@ updater: # eviction-rate-burst: 1 # eviction-rate-limit: -1 # eviction-tolerance: 0.5 + # ignored-vpa-object-namespaces: "" # in-recommendation-bounds-eviction-lifetime-threshold: 12h0m0s # kube-api-burst: 10 # kube-api-qps: 5 + # leader-elect: false + # leader-elect-lease-duration: 15s + # leader-elect-renew-deadline: 10s + # leader-elect-resource-lock: leases + # leader-elect-resource-name: vpa-updater + # leader-elect-resource-namespace: kube-system + # leader-elect-retry-period: 2s # min-replicas: 2 # pod-update-threshold: 0.1 # updater-interval: 1m0s @@ -753,6 +795,12 @@ updater: ## @param updater.extraEnvVarsSecret Name of existing Secret containing additional container environment variables extraEnvVarsSecret: + ## @param updater.extraVolumes Optionally specify extra list of additional volumes + extraVolumes: [] + + ## @param updater.extraVolumeMounts Optionally specify extra list of additional volumeMounts + extraVolumeMounts: [] + metrics: service: ## @param updater.metrics.service.annotations Metrics service annotations