Merge pull request #1546 from brancz/grafana-secrets

kube-prometheus: Re-generate Grafana jsonnet dependency

contrib/kube-prometheus/manifests/grafana-dashboardDatasources.yaml

@@ -1,21 +1,8 @@
 apiVersion: v1
 data:
-  prometheus.yaml: |-
-    {
-        "apiVersion": 1,
-        "datasources": [
-            {
-                "access": "proxy",
-                "editable": false,
-                "name": "prometheus",
-                "orgId": 1,
-                "type": "prometheus",
-                "url": "http://prometheus-k8s.monitoring.svc:9090",
-                "version": 1
-            }
-        ]
-    }
-kind: ConfigMap
+  prometheus.yaml: ewogICAgImFwaVZlcnNpb24iOiAxLAogICAgImRhdGFzb3VyY2VzIjogWwogICAgICAgIHsKICAgICAgICAgICAgImFjY2VzcyI6ICJwcm94eSIsCiAgICAgICAgICAgICJlZGl0YWJsZSI6IGZhbHNlLAogICAgICAgICAgICAibmFtZSI6ICJwcm9tZXRoZXVzIiwKICAgICAgICAgICAgIm9yZ0lkIjogMSwKICAgICAgICAgICAgInR5cGUiOiAicHJvbWV0aGV1cyIsCiAgICAgICAgICAgICJ1cmwiOiAiaHR0cDovL3Byb21ldGhldXMtazhzLm1vbml0b3Jpbmcuc3ZjOjkwOTAiLAogICAgICAgICAgICAidmVyc2lvbiI6IDEKICAgICAgICB9CiAgICBdCn0=
+kind: Secret
 metadata:
   name: grafana-datasources
   namespace: monitoring
+type: Opaque

contrib/kube-prometheus/manifests/grafana-deployment.yaml

@@ -69,9 +69,9 @@ spec:
       volumes:
       - emptyDir: {}
         name: grafana-storage
-      - configMap:
-          name: grafana-datasources
-        name: grafana-datasources
+      - name: grafana-datasources
+        secret:
+          secretName: grafana-datasources
       - configMap:
           name: grafana-dashboards
         name: grafana-dashboards