Remove last ksonnet reference and direckt dependency

Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>
This commit is contained in:
Kemal Akkoyun
2020-11-20 17:11:12 +01:00
parent 28d661a5fc
commit a82a5b1d35
2 changed files with 21 additions and 34 deletions

View File

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

View File

@@ -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') + { (import 'github.com/etcd-io/etcd/Documentation/etcd-mixin/mixin.libsonnet') + {
_config+:: { _config+:: {
etcd: { etcd: {
@@ -28,23 +26,23 @@ local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet';
}, },
}, },
endpointsEtcd: { endpointsEtcd: {
apiVersion: 'v1', apiVersion: 'v1',
kind: 'Endpoints', kind: 'Endpoints',
metadata: { metadata: {
name: 'etcd', name: 'etcd',
namespace: 'kube-system', namespace: 'kube-system',
labels: { 'k8s-app': 'etcd' }, labels: { 'k8s-app': 'etcd' },
},
subsets: [{
addresses: [
{ ip: etcdIP }
for etcdIP in $._config.etcd.ips
],
ports: [
{ name: 'metrics', port: 2379, protocol: 'TCP' },
],
}],
}, },
subsets: [{
addresses: [
{ ip: etcdIP }
for etcdIP in $._config.etcd.ips
],
ports: [
{ name: 'metrics', port: 2379, protocol: 'TCP' },
],
}],
},
serviceMonitorEtcd: { serviceMonitorEtcd: {
apiVersion: 'monitoring.coreos.com/v1', apiVersion: 'monitoring.coreos.com/v1',
kind: 'ServiceMonitor', 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), 'etcd-client.crt': std.base64($._config.etcd.clientCert),
}, },
}, },
prometheus+: prometheus+: {
{ // Reference info: https://coreos.com/operators/prometheus/docs/latest/api.html#prometheusspec
// Reference info: https://coreos.com/operators/prometheus/docs/latest/api.html#prometheusspec spec+: {
spec+: { secrets+: [$.prometheus.secretEtcdCerts.metadata.name],
secrets+: [$.prometheus.secretEtcdCerts.metadata.name],
},
}, },
},
}, },
} }