*: Use all jsonnet from master branch

prometheus-operator · Jun 7, 2018 · 775781c · 775781c
1 parent e4bef24
commit 775781c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 13 deletions.
diff --git a/contrib/kube-prometheus/jsonnet/kube-prometheus/jsonnetfile.json b/contrib/kube-prometheus/jsonnet/kube-prometheus/jsonnetfile.json
@@ -38,7 +38,7 @@
                     "subdir": "jsonnet/prometheus-operator"
                 }
             },
-            "version": "extract-po-jsonnet"
+            "version": "master"
         }
     ]
 }
diff --git a/hack/generate/jsonnetfile.json b/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": "."
         }
     ]
 }
diff --git a/jsonnet/prometheus-operator/.gitignore b/jsonnet/prometheus-operator/.gitignore
@@ -0,0 +1,2 @@
+vendor/
+jsonnetfile.lock.json
diff --git a/jsonnet/prometheus-operator/jsonnetfile.json b/jsonnet/prometheus-operator/jsonnetfile.json
@@ -0,0 +1,14 @@
+{
+    "dependencies": [
+        {
+            "name": "ksonnet",
+            "source": {
+                "git": {
+                    "remote": "https://github.com/ksonnet/ksonnet-lib",
+                    "subdir": ""
+                }
+            },
+            "version": "master"
+        }
+    ]
+}