Merge pull request #799 from kakkoyun/ksonnet_no_more_19

Remove last ksonnet reference and direct dependency

jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet

@@ -98,8 +98,7 @@
       },
     },
 
-    serviceMonitor:
+    serviceMonitor: {
-      {
       apiVersion: 'monitoring.coreos.com/v1',
       kind: 'ServiceMonitor',
       metadata: {
@@ -121,8 +120,7 @@
       },
     },
 
-    alertmanager:
+    alertmanager: {
-      {
       apiVersion: 'monitoring.coreos.com/v1',
       kind: 'Alertmanager',
       metadata: {

jsonnet/kube-prometheus/jsonnetfile.json

@@ -37,16 +37,6 @@
       },
       "version": "master"
     },
-    {
-      "source": {
-        "git": {
-          "remote": "https://github.com/ksonnet/ksonnet-lib",
-          "subdir": ""
-        }
-      },
-      "version": "master",
-      "name": "ksonnet"
-    },
     {
       "source": {
         "git": {

jsonnet/kube-prometheus/kube-prometheus-config-mixins.libsonnet

@@ -9,9 +9,9 @@ local withImageRepository(repository) = {
     if repository == null then image else repository + '/' + l.imageName(image),
   _config+:: {
     imageRepos:: {
-      [field]: substituteRepository(oldRepos[field], repository),
+      [field]: substituteRepository(oldRepos[field], repository)
       for field in std.objectFields(oldRepos)
-    }
+    },
   },
 };
 

jsonnet/kube-prometheus/kube-prometheus-custom-metrics.libsonnet

@@ -133,7 +133,6 @@
       metadata: {
         name: 'custom-metrics-server-resources',
       },
-
       roleRef: {
         apiGroup: 'rbac.authorization.k8s.io',
         kind: 'ClusterRole',
@@ -151,7 +150,6 @@
       metadata: {
         name: 'hpa-controller-custom-metrics',
       },
-
       roleRef: {
         apiGroup: 'rbac.authorization.k8s.io',
         kind: 'ClusterRole',

jsonnet/kube-prometheus/kube-prometheus-kubeadm.libsonnet

@@ -19,14 +19,14 @@ local service(name, namespace, labels, selector, ports) = {
       'kube-controller-manager-prometheus-discovery',
       'kube-system',
       { 'k8s-app': 'kube-controller-manager' },
-      { 'component': 'kube-controller-manager' },
+      { component: 'kube-controller-manager' },
       [{ name: 'https-metrics', port: 10257, targetPort: 10257 }]
     ),
     kubeSchedulerPrometheusDiscoveryService: service(
       'kube-scheduler-prometheus-discovery',
       'kube-system',
       { 'k8s-app': 'kube-scheduler' },
-      { 'component': 'kube-scheduler' },
+      { component: 'kube-scheduler' },
       [{ name: 'https-metrics', port: 10259, targetPort: 10259 }],
     ),
   },

jsonnet/kube-prometheus/kube-prometheus-static-etcd.libsonnet

@@ -1,5 +1,3 @@
-local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet';
-
 (import 'github.com/etcd-io/etcd/Documentation/etcd-mixin/mixin.libsonnet') + {
   _config+:: {
     etcd: {
@@ -94,8 +92,7 @@ local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet';
         'etcd-client.crt': std.base64($._config.etcd.clientCert),
       },
     },
-    prometheus+:
+    prometheus+: {
-      {
       // Reference info: https://coreos.com/operators/prometheus/docs/latest/api.html#prometheusspec
       spec+: {
         secrets+: [$.prometheus.secretEtcdCerts.metadata.name],

jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet

@@ -15,7 +15,7 @@ local ksm = import 'github.com/kubernetes/kube-state-metrics/jsonnet/kube-state-
     },
   },
   kubeStateMetrics+::
-    ksm + {
+    ksm {
       local version = self.version,
       name:: 'kube-state-metrics',
       namespace:: $._config.namespace,

jsonnet/kube-prometheus/lib/image.libsonnet

@@ -5,13 +5,13 @@ local imageName(image) =
   local parts = std.split(image, '/');
   local len = std.length(parts);
   if len == 3 then
-    # registry.com/org/image
+    // registry.com/org/image
     parts[2]
   else if len == 2 then
-    # org/image
+    // org/image
     parts[1]
   else if len == 1 then
-    # image, ie. busybox
+    // image, ie. busybox
     parts[0]
   else
     error 'unknown image format: ' + image;