Merge pull request #13 from mllu/add-pod-annotations

add pod annotations
This commit is contained in:
mergify[bot] 2020-07-18 09:13:50 +00:00 committed by GitHub
commit 3925581ca6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 16 deletions

View File

@ -1,16 +1,16 @@
apiVersion: v1
description: A chart for a Cadvisor deployment
name: cadvisor
version: 1.1.1
appVersion: 0.36.0
home: https://github.com/google/cadvisor
sources:
- https://github.com/google/cadvisor
- https://github.com/ckotzbauer/helm-charts
keywords:
- prometheus
- cadvisor
- monitoring
maintainers:
- name: ckotzbauer
email: christian.kotzbauer@gmail.com
apiVersion: v1
description: A chart for a Cadvisor deployment
name: cadvisor
version: 1.1.2
appVersion: 0.36.0
home: https://github.com/google/cadvisor
sources:
- https://github.com/google/cadvisor
- https://github.com/ckotzbauer/helm-charts
keywords:
- prometheus
- cadvisor
- monitoring
maintainers:
- name: ckotzbauer
email: christian.kotzbauer@gmail.com

View File

@ -55,6 +55,7 @@ The following table lists the configurable parameters of the Prometheus MSTeams
| `resources` | pod resource requests & limits | `{}` |
| `serviceAccount.create` | create a own serviceAccount for the pod | `true` |
| `serviceAccount.name` | name of the serviceAccount to create | `""` |
| `podAnnotations` | annotations for the daemonset pods | `{}` |
| `podSecurityPolicy.create` | create a own PodSecurityPolicy for the pod | `false` |
| `metrics.enabled` | create ServiceMonitor CR for Prometheus operator | `false` |

View File

@ -19,6 +19,10 @@ spec:
labels:
app: {{ template "cadvisor.name" . }}
release: {{ .Release.Name }}
annotations:
{{- range $key, $value := .Values.podAnnotations }}
{{ $key }}: {{ $value | quote }}
{{- end }}
spec:
serviceAccountName: {{ template "cadvisor.serviceAccountName" . }}
containers:

View File

@ -37,6 +37,8 @@ resources: {}
# cpu: 100m
# memory: 128Mi
podAnnotations: {}
serviceAccount:
# Specifies whether a service account should be created
create: true