Skip to content

Commit

Permalink
grafana.pvc.yaml and prometheus-k8s.yaml still use fixed values for s…
Browse files Browse the repository at this point in the history
…torage class (#118)

* storage class variable missing for 2 files
  • Loading branch information
qqian1991 authored and camilb committed Aug 23, 2018
1 parent 0c1c8b2 commit 4f8f12b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions deploy
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ do
STORAGE_CLASS_TYPE=gp2
sed -i -e 's,STORAGE_CLASS_PROVISIONER,'"$STORAGE_CLASS_PROVISIONER"',g' manifests/prometheus/prometheus-k8s.yaml;
sed -i -e 's,STORAGE_CLASS_TYPE,'"$STORAGE_CLASS_TYPE"',g' manifests/prometheus/prometheus-k8s.yaml;
sed -i -e 's,STORAGE_CLASS_TYPE,'"$STORAGE_CLASS_TYPE"',g' manifests/grafana/grafana.pvc.yaml;
break
;;
"GCP")
Expand Down
2 changes: 1 addition & 1 deletion manifests/grafana/grafana.pvc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ spec:
resources:
requests:
storage: 1Gi
storageClassName: ssd
storageClassName: STORAGE_CLASS_TYPE
6 changes: 3 additions & 3 deletions manifests/prometheus/prometheus-k8s.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: storage.k8s.io/v1
kind: StorageClass
metadata:
name: ssd
name: STORAGE_CLASS_TYPE
provisioner: STORAGE_CLASS_PROVISIONER
parameters:
type: STORAGE_CLASS_TYPE
Expand Down Expand Up @@ -31,15 +31,15 @@ spec:
memory: PROMETHEUS_MEMORY_REQUEST
retention: PROMETHEUS_STORAGE_RETENTION
storage:
class: ssd
class: STORAGE_CLASS_TYPE
selector:
resources:
volumeClaimTemplate:
metadata:
annotations:
annotation1: prometheus
spec:
storageClassName: ssd
storageClassName: STORAGE_CLASS_TYPE
resources:
requests:
storage: PROMETHEUS_STORAGE_VOLUME_SIZE
Expand Down

0 comments on commit 4f8f12b

Please sign in to comment.