Merge pull request #763 from kakkoyun/ksonnet_no_more_6

Remove ksonnet from kube-prometheus-eks.libsonnet

jsonnet/kube-prometheus/kube-prometheus-eks.libsonnet

@@ -1,33 +1,40 @@
-local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet';
-local service = k.core.v1.service;
-local servicePort = k.core.v1.service.mixin.spec.portsType;
-
 {
   _config+:: {
     eks: {
       minimumAvailableIPs: 10,
-      minimumAvailableIPsTime: '10m'
+      minimumAvailableIPsTime: '10m',
-    }
+    },
   },
   prometheus+: {
     serviceMonitorCoreDNS+: {
       spec+: {
         endpoints: [
           {
-              bearerTokenFile: "/var/run/secrets/kubernetes.io/serviceaccount/token",
+            bearerTokenFile: '/var/run/secrets/kubernetes.io/serviceaccount/token',
-              interval: "15s",
+            interval: '15s',
-              targetPort: 9153
+            targetPort: 9153,
-            }
+          },
-          ]
+        ],
       },
     },
-    AwsEksCniMetricService:
+    AwsEksCniMetricService: {
-        service.new('aws-node', { 'k8s-app' : 'aws-node' } , servicePort.newNamed('cni-metrics-port', 61678, 61678)) +
+      apiVersion: 'v1',
-        service.mixin.metadata.withNamespace('kube-system') +
+      kind: 'Service',
-        service.mixin.metadata.withLabels({ 'k8s-app': 'aws-node' }) +
+      metadata: {
-        service.mixin.spec.withClusterIp('None'),
+        name: 'aws-node',
-    serviceMonitorAwsEksCNI:
+        namespace: 'kube-system',
-      {
+        labels: { 'k8s-app': 'aws-node' },
+      },
+      spec: {
+        ports: [
+          { name: 'cni-metrics-port', port: 61678, targetPort: 61678 },
+        ],
+        selector: { 'k8s-app': 'aws-node' },
+        clusterIP: 'None',
+      },
+    },
+
+    serviceMonitorAwsEksCNI: {
       apiVersion: 'monitoring.coreos.com/v1',
       kind: 'ServiceMonitor',
       metadata: {
@@ -70,10 +77,10 @@ local servicePort = k.core.v1.service.mixin.spec.portsType;
               severity: 'critical',
             },
             annotations: {
-              message: 'Instance {{ $labels.instance }} has less than 10 IPs available.'
+              message: 'Instance {{ $labels.instance }} has less than 10 IPs available.',
             },
             'for': $._config.eks.minimumAvailableIPsTime,
-            alert: 'EksAvailableIPs'
+            alert: 'EksAvailableIPs',
           },
         ],
       },