home/helm-charts
2
0
Fork 0
mirror of https://github.com/wahyd4/helm-charts.git synced 2026-08-09 04:26:02 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #235 from mgoodness/prometheus

Browse Source 
Prometheus: default to alpha dynamic PV annotation
This commit is contained in:
Adnan Abdulhussein
2016-11-21 10:42:17 -08:00
committed by GitHub
parent 39a2abc11a 4b8962e606
commit 201b352bbb
4 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/prometheus/README.md
+2
View File
@@ -55,6 +55,7 @@ The following tables lists the configurable parameters of the Spartakus chart an
| `alertmanager.persistentVolume.enabled` | If true, AlertManager will create a Persistent Volume Claim | `true` |
| `alertmanager.persistentVolume.accessModes` | AlertManager data Persistent Volume access modes | `[ReadWriteOnce]` |
| `alertmanager.persistentVolume.size` | AlertManager data Persistent Volume size | `2Gi` |
| `server.persistentVolume.storageClass` | AlertManager data Persistent Volume Storage Class | `volume.alpha.kubernetes.io/storage-class: default` |
| `alertmanager.resources` | Alertmanager resource requests and limits (YAML) |`requests: {cpu: 10m, memory: 32Mi}` |
| `alertmanager.serviceType` | Alertmanager service type | `ClusterIP` |
| `alertmanager.storagePath` | Alertmanager data storage path | `/data` |
@@ -75,6 +76,7 @@ The following tables lists the configurable parameters of the Spartakus chart an
| `server.persistentVolume.accessModes` | Server data Persistent Volume access modes | `[ReadWriteOnce]` |
| `server.persistentVolume.annotations` | Server data Persistent Volume annotations | `[]` |
| `server.persistentVolume.size` | Server data Persistent Volume size | `8Gi` |
| `server.persistentVolume.storageClass` | Server data Persistent Volume Storage Class | `volume.alpha.kubernetes.io/storage-class: default` |
| `server.resources` | Server resource requests and limits | `requests: {cpu: 500m, memory: 512Mi}` |
| `server.serviceType` | Server service type | `ClusterIP` |
| `server.storageLocalPath` | Server local data storage path | `/data` |
charts/prometheus/templates/alertmanager-pvc.yaml
+5
View File
@@ -3,6 +3,11 @@ apiVersion: v1
kind: PersistentVolumeClaim
metadata:
annotations:
{{- if .Values.alertmanager.persistentVolume.storageClass -}}
volume.beta.kubernetes.io/storage-class: {{ .Values.alertmanager.persistentVolume.storageClass }}
{{ else }}
volume.alpha.kubernetes.io/storage-class: default
{{- end }}
{{- range $key, $value := .Values.alertmanager.persistentVolume.annotations }}
{{ $key }}: {{ $value }}
{{- end }}
charts/prometheus/templates/server-pvc.yaml
+5
View File
@@ -3,6 +3,11 @@ apiVersion: v1
kind: PersistentVolumeClaim
metadata:
annotations:
{{- if .Values.server.persistentVolume.storageClass -}}
volume.beta.kubernetes.io/storage-class: {{ .Values.server.persistentVolume.storageClass }}
{{ else }}
volume.alpha.kubernetes.io/storage-class: default
{{- end }}
{{- range $key, $value := .Values.server.persistentVolume.annotations }}
{{ $key }}: {{ $value }}
{{- end }}
charts/prometheus/values.yaml
+14 -4
View File
@@ -56,13 +56,18 @@ alertmanager:
## AlertManager data Persistent Volume annotations
##
annotations:
volume.beta.kubernetes.io/storage-class: standard
# annotations:
## AlertManager data Persistent Volume size
##
size: 2Gi
## AlertManager data Persistent Volume Storage Class
## If defined, volume.beta.kubernetes.io/storage-class: <storageClass>
## Default: volume.alpha.kubernetes.io/storage-class: default
##
# storageClass:
## Alertmanager resource requests and limits
## Ref: http://kubernetes.io/docs/user-guide/compute-resources/
##
@@ -168,13 +173,18 @@ server:
## Server data Persistent Volume annotations
##
annotations:
volume.beta.kubernetes.io/storage-class: standard
# annotations:
## Server data Persistent Volume size
##
size: 8Gi
## AlertManager data Persistent Volume Storage Class
## If defined, volume.beta.kubernetes.io/storage-class: <storageClass>
## Default: volume.alpha.kubernetes.io/storage-class: default
##
# storageClass:
## Server resource requests and limits
## Ref: http://kubernetes.io/docs/user-guide/compute-resources/
##