Merge pull request #765 from kakkoyun/ksonnet_no_more_8

Remove ksonnet from kube-prometheus-static-etcd.libsonnet

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

@@ -12,40 +12,40 @@ local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet';
     },
   },
   prometheus+:: {
-    serviceEtcd:
-      local service = k.core.v1.service;
-      local servicePort = k.core.v1.service.mixin.spec.portsType;
-
-      local etcdServicePort = servicePort.newNamed('metrics', 2379, 2379);
-
-      service.new('etcd', null, etcdServicePort) +
-      service.mixin.metadata.withNamespace('kube-system') +
-      service.mixin.metadata.withLabels({ 'k8s-app': 'etcd' }) +
-      service.mixin.spec.withClusterIp('None'),
-    endpointsEtcd:
-      local endpoints = k.core.v1.endpoints;
-      local endpointSubset = endpoints.subsetsType;
-      local endpointPort = endpointSubset.portsType;
-
-      local etcdPort = endpointPort.new() +
-                       endpointPort.withName('metrics') +
-                       endpointPort.withPort(2379) +
-                       endpointPort.withProtocol('TCP');
-
-      local subset = endpointSubset.new() +
-                     endpointSubset.withAddresses([
+    serviceEtcd: {
+      apiVersion: 'v1',
+      kind: 'Service',
+      metadata: {
+        name: 'etcd',
+        namespace: 'kube-system',
+        labels: { 'k8s-app': 'etcd' },
+      },
+      spec: {
+        ports: [
+          { name: 'metrics', targetPort: 2379, port: 2379 },
+        ],
+        clusterIP: 'None',
+      },
+    },
+    endpointsEtcd: {
+        apiVersion: 'v1',
+        kind: 'Endpoints',
+        metadata: {
+          name: 'etcd',
+          namespace: 'kube-system',
+          labels: { 'k8s-app': 'etcd' },
+        },
+        subsets: [{
+          addresses: [
             { ip: etcdIP }
             for etcdIP in $._config.etcd.ips
-                     ]) +
-                     endpointSubset.withPorts(etcdPort);
-
-      endpoints.new() +
-      endpoints.mixin.metadata.withName('etcd') +
-      endpoints.mixin.metadata.withNamespace('kube-system') +
-      endpoints.mixin.metadata.withLabels({ 'k8s-app': 'etcd' }) +
-      endpoints.withSubsets(subset),
-    serviceMonitorEtcd:
-      {
+          ],
+          ports: [
+            { name: 'metrics', port: 2379, protocol: 'TCP' },
+          ],
+        }],
+      },
+    serviceMonitorEtcd: {
       apiVersion: 'monitoring.coreos.com/v1',
       kind: 'ServiceMonitor',
       metadata: {
@@ -79,15 +79,21 @@ local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet';
         },
       },
     },
-    secretEtcdCerts:
+    secretEtcdCerts: {
       // Prometheus Operator allows us to mount secrets in the pod. By loading the secrets as files, they can be made available inside the Prometheus pod.
-      local secret = k.core.v1.secret;
-      secret.new('kube-etcd-client-certs', {
+      apiVersion: 'v1',
+      kind: 'Secret',
+      type: 'Opaque',
+      metadata: {
+        name: 'kube-etcd-client-certs',
+        namespace: $._config.namespace,
+      },
+      data: {
         'etcd-client-ca.crt': std.base64($._config.etcd.clientCA),
         'etcd-client.key': std.base64($._config.etcd.clientKey),
         'etcd-client.crt': std.base64($._config.etcd.clientCert),
-      }) +
-      secret.mixin.metadata.withNamespace($._config.namespace),
+      },
+    },
     prometheus+:
       {
         // Reference info: https://coreos.com/operators/prometheus/docs/latest/api.html#prometheusspec

jsonnet/kube-prometheus/kube-prometheus-strip-limits.libsonnet

@@ -24,7 +24,7 @@
           spec+: {
             local addArgs(c) =
               if c.name == 'prometheus-operator'
-                then c + {args+: ['--config-reloader-cpu=0']}
+              then c { args+: ['--config-reloader-cpu=0'] }
               else c,
             containers: std.map(addArgs, super.containers),
           },