From a82a5b1d35a46a73582650040680a54497dc7e61 Mon Sep 17 00:00:00 2001
From: Kemal Akkoyun <kakkoyun@gmail.com>
Date: Fri, 20 Nov 2020 17:11:12 +0100
Subject: [PATCH] Remove last ksonnet reference and direckt dependency
Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>
---
jsonnet/kube-prometheus/jsonnetfile.json | 10 -----
.../kube-prometheus-static-etcd.libsonnet | 45 +++++++++----------
2 files changed, 21 insertions(+), 34 deletions(-)
diff --git a/jsonnet/kube-prometheus/jsonnetfile.json b/jsonnet/kube-prometheus/jsonnetfile.json
index 7c74b15e..b495d05a 100644
--- 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": {
diff --git a/jsonnet/kube-prometheus/kube-prometheus-static-etcd.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-static-etcd.libsonnet
index 9bc77385..2994023d 100644
--- 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],
},
+ },
},
}
--
GitLab