Merge pull request #623 from alphagov/grafana-statefulset

Prometheus rules and stateless grafana
alphagov · Oct 9, 2019 · dd8ad79 · dd8ad79
2 parents f2676de + ca6fbba
commit dd8ad79
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 11 deletions.
diff --git a/charts/gsp-cluster/charts/gsp-monitoring/charts/prometheus-operator-5.14.1.tgz b/charts/gsp-cluster/charts/gsp-monitoring/charts/prometheus-operator-5.14.1.tgz
diff --git a/charts/gsp-cluster/charts/gsp-monitoring/charts/prometheus-operator-6.14.1.tgz b/charts/gsp-cluster/charts/gsp-monitoring/charts/prometheus-operator-6.14.1.tgz
diff --git a/charts/gsp-cluster/charts/gsp-monitoring/requirements.lock b/charts/gsp-cluster/charts/gsp-monitoring/requirements.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: prometheus-operator
   repository: https://kubernetes-charts.storage.googleapis.com/
-  version: 5.14.1
-digest: sha256:404f3a2678c2c158b3ebc3b55de6c1500c7c316aaeb7632779ec4de6f2bf97fd
-generated: "2019-09-23T10:02:37.887745+01:00"
+  version: 6.14.1
+digest: sha256:1c9fb5ddedb608f84faeceec9f7cd68e879e7e7c4fdc73c759bbdaaf9da43e67
+generated: "2019-10-08T19:47:45.900925+01:00"
diff --git a/charts/gsp-cluster/charts/gsp-monitoring/requirements.yaml b/charts/gsp-cluster/charts/gsp-monitoring/requirements.yaml
@@ -1,4 +1,4 @@
 dependencies:
   - name: "prometheus-operator"
-    version: 5.14.1
+    version: 6.14.1
     repository: https://kubernetes-charts.storage.googleapis.com/
diff --git a/charts/gsp-cluster/charts/gsp-monitoring/values.yaml b/charts/gsp-cluster/charts/gsp-monitoring/values.yaml
@@ -281,13 +281,6 @@ prometheus-operator:
         jsonData:
           authType: credentials
           defaultRegion: eu-west-2
-    persistence:
-      enabled: true
-      type: pvc
-      accessModes:
-      - ReadWriteOnce
-      size: 10Mi
-      storageClassName: gp2
     env:
       GF_AUTH_GOOGLE_ENABLED: "true"
       GF_AUTH_GOOGLE_ALLOW_SIGN_UP: "true"

diff --git a/hack/lint-terraform-values-output.sh b/hack/lint-terraform-values-output.sh
@@ -114,6 +114,7 @@ helm template \
 		| sed 's/${bootstrap_role_arns}/[]/' \
 		| sed 's/${concourse_teams}/["org:team"]/' \
 		| sed 's/${egress_ip_addresses}/[]/' \
+		| sed 's/${eks_version}/1.14/' \
 	) \
 	--values output/values.yaml \
 	--set 'global.cloudHsm.enabled=true' \

diff --git a/modules/gsp-cluster/data/values.yaml b/modules/gsp-cluster/data/values.yaml
@@ -150,6 +150,7 @@ fluentd-cloudwatch:
 
 gsp-monitoring:
   prometheus-operator:
+    kubeTargetVersionOverride: "${eks_version}"
     prometheus:
       prometheusSpec:
         externalLabels:

diff --git a/modules/gsp-cluster/values.tf b/modules/gsp-cluster/values.tf
@@ -54,6 +54,7 @@ data "template_file" "values" {
     private_db_subnet_group          = "${aws_db_subnet_group.private.id}"
     external_dns_iam_role_name       = "${aws_iam_role.external_dns.name}"
     grafana_default_admin_password   = "${random_password.grafana_default_admin_password.result}"
+    eks_version                      = "${var.eks_version}"
 
     permitted_roles_regex = "^(${join("|", list(
       aws_iam_role.cloudwatch_log_shipping_role.name,