From 290310f4cb4905da9691b0fbe7ef42c8e068dc3d Mon Sep 17 00:00:00 2001 From: Michael Goodness Date: Fri, 18 Nov 2016 21:06:41 -0600 Subject: [PATCH 1/2] Default to alpha dynamic PV annotation Addresses #227 Alpha dynamic provisioner only looks for annotation, not value. To enable the beta provisioner, operator provides `.Values.{alertmanager|server}.persistentVolume.storageClass`. --- charts/prometheus/templates/alertmanager-pvc.yaml | 5 +++++ charts/prometheus/templates/server-pvc.yaml | 5 +++++ charts/prometheus/values.yaml | 14 ++++++++++---- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/charts/prometheus/templates/alertmanager-pvc.yaml b/charts/prometheus/templates/alertmanager-pvc.yaml index 7012309b..22c259a2 100644 --- a/charts/prometheus/templates/alertmanager-pvc.yaml +++ b/charts/prometheus/templates/alertmanager-pvc.yaml @@ -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: '' + {{- end }} {{- range $key, $value := .Values.alertmanager.persistentVolume.annotations }} {{ $key }}: {{ $value }} {{- end }} diff --git a/charts/prometheus/templates/server-pvc.yaml b/charts/prometheus/templates/server-pvc.yaml index 5a0325b9..ffaffb1d 100644 --- a/charts/prometheus/templates/server-pvc.yaml +++ b/charts/prometheus/templates/server-pvc.yaml @@ -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: '' + {{- end }} {{- range $key, $value := .Values.server.persistentVolume.annotations }} {{ $key }}: {{ $value }} {{- end }} diff --git a/charts/prometheus/values.yaml b/charts/prometheus/values.yaml index 85d9bd24..d2bb5f3d 100644 --- a/charts/prometheus/values.yaml +++ b/charts/prometheus/values.yaml @@ -56,13 +56,16 @@ 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 + ## + # storageClass: + ## Alertmanager resource requests and limits ## Ref: http://kubernetes.io/docs/user-guide/compute-resources/ ## @@ -168,13 +171,16 @@ 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 + ## + # storageClass: + ## Server resource requests and limits ## Ref: http://kubernetes.io/docs/user-guide/compute-resources/ ## From 4b8962e606290d219a202097bfa74bd792594119 Mon Sep 17 00:00:00 2001 From: Michael Goodness Date: Mon, 21 Nov 2016 11:59:49 -0600 Subject: [PATCH 2/2] Default PVC SC is alpha:default --- charts/prometheus/README.md | 2 ++ charts/prometheus/templates/alertmanager-pvc.yaml | 2 +- charts/prometheus/templates/server-pvc.yaml | 2 +- charts/prometheus/values.yaml | 4 ++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/charts/prometheus/README.md b/charts/prometheus/README.md index be5e9451..037d9eb4 100644 --- a/charts/prometheus/README.md +++ b/charts/prometheus/README.md @@ -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` | diff --git a/charts/prometheus/templates/alertmanager-pvc.yaml b/charts/prometheus/templates/alertmanager-pvc.yaml index 22c259a2..b7657a41 100644 --- a/charts/prometheus/templates/alertmanager-pvc.yaml +++ b/charts/prometheus/templates/alertmanager-pvc.yaml @@ -6,7 +6,7 @@ metadata: {{- if .Values.alertmanager.persistentVolume.storageClass -}} volume.beta.kubernetes.io/storage-class: {{ .Values.alertmanager.persistentVolume.storageClass }} {{ else }} - volume.alpha.kubernetes.io/storage-class: '' + volume.alpha.kubernetes.io/storage-class: default {{- end }} {{- range $key, $value := .Values.alertmanager.persistentVolume.annotations }} {{ $key }}: {{ $value }} diff --git a/charts/prometheus/templates/server-pvc.yaml b/charts/prometheus/templates/server-pvc.yaml index ffaffb1d..9420dbce 100644 --- a/charts/prometheus/templates/server-pvc.yaml +++ b/charts/prometheus/templates/server-pvc.yaml @@ -6,7 +6,7 @@ metadata: {{- if .Values.server.persistentVolume.storageClass -}} volume.beta.kubernetes.io/storage-class: {{ .Values.server.persistentVolume.storageClass }} {{ else }} - volume.alpha.kubernetes.io/storage-class: '' + volume.alpha.kubernetes.io/storage-class: default {{- end }} {{- range $key, $value := .Values.server.persistentVolume.annotations }} {{ $key }}: {{ $value }} diff --git a/charts/prometheus/values.yaml b/charts/prometheus/values.yaml index d2bb5f3d..100a71c6 100644 --- a/charts/prometheus/values.yaml +++ b/charts/prometheus/values.yaml @@ -63,6 +63,8 @@ alertmanager: size: 2Gi ## AlertManager data Persistent Volume Storage Class + ## If defined, volume.beta.kubernetes.io/storage-class: + ## Default: volume.alpha.kubernetes.io/storage-class: default ## # storageClass: @@ -178,6 +180,8 @@ server: size: 8Gi ## AlertManager data Persistent Volume Storage Class + ## If defined, volume.beta.kubernetes.io/storage-class: + ## Default: volume.alpha.kubernetes.io/storage-class: default ## # storageClass: