Merge pull request #799 from kakkoyun/ksonnet_no_more_19

Remove last ksonnet reference and direct dependency
2020-11-23 11:44:48 +01:00
parent 2a3981b75c a82a5b1d35
commit 93e4b70d2c
8 changed files with 97 additions and 114 deletions
--- a/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet
+++ b/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet
@@ -98,52 +98,50 @@
      },
    },

-    serviceMonitor:
-      {
-        apiVersion: 'monitoring.coreos.com/v1',
-        kind: 'ServiceMonitor',
-        metadata: {
-          name: 'alertmanager',
-          namespace: $._config.namespace,
-          labels: {
-            'k8s-app': 'alertmanager',
-          },
-        },
-        spec: {
-          selector: {
-            matchLabels: {
-              alertmanager: $._config.alertmanager.name,
-            },
-          },
-          endpoints: [
-            { port: 'web', interval: '30s' },
-          ],
+    serviceMonitor: {
+      apiVersion: 'monitoring.coreos.com/v1',
+      kind: 'ServiceMonitor',
+      metadata: {
+        name: 'alertmanager',
+        namespace: $._config.namespace,
+        labels: {
+          'k8s-app': 'alertmanager',
        },
      },
-
-    alertmanager:
-      {
-        apiVersion: 'monitoring.coreos.com/v1',
-        kind: 'Alertmanager',
-        metadata: {
-          name: $._config.alertmanager.name,
-          namespace: $._config.namespace,
-          labels: {
+      spec: {
+        selector: {
+          matchLabels: {
            alertmanager: $._config.alertmanager.name,
          },
        },
-        spec: {
-          replicas: $._config.alertmanager.replicas,
-          version: $._config.versions.alertmanager,
-          image: $._config.imageRepos.alertmanager + ':' + $._config.versions.alertmanager,
-          nodeSelector: { 'kubernetes.io/os': 'linux' },
-          serviceAccountName: 'alertmanager-' + $._config.alertmanager.name,
-          securityContext: {
-            runAsUser: 1000,
-            runAsNonRoot: true,
-            fsGroup: 2000,
-          },
+        endpoints: [
+          { port: 'web', interval: '30s' },
+        ],
+      },
+    },
+
+    alertmanager: {
+      apiVersion: 'monitoring.coreos.com/v1',
+      kind: 'Alertmanager',
+      metadata: {
+        name: $._config.alertmanager.name,
+        namespace: $._config.namespace,
+        labels: {
+          alertmanager: $._config.alertmanager.name,
        },
      },
+      spec: {
+        replicas: $._config.alertmanager.replicas,
+        version: $._config.versions.alertmanager,
+        image: $._config.imageRepos.alertmanager + ':' + $._config.versions.alertmanager,
+        nodeSelector: { 'kubernetes.io/os': 'linux' },
+        serviceAccountName: 'alertmanager-' + $._config.alertmanager.name,
+        securityContext: {
+          runAsUser: 1000,
+          runAsNonRoot: true,
+          fsGroup: 2000,
+        },
+      },
+    },
  },
 }
--- a/jsonnet/kube-prometheus/jsonnetfile.json
+++ b/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": {
--- a/jsonnet/kube-prometheus/kube-prometheus-config-mixins.libsonnet
+++ b/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)
-    }
+    },
  },
 };

--- a/jsonnet/kube-prometheus/kube-prometheus-custom-metrics.libsonnet
+++ b/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',
--- a/jsonnet/kube-prometheus/kube-prometheus-kubeadm.libsonnet
+++ b/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 }],
    ),
  },
--- a/jsonnet/kube-prometheus/kube-prometheus-static-etcd.libsonnet
+++ b/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: {
@@ -28,23 +26,23 @@ local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet';
      },
    },
    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
-          ],
-          ports: [
-            { name: 'metrics', port: 2379, protocol: 'TCP' },
-          ],
-        }],
+      apiVersion: 'v1',
+      kind: 'Endpoints',
+      metadata: {
+        name: 'etcd',
+        namespace: 'kube-system',
+        labels: { 'k8s-app': 'etcd' },
      },
+      subsets: [{
+        addresses: [
+          { ip: etcdIP }
+          for etcdIP in $._config.etcd.ips
+        ],
+        ports: [
+          { name: 'metrics', port: 2379, protocol: 'TCP' },
+        ],
+      }],
+    },
    serviceMonitorEtcd: {
      apiVersion: 'monitoring.coreos.com/v1',
      kind: 'ServiceMonitor',
@@ -94,12 +92,11 @@ local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet';
        'etcd-client.crt': std.base64($._config.etcd.clientCert),
      },
    },
-    prometheus+:
-      {
-        // Reference info: https://coreos.com/operators/prometheus/docs/latest/api.html#prometheusspec
-        spec+: {
-          secrets+: [$.prometheus.secretEtcdCerts.metadata.name],
-        },
+    prometheus+: {
+      // Reference info: https://coreos.com/operators/prometheus/docs/latest/api.html#prometheusspec
+      spec+: {
+        secrets+: [$.prometheus.secretEtcdCerts.metadata.name],
      },
+    },
  },
 }
--- a/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet
+++ b/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,
@@ -100,33 +100,33 @@ local ksm = import 'github.com/kubernetes/kube-state-metrics/jsonnet/kube-state-
            ],
          },
        },
-      } +
-      (kubeRbacProxyContainer {
-        config+:: {
-          kubeRbacProxy: {
-            local cfg = self,
-            image: $._config.imageRepos.kubeRbacProxy + ':' + $._config.versions.kubeRbacProxy,
-            name: 'kube-rbac-proxy-main',
-            securePortName: 'https-main',
-            securePort: 8443,
-            secureListenAddress: ':%d' % self.securePort,
-            upstream: 'http://127.0.0.1:8081/',
-            tlsCipherSuites: $._config.tlsCipherSuites,
-          },
-        },
-      }).deploymentMixin +
-      (kubeRbacProxyContainer {
-        config+:: {
-          kubeRbacProxy: {
-            local cfg = self,
-            image: $._config.imageRepos.kubeRbacProxy + ':' + $._config.versions.kubeRbacProxy,
-            name: 'kube-rbac-proxy-self',
-            securePortName: 'https-self',
-            securePort: 9443,
-            secureListenAddress: ':%d' % self.securePort,
-            upstream: 'http://127.0.0.1:8082/',
-            tlsCipherSuites: $._config.tlsCipherSuites,
-          },
-        },
-      }).deploymentMixin,
+    } +
+    (kubeRbacProxyContainer {
+       config+:: {
+         kubeRbacProxy: {
+           local cfg = self,
+           image: $._config.imageRepos.kubeRbacProxy + ':' + $._config.versions.kubeRbacProxy,
+           name: 'kube-rbac-proxy-main',
+           securePortName: 'https-main',
+           securePort: 8443,
+           secureListenAddress: ':%d' % self.securePort,
+           upstream: 'http://127.0.0.1:8081/',
+           tlsCipherSuites: $._config.tlsCipherSuites,
+         },
+       },
+     }).deploymentMixin +
+    (kubeRbacProxyContainer {
+       config+:: {
+         kubeRbacProxy: {
+           local cfg = self,
+           image: $._config.imageRepos.kubeRbacProxy + ':' + $._config.versions.kubeRbacProxy,
+           name: 'kube-rbac-proxy-self',
+           securePortName: 'https-self',
+           securePort: 9443,
+           secureListenAddress: ':%d' % self.securePort,
+           upstream: 'http://127.0.0.1:8082/',
+           tlsCipherSuites: $._config.tlsCipherSuites,
+         },
+       },
+     }).deploymentMixin,
 }
--- a/jsonnet/kube-prometheus/lib/image.libsonnet
+++ b/jsonnet/kube-prometheus/lib/image.libsonnet
@@ -5,16 +5,16 @@ 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;
+    error 'unknown image format: ' + image;

 {
  imageName:: imageName,