Merge pull request #1449 from brancz/jsonnet-master

*: Use all jsonnet from master branch

contrib/kube-prometheus/jsonnet/kube-prometheus/jsonnetfile.json

@@ -38,7 +38,7 @@
                     "subdir": "jsonnet/prometheus-operator"
                 }
             },
-            "version": "extract-po-jsonnet"
+            "version": "master"
         }
     ]
 }

hack/generate/jsonnetfile.json

@@ -1,24 +1,14 @@
 {
     "dependencies": [
-        {
-            "name": "ksonnet",
-            "source": {
-                "git": {
-                    "remote": "https://github.com/ksonnet/ksonnet-lib",
-                    "subdir": ""
-                }
-            },
-            "version": "master"
-        },
         {
             "name": "prometheus-operator",
             "source": {
                 "git": {
-                    "remote": "https://github.com/coreos/prometheus-operator",
+                    "remote": "../../",
                     "subdir": "jsonnet/prometheus-operator"
                 }
             },
-            "version": "extract-po-jsonnet"
+            "version": "."
         }
     ]
 }

jsonnet/prometheus-operator/.gitignore

@@ -0,0 +1,2 @@
+vendor/
+jsonnetfile.lock.json

jsonnet/prometheus-operator/jsonnetfile.json

@@ -0,0 +1,14 @@
+{
+    "dependencies": [
+        {
+            "name": "ksonnet",
+            "source": {
+                "git": {
+                    "remote": "https://github.com/ksonnet/ksonnet-lib",
+                    "subdir": ""
+                }
+            },
+            "version": "master"
+        }
+    ]
+}