Merge pull request #798 from kakkoyun/ksonnet_no_more_18

Remove ksonnet from kube-prometheus/kube-prometheus.libsonnet

jsonnet/kube-prometheus/kube-prometheus.libsonnet

@@ -1,6 +1,3 @@
-local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet';
-local k3 = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.3/k.libsonnet';
-local configMapList = k3.core.v1.configMapList;
 local kubeRbacProxyContainer = import './kube-rbac-proxy/container.libsonnet';
 
 (import 'github.com/brancz/kubernetes-grafana/grafana/grafana.libsonnet') +
@@ -16,11 +13,19 @@ local kubeRbacProxyContainer = import './kube-rbac-proxy/container.libsonnet';
 (import 'github.com/kubernetes-monitoring/kubernetes-mixin/mixin.libsonnet') +
 (import 'github.com/prometheus/prometheus/documentation/prometheus-mixin/mixin.libsonnet') +
 (import './alerts/alerts.libsonnet') +
-(import './rules/rules.libsonnet') + {
+(import './rules/rules.libsonnet') +
+{
   kubePrometheus+:: {
-    namespace: k.core.v1.namespace.new($._config.namespace),
+    namespace: {
+      apiVersion: 'v1',
+      kind: 'Namespace',
+      metadata: {
+        name: $._config.namespace,
       },
-  prometheusOperator+:: {
+    },
+  },
+  prometheusOperator+::
+    {
       service+: {
         spec+: {
           ports: [
@@ -44,7 +49,7 @@ local kubeRbacProxyContainer = import './kube-rbac-proxy/container.libsonnet';
                 insecureSkipVerify: true,
               },
             },
-        ]
+          ],
         },
       },
       clusterRole+: {
@@ -77,8 +82,14 @@ local kubeRbacProxyContainer = import './kube-rbac-proxy/container.libsonnet';
        },
      }).deploymentMixin,
 
+
   grafana+:: {
-    dashboardDefinitions: configMapList.new(super.dashboardDefinitions),
+    local dashboardDefinitions = super.dashboardDefinitions,
+    dashboardDefinitions: {
+      apiVersion: 'v1',
+      kind: 'ConfigMapList',
+      items: dashboardDefinitions,
+    },
     serviceMonitor: {
       apiVersion: 'monitoring.coreos.com/v1',
       kind: 'ServiceMonitor',
@@ -92,12 +103,10 @@ local kubeRbacProxyContainer = import './kube-rbac-proxy/container.libsonnet';
             app: 'grafana',
           },
         },
-        endpoints: [
+        endpoints: [{
-          {
           port: 'http',
           interval: '15s',
-          },
+        }],
-        ],
       },
     },
   },
@@ -105,14 +114,8 @@ local kubeRbacProxyContainer = import './kube-rbac-proxy/container.libsonnet';
   _config+:: {
     namespace: 'default',
 
-    versions+:: {
+    versions+:: { grafana: '7.1.0', kubeRbacProxy: 'v0.8.0' },
-      grafana: '7.1.0',
+    imageRepos+:: { kubeRbacProxy: 'quay.io/brancz/kube-rbac-proxy' },
-      kubeRbacProxy: 'v0.8.0',
-    },
-
-    imageRepos+:: {
-      kubeRbacProxy: 'quay.io/brancz/kube-rbac-proxy',
-    },
 
     tlsCipherSuites: [
       'TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256',  // required by h2: http://golang.org/cl/30721
@@ -191,13 +194,7 @@ local kubeRbacProxyContainer = import './kube-rbac-proxy/container.libsonnet';
         limits: { cpu: '250m', memory: '180Mi' },
       },
     },
-    prometheus+:: {
+    prometheus+:: { rules: $.prometheusRules + $.prometheusAlerts },
-      rules: $.prometheusRules + $.prometheusAlerts,
+    grafana+:: { dashboards: $.grafanaDashboards },
-    },
-
-    grafana+:: {
-      dashboards: $.grafanaDashboards,
-    },
-
   },
 }