diff --git a/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet b/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet index 62523699f199b30cc3d46caee9d7ae2852556770..404f95169125fe51fd8c12273039d04fae3b4cc9 100644 --- a/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet +++ b/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; +local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; { _config+:: { diff --git a/jsonnet/kube-prometheus/jsonnetfile.json b/jsonnet/kube-prometheus/jsonnetfile.json index dfc04788860e99d34a022b7c8ef6249f2caea2c2..ac201dd27f35ac325eb189d6a4e64f3293d6c051 100644 --- a/jsonnet/kube-prometheus/jsonnetfile.json +++ b/jsonnet/kube-prometheus/jsonnetfile.json @@ -49,16 +49,6 @@ } }, "version": "master" - }, - { - "name": "ksonnet4", - "source": { - "git": { - "remote": "https://github.com/metalmatze/ksonnet-lib", - "subdir": "" - } - }, - "version": "ksonnet.beta.4" } ] } diff --git a/jsonnet/kube-prometheus/kube-prometheus-anti-affinity.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-anti-affinity.libsonnet index 6cb6eab1dfb7f14e40d55a40a558a683ad9a417d..dafe4ec9e358d8e09dbeb53e596b3a25dad0ae4f 100644 --- a/jsonnet/kube-prometheus/kube-prometheus-anti-affinity.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus-anti-affinity.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; +local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; local statefulSet = k.apps.v1.statefulSet; local affinity = statefulSet.mixin.spec.template.spec.affinity.podAntiAffinity.preferredDuringSchedulingIgnoredDuringExecutionType; local matchExpression = affinity.mixin.podAffinityTerm.labelSelector.matchExpressionsType; diff --git a/jsonnet/kube-prometheus/kube-prometheus-bootkube.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-bootkube.libsonnet index 0d2422619ad561cec11f53d29d4ee2edd581a084..3e2094a5c54942488278cd03016d8d33518f8177 100644 --- a/jsonnet/kube-prometheus/kube-prometheus-bootkube.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus-bootkube.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; +local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; local service = k.core.v1.service; local servicePort = k.core.v1.service.mixin.spec.portsType; diff --git a/jsonnet/kube-prometheus/kube-prometheus-kops-coredns.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-kops-coredns.libsonnet index 0eda00f56dcbdd27bbb0181e0218ffc6d143c809..8a309d284f13873629db2eff640d693c03472150 100644 --- a/jsonnet/kube-prometheus/kube-prometheus-kops-coredns.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus-kops-coredns.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; +local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; local service = k.core.v1.service; local servicePort = k.core.v1.service.mixin.spec.portsType; diff --git a/jsonnet/kube-prometheus/kube-prometheus-kops.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-kops.libsonnet index 7dbc34db39bd82a7e1c05b7da6cd788aec358926..01b6e2e718c4cae7c47833f0a6364863fb878f17 100644 --- a/jsonnet/kube-prometheus/kube-prometheus-kops.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus-kops.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; +local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; local service = k.core.v1.service; local servicePort = k.core.v1.service.mixin.spec.portsType; diff --git a/jsonnet/kube-prometheus/kube-prometheus-kube-aws.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-kube-aws.libsonnet index abdd764ec242b9b3c5ca146161e274f4e15705a8..23b33c9f1b19467bbc5cc4979818d651eea09821 100644 --- a/jsonnet/kube-prometheus/kube-prometheus-kube-aws.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus-kube-aws.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; +local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; local service = k.core.v1.service; local servicePort = k.core.v1.service.mixin.spec.portsType; diff --git a/jsonnet/kube-prometheus/kube-prometheus-kubeadm.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-kubeadm.libsonnet index e0ddeb856a3575fb211185357bf4e7dea5f4f889..9e497cd671612a1362cc9835acc4c9e4180435c4 100644 --- a/jsonnet/kube-prometheus/kube-prometheus-kubeadm.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus-kubeadm.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; +local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; local service = k.core.v1.service; local servicePort = k.core.v1.service.mixin.spec.portsType; diff --git a/jsonnet/kube-prometheus/kube-prometheus-kubespray.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-kubespray.libsonnet index 7ce075fd030d0a7fe6c3a76123cb4d2cb34d9d62..4cfde11edd6989994c3f6a2dc864f9a09789e316 100644 --- a/jsonnet/kube-prometheus/kube-prometheus-kubespray.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus-kubespray.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; +local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; local service = k.core.v1.service; local servicePort = k.core.v1.service.mixin.spec.portsType; diff --git a/jsonnet/kube-prometheus/kube-prometheus-node-ports.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-node-ports.libsonnet index e34877b0256ecf18639a1cabccc5c6d241f3cc54..b10a1bb4925a886d32a0018fe38d51f3a1e9e7c2 100644 --- a/jsonnet/kube-prometheus/kube-prometheus-node-ports.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus-node-ports.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; +local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; local service = k.core.v1.service; local servicePort = k.core.v1.service.mixin.spec.portsType; diff --git a/jsonnet/kube-prometheus/kube-prometheus-static-etcd.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-static-etcd.libsonnet index 6a2b9552aa598fe292cb534db63a89f9d2bd8c3e..63094f157198d6a5e27e0e7222a831e8376b7cdb 100644 --- a/jsonnet/kube-prometheus/kube-prometheus-static-etcd.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus-static-etcd.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; +local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; (import 'etcd-mixin/mixin.libsonnet') + { _config+:: { diff --git a/jsonnet/kube-prometheus/kube-prometheus-thanos.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-thanos.libsonnet index a74aa9e29757bf2107ff8f39555464d247484d83..68deb4f047302dfae7ef8430e8401e236e912386 100644 --- a/jsonnet/kube-prometheus/kube-prometheus-thanos.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus-thanos.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; +local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; local service = k.core.v1.service; local servicePort = k.core.v1.service.mixin.spec.portsType; diff --git a/jsonnet/kube-prometheus/kube-prometheus.libsonnet b/jsonnet/kube-prometheus/kube-prometheus.libsonnet index ca1772c0cc50024e10e237b3cb82d59fc10704d2..72142b0a4dd8b2e6e319d15ae67aeb07757f03bf 100644 --- a/jsonnet/kube-prometheus/kube-prometheus.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; +local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; local k3 = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; local configMapList = k3.core.v1.configMapList; diff --git a/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet b/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet index 99e7e5f10347576ef5295af569f86660d4368ca4..0e981974bafca461bd36940feb878236e89e0e29 100644 --- a/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet +++ b/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; +local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; { _config+:: { diff --git a/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet b/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet index c04f6ed46c1a41861a3e037c0bba4c8de989740a..f4aa9f479e9774f002d05b5f48c0dac2e833539c 100644 --- a/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet +++ b/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; +local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; { _config+:: { diff --git a/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet b/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet index fb3b6753c21928325522bd34ec994bf50a14d4f8..da0570d6cb19f549bac2c87f501459b5bbdc2e55 100644 --- a/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet +++ b/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; +local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; { _config+:: { diff --git a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet index 7ebeb1a51d0efb0d59f300fac0b1ea4efa3b0cba..9a52f38b83f5d90967af15a44fd8bc14b2d74023 100644 --- a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet +++ b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; +local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; local k3 = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; { diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index ecf65bdd21a109193f944fdcceaa14ce4718dc1b..c0b396732c2c670af19020ffaff85fc85443df0b 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -8,7 +8,11 @@ "subdir": "jsonnet/kube-prometheus" } }, +<<<<<<< HEAD "version": "bedeadb7f5686537b7733096dcbb86ab0f722ce8" +======= + "version": "c5c70e2101c29818d350a3b90ae0e417a5602507" +>>>>>>> Remove extra ksonnet4 dependency }, { "name": "ksonnet", @@ -18,17 +22,7 @@ "subdir": "" } }, - "version": "d03da231d6c8bd74437b74a1e9e8b966f13dffa2" - }, - { - "name": "ksonnet4", - "source": { - "git": { - "remote": "https://github.com/metalmatze/ksonnet-lib", - "subdir": "" - } - }, - "version": "3e10db7d0dce7c175ac03be631001489b5578744" + "version": "0d2f82676817bbf9e4acf6495b2090205f323b9f" }, { "name": "kubernetes-mixin",