Skip to content

Commit

Permalink
helm: add extra volumes and volume mounts configuration (#146)
Browse files Browse the repository at this point in the history
* Enabled extravolumes for both Keda and Metrics server deployment

Signed-off-by: Hans Kristian Nordengen <[email protected]>

* Packaged new Helm chart version

Signed-off-by: t3mi <[email protected]>

Co-authored-by: Hans Kristian Nordengen <[email protected]>
  • Loading branch information
t3mi and HansK-p authored Apr 27, 2021
1 parent 884ff58 commit 1b12a48
Show file tree
Hide file tree
Showing 7 changed files with 72 additions and 26 deletions.
70 changes: 45 additions & 25 deletions docs/index.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,27 @@ entries:
keda:
- apiVersion: v2
appVersion: 2.2.0
created: "2021-04-12T13:42:39.1164993+02:00"
created: "2021-04-26T18:05:52.1804311+03:00"
description: Event-based autoscaler for workloads on Kubernetes
digest: 6b6b25799c11e01d2a7edb34d8cf3fb6f82393e7c4e9faa07c38271afad49704
home: https://github.com/kedacore/keda
icon: https://raw.githubusercontent.com/kedacore/keda/master/images/keda-logo-500x500-white.png
maintainers:
- email: [email protected]
name: Ahmed ElSayed
- email: [email protected]
name: Tom Kerkhove
- email: [email protected]
name: Zbynek Roubalik
name: keda
sources:
- https://github.com/kedacore/keda
urls:
- https://kedacore.github.io/charts/keda-2.2.2.tgz
version: 2.2.2
- apiVersion: v2
appVersion: 2.2.0
created: "2021-04-26T18:05:52.1649896+03:00"
description: Event-based autoscaler for workloads on Kubernetes
digest: 7ec5c403d0ad315d2eb9ec0c9d73b36c0baced870f397884d467d46014f24631
home: https://github.com/kedacore/keda
Expand All @@ -23,7 +43,7 @@ entries:
version: 2.2.1
- apiVersion: v2
appVersion: 2.2.0
created: "2021-04-12T13:42:39.1125407+02:00"
created: "2021-04-26T18:05:52.1535995+03:00"
description: Event-based autoscaler for workloads on Kubernetes
digest: 42b530656687cabb1408abcb137a5d7515243465b65a3a6006927987441fadc0
home: https://github.com/kedacore/keda
Expand All @@ -43,7 +63,7 @@ entries:
version: 2.2.0
- apiVersion: v2
appVersion: 2.1.0
created: "2021-04-12T13:42:39.1025357+02:00"
created: "2021-04-26T18:05:52.142492+03:00"
description: Event-based autoscaler for workloads on Kubernetes
digest: 65e2fb98c55740251d7ffa1680ef0edeb42954576deac3856dd468473e321747
home: https://github.com/kedacore/keda
Expand All @@ -63,7 +83,7 @@ entries:
version: 2.1.3
- apiVersion: v2
appVersion: 2.1.0
created: "2021-04-12T13:42:39.0945457+02:00"
created: "2021-04-26T18:05:52.1280972+03:00"
description: Event-based autoscaler for workloads on Kubernetes
digest: f336ab24d5ebf96d28da95a03931f2701bb44ce6bb7c30991e3ad14959e2e7e4
home: https://github.com/kedacore/keda
Expand All @@ -83,7 +103,7 @@ entries:
version: 2.1.2
- apiVersion: v2
appVersion: 2.1.0
created: "2021-04-12T13:42:39.085527+02:00"
created: "2021-04-26T18:05:52.11678+03:00"
description: Event-based autoscaler for workloads on Kubernetes
digest: b6e752d05797cd50ce95a96ae1b6cf8b2b87fc10c27391172beb1acd9fcb18a2
home: https://github.com/kedacore/keda
Expand All @@ -103,7 +123,7 @@ entries:
version: 2.1.1
- apiVersion: v2
appVersion: 2.1.0
created: "2021-04-12T13:42:39.0765009+02:00"
created: "2021-04-26T18:05:52.1027097+03:00"
description: Event-based autoscaler for workloads on Kubernetes
digest: 91998f9165176f972b954ef9d4077942979cb5e863bb7d76ed29c48f63533531
home: https://github.com/kedacore/keda
Expand All @@ -123,7 +143,7 @@ entries:
version: 2.1.0
- apiVersion: v2
appVersion: 2.0.0
created: "2021-04-12T13:42:39.0684995+02:00"
created: "2021-04-26T18:05:52.0917553+03:00"
description: Event-based autoscaler for workloads on Kubernetes
digest: ce2e848f5d7a067d74feb3745da5a834cccdfaa665b5b59d43ad06baa4cdfd04
home: https://github.com/kedacore/keda
Expand All @@ -143,7 +163,7 @@ entries:
version: 2.0.1
- apiVersion: v1
appVersion: 2.0.0
created: "2021-04-12T13:42:39.0565336+02:00"
created: "2021-04-26T18:05:52.0807874+03:00"
description: Event-based autoscaler for workloads on Kubernetes
digest: dba8b0e793085165c7d155f9393c5ff112d4714dbce0201404ceb0e67d1b2deb
home: https://github.com/kedacore/keda
Expand All @@ -163,7 +183,7 @@ entries:
version: 2.0.0
- apiVersion: v1
appVersion: 2.0.0-rc2
created: "2021-04-12T13:42:39.0485351+02:00"
created: "2021-04-26T18:05:52.0641319+03:00"
description: Event-based autoscaler for workloads on Kubernetes
digest: bad82c28c5ca1d5e69fac4bfcc7a999d5d2b2afd9b19ff6deb9a48811110eb0d
home: https://github.com/kedacore/keda
Expand All @@ -183,7 +203,7 @@ entries:
version: 2.0.0-rc3
- apiVersion: v2
appVersion: 2.0.0-rc2
created: "2021-04-12T13:42:39.0384985+02:00"
created: "2021-04-26T18:05:52.0506006+03:00"
description: Event-based autoscaler for workloads on Kubernetes
digest: a4042ba14e595a8e82c9a39d8987625b89292aa86029686a3603b724fda36ca0
home: https://github.com/kedacore/keda
Expand All @@ -204,7 +224,7 @@ entries:
version: 2.0.0-rc2
- apiVersion: v1
appVersion: 2.0.0-rc
created: "2021-04-12T13:42:39.0265064+02:00"
created: "2021-04-26T18:05:52.0335038+03:00"
description: Event-based autoscaler for workloads on Kubernetes
digest: 3a952f2aaa0ea35ee4335f0b168f44fcf37c5c5ab7e9b9bba7e731c42f04ad61
home: https://github.com/kedacore/keda
Expand All @@ -224,7 +244,7 @@ entries:
version: 2.0.0-rc
- apiVersion: v1
appVersion: 2.0.0-beta
created: "2021-04-12T13:42:39.0145005+02:00"
created: "2021-04-26T18:05:52.0193972+03:00"
description: Event-based autoscaler for workloads on Kubernetes
digest: fbafc7ae564c13a0eab7062667759f6e93595c97125731a27e8290574e1d570c
home: https://github.com/kedacore/keda
Expand All @@ -244,7 +264,7 @@ entries:
version: 2.0.0-beta1.2
- apiVersion: v1
appVersion: 2.0.0-beta
created: "2021-04-12T13:42:39.0025764+02:00"
created: "2021-04-26T18:05:51.998783+03:00"
description: Event-based autoscaler for workloads on Kubernetes
digest: db9e7d2423423463285f2e9d5b940a63b41d6555ba9fcab8fda0e6a757ccefa9
home: https://github.com/kedacore/keda
Expand All @@ -264,7 +284,7 @@ entries:
version: 2.0.0-beta1.1
- apiVersion: v1
appVersion: 2.0.0-beta
created: "2021-04-12T13:42:38.9885326+02:00"
created: "2021-04-26T18:05:51.9839932+03:00"
description: Event-based autoscaler for workloads on Kubernetes
digest: f0a8f0b854246ee2258ec8f10528f2811681ad2e41946dc455586f1ba9818e01
home: https://github.com/kedacore/keda
Expand All @@ -284,7 +304,7 @@ entries:
version: 2.0.0-beta
- apiVersion: v1
appVersion: 1.5.0
created: "2021-04-12T13:42:38.978501+02:00"
created: "2021-04-26T18:05:51.9689378+03:00"
description: Event-based autoscaler for workloads on Kubernetes
digest: 07b15ddae4f1c40747de063100a668ac15d504cd0548eac0e1a04381fcaa3b37
home: https://github.com/kedacore/keda
Expand All @@ -304,7 +324,7 @@ entries:
version: 1.5.0
- apiVersion: v1
appVersion: 1.4.1
created: "2021-04-12T13:42:38.9665421+02:00"
created: "2021-04-26T18:05:51.9506527+03:00"
description: Event-based autoscaler for workloads on Kubernetes
digest: f8bf80186ac3343998021a1721d06a67fdacd1dab92e4a4992620903b52004a4
home: https://github.com/kedacore/keda
Expand All @@ -324,7 +344,7 @@ entries:
version: 1.4.2
- apiVersion: v1
appVersion: 1.4.1
created: "2021-04-12T13:42:38.9545363+02:00"
created: "2021-04-26T18:05:51.938533+03:00"
description: Event-based autoscaler for workloads on Kubernetes
digest: 97a2e5c0beff93bb71ff861da0f29d09dcf988e724784f8b7c56ac9872c37a81
home: https://github.com/kedacore/keda
Expand All @@ -340,7 +360,7 @@ entries:
version: 1.4.1
- apiVersion: v1
appVersion: 1.4.0
created: "2021-04-12T13:42:38.9405304+02:00"
created: "2021-04-26T18:05:51.918125+03:00"
description: Event-based autoscaler for workloads on Kubernetes
digest: 7b2b4e29f867361af87a60411b0a196416b04b2e20f4091d166263ea5195c355
home: https://github.com/kedacore/keda
Expand All @@ -356,7 +376,7 @@ entries:
version: 1.4.0
- apiVersion: v1
appVersion: 1.4.0
created: "2021-04-12T13:42:38.9285182+02:00"
created: "2021-04-26T18:05:51.9004064+03:00"
description: Event-based autoscaler for workloads on Kubernetes
digest: a9e78b6cb2257702296d7cc28ca7acdd0b11603aef7e95dbdc7d4ddfa3f3a49c
home: https://github.com/kedacore/keda
Expand All @@ -372,7 +392,7 @@ entries:
version: 1.3.2
- apiVersion: v1
appVersion: 1.3.0
created: "2021-04-12T13:42:38.9165009+02:00"
created: "2021-04-26T18:05:51.8842248+03:00"
description: Event-based autoscaler for workloads on Kubernetes
digest: e13bcb65816ed59b10b32fa6db8f61668635459d56c2d599bb3c0bcc5dcc1368
home: https://github.com/kedacore/keda
Expand All @@ -388,7 +408,7 @@ entries:
version: 1.3.1
- apiVersion: v1
appVersion: 1.3.0
created: "2021-04-12T13:42:38.9035007+02:00"
created: "2021-04-26T18:05:51.8723729+03:00"
description: Event based autoscaler for Azure Functions deployments on Kubernetes
digest: c0772458ab70bf3f019dc0b899ff444b9d7e6dcc466afd62e3f62e90eb8a24ed
home: https://github.com/kedacore/keda
Expand All @@ -404,7 +424,7 @@ entries:
version: 1.3.0
- apiVersion: v1
appVersion: 1.2.0
created: "2021-04-12T13:42:38.8884976+02:00"
created: "2021-04-26T18:05:51.856158+03:00"
description: Event based autoscaler for Azure Functions deployments on Kubernetes
digest: e041dbed2455fef34f2908594a42fc8a7f163a1f48be46c2f93dea46e36fc733
home: https://github.com/kedacore/keda
Expand All @@ -420,7 +440,7 @@ entries:
version: 1.2.0
- apiVersion: v1
appVersion: 1.1.0
created: "2021-04-12T13:42:38.874498+02:00"
created: "2021-04-26T18:05:51.8441075+03:00"
description: Event based autoscaler for Azure Functions deployments on Kubernetes
digest: c624e6620a9a6f265f51a82ee0d8267dcb2637dd3777306afbb271746234ff2d
home: https://github.com/kedacore/keda
Expand All @@ -436,7 +456,7 @@ entries:
version: 1.1.0
- apiVersion: v1
appVersion: 1.0.0
created: "2021-04-12T13:42:38.8634996+02:00"
created: "2021-04-26T18:05:51.8256082+03:00"
description: Event based autoscaler for Azure Functions deployments on Kubernetes
digest: ef934588dce70d874ea69692e082b8a70ad19095090b8d4fa7b5cb69b2cecaf6
home: https://github.com/kedacore/keda
Expand All @@ -450,4 +470,4 @@ entries:
urls:
- https://kedacore.github.io/charts/keda-1.0.0.tgz
version: 1.0.0
generated: "2021-04-12T13:42:38.8485005+02:00"
generated: "2021-04-26T18:05:51.8090079+03:00"
Binary file added docs/keda-2.2.2.tgz
Binary file not shown.
2 changes: 1 addition & 1 deletion keda/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description: Event-based autoscaler for workloads on Kubernetes

# 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.2.1
version: 2.2.2

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
Expand Down
4 changes: 4 additions & 0 deletions keda/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,10 @@ their default values.
| `prometheus.operator.podMonitor.scrapeTimeout` | Scraping timeout for keda operator using podMonitor crd (prometheus operator) | ``
| `prometheus.operator.podMonitor.namespace` | Scraping namespace for keda operator using podMonitor crd (prometheus operator) | ``
| `prometheus.operator.podMonitor.additionalLabels` | Additional labels to add for keda operator using podMonitor crd (prometheus operator) | `{}`
| `volumes.keda.extraVolumes` | Extra volumes for keda deployment | `[]`
| `volumes.keda.extraVolumeMounts` | Extra volume mounts for keda deployment | `[]`
| `volumes.metricsApiServer.extraVolumes` | Extra volumes for metric server deployment | `[]`
| `volumes.metricsApiServer.extraVolumeMounts` | Extra volume mounts for metric server deployment | `[]`

Specify each parameter using the `--set key=value[,key=value]` argument to
`helm install`. For example:
Expand Down
6 changes: 6 additions & 0 deletions keda/templates/12-keda-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,9 @@ spec:
- name: hashicorp-vault-certs
mountPath: /hashicorp-vaultcerts
{{- end }}
{{- if .Values.volumes.keda.extraVolumeMounts }}
{{- toYaml .Values.volumes.keda.extraVolumeMounts | nindent 12 }}
{{- end }}
resources:
{{- toYaml .Values.resources | nindent 12 }}
volumes:
Expand All @@ -107,6 +110,9 @@ spec:
secret:
secretName: {{ .Values.hashiCorpVaultTLS }}
{{- end }}
{{- if .Values.volumes.keda.extraVolumes }}
{{- toYaml .Values.volumes.keda.extraVolumes | nindent 8 }}
{{- end }}
{{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
Expand Down
6 changes: 6 additions & 0 deletions keda/templates/22-metrics-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,9 @@ spec:
- name: hashicorp-vault-certs
mountPath: /hashicorp-vaultcerts
{{- end }}
{{- if .Values.volumes.metricsApiServer.extraVolumeMounts }}
{{- toYaml .Values.volumes.metricsApiServer.extraVolumeMounts | nindent 12 }}

This comment has been minimized.

Copy link
@joebowbeer

joebowbeer Mar 16, 2023

Contributor
          {{- toYaml .Values.volumes.metricsApiServer.extraVolumeMounts | nindent 10 }}

@HansK-p @t3mi Indent should be 10 here #410

{{- end }}
resources:
{{- toYaml .Values.resources | nindent 12 }}
volumes:
Expand All @@ -112,6 +115,9 @@ spec:
secret:
secretName: {{ .Values.hashiCorpVaultTLS }}
{{- end }}
{{- if .Values.volumes.metricsApiServer.extraVolumes }}
{{- toYaml .Values.volumes.metricsApiServer.extraVolumes | nindent 8 }}

This comment has been minimized.

Copy link
@joebowbeer

joebowbeer Mar 16, 2023

Contributor
      {{- toYaml .Values.volumes.metricsApiServer.extraVolumes | nindent 6 }}

@HansK-p @t3mi Indent should be 6 here #410

{{- end }}
hostNetwork: {{ .Values.metricsServer.useHostNetwork }}
{{- with .Values.nodeSelector }}
nodeSelector:
Expand Down
10 changes: 10 additions & 0 deletions keda/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,16 @@ env:
# - name: ENV_NAME
# value: 'ENV-VALUE'

# Extra volumes and volume mounts for the deployment. Optional.
volumes:
keda:
extraVolumes: []
extraVolumeMounts: []

metricsApiServer:
extraVolumes: []
extraVolumeMounts: []

prometheus:
metricServer:
enabled: false
Expand Down

0 comments on commit 1b12a48

Please sign in to comment.