Remove extra ksonnet4 dependency

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+:: {

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"
         }
     ]
 }

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;

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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+:: {

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;
 

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;
 

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+:: {

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+:: {

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+:: {

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';
 
 {

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"
+            "version": "0d2f82676817bbf9e4acf6495b2090205f323b9f"
-        },
-        {
-            "name": "ksonnet4",
-            "source": {
-                "git": {
-                    "remote": "https://github.com/metalmatze/ksonnet-lib",
-                    "subdir": ""
-                }
-            },
-            "version": "3e10db7d0dce7c175ac03be631001489b5578744"
         },
         {
             "name": "kubernetes-mixin",