From 170727467b714d3a0a9ce11656ddbcf9d01f7827 Mon Sep 17 00:00:00 2001
From: Ryan Dawson <ryandawson@cantab.net>
Date: Mon, 29 Apr 2019 17:36:13 +0100
Subject: [PATCH] Revert "option to use anonymous auth grafana (#530)" (#532)

This reverts commit 0c462636836e34c909d03b8e0c67e0ea038644a3.
---
 .../templates/grafana-prom-deployment.json    | 21 +------------------
 helm-charts/seldon-core-analytics/values.yaml |  1 -
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/helm-charts/seldon-core-analytics/templates/grafana-prom-deployment.json b/helm-charts/seldon-core-analytics/templates/grafana-prom-deployment.json
index 4fcf4041d9..449b657d45 100644
--- a/helm-charts/seldon-core-analytics/templates/grafana-prom-deployment.json
+++ b/helm-charts/seldon-core-analytics/templates/grafana-prom-deployment.json
@@ -20,24 +20,6 @@
                         "containers": [
                             {
                                 "env": [
-                                    {{ if .Values.grafana_anonymous_auth }}
-                                    {
-                                        "name": "GF_AUTH_ANONYMOUS_ENABLED",
-                                        "value": "true"
-                                    },
-                                    {
-                                        "name": "GF_AUTH_BASIC_ENABLED",
-                                        "value": "false"
-                                    },
-                                    {
-                                        "name": "GF_AUTH_PROXY_ENABLED",
-                                        "value": "false"
-                                    },
-                                    {
-                                        "name": "GF_USERS_ALLOW_SIGN_UP",
-                                        "value": "false"
-                                    },
-                                    {{ else }}
                                     {
                                         "name": "GF_SECURITY_ADMIN_PASSWORD",
                                         "valueFrom": {
@@ -46,8 +28,7 @@
                                                 "name": "grafana-prom-secret"
                                             }
                                         }
-                                    },
-                                    {{ end}}
+                                    }
                                 ],
                                 "image": "grafana/grafana:5.3.4",
                                 "name": "grafana",
diff --git a/helm-charts/seldon-core-analytics/values.yaml b/helm-charts/seldon-core-analytics/values.yaml
index bc122da310..0c91433f18 100644
--- a/helm-charts/seldon-core-analytics/values.yaml
+++ b/helm-charts/seldon-core-analytics/values.yaml
@@ -3,7 +3,6 @@ alertmanager:
     enabled: false
 grafana_prom_service_type: NodePort
 grafana_prom_admin_password: admin
-grafana_anonymous_auth: false
 persistence:
   enabled: false
 rbac: