refactor: moved jaeger-agent-mixin (#2377)

* refactor: use jaeger-agent-mixin lib got moved: grafana/jsonnet-libs#291 used jb-0.4.0 which updates the jsonnetfile.json format * refactor: use jb-0.4.0 jsonnetfile.json format
grafana · Jul 20, 2020 · 96515e3 · 96515e3
1 parent 81c7bd3
commit 96515e3
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 54 deletions.
diff --git a/production/ksonnet/loki-canary/jsonnetfile.json b/production/ksonnet/loki-canary/jsonnetfile.json
@@ -1,14 +1,15 @@
 {
-    "dependencies": [
-        {
-            "name": "ksonnet-util",
-            "source": {
-                "git": {
-                    "remote": "https://github.com/grafana/jsonnet-libs",
-                    "subdir": "ksonnet-util"
-                }
-            },
-            "version": "master"
+  "version": 1,
+  "dependencies": [
+    {
+      "source": {
+        "git": {
+          "remote": "https://github.com/grafana/jsonnet-libs.git",
+          "subdir": "ksonnet-util"
         }
-    ]
+      },
+      "version": "master"
+    }
+  ],
+  "legacyImports": true
 }
diff --git a/production/ksonnet/loki/jsonnetfile.json b/production/ksonnet/loki/jsonnetfile.json
@@ -1,34 +1,42 @@
 {
-    "dependencies": [
-        {
-            "name": "ksonnet-util",
-            "source": {
-                "git": {
-                    "remote": "https://github.com/grafana/jsonnet-libs",
-                    "subdir": "ksonnet-util"
-                }
-            },
-            "version": "master"
-        },
-        {
-            "name": "consul",
-            "source": {
-                "git": {
-                    "remote": "https://github.com/grafana/jsonnet-libs",
-                    "subdir": "consul"
-                }
-            },
-            "version": "master"
-        },
-        {
-            "name": "memcached",
-            "source": {
-                "git": {
-                    "remote": "https://github.com/grafana/jsonnet-libs",
-                    "subdir": "memcached"
-                }
-            },
-            "version": "master"
+  "version": 1,
+  "dependencies": [
+    {
+      "source": {
+        "git": {
+          "remote": "https://github.com/grafana/jsonnet-libs.git",
+          "subdir": "consul"
         }
-    ]
+      },
+      "version": "master"
+    },
+    {
+      "source": {
+        "git": {
+          "remote": "https://github.com/grafana/jsonnet-libs.git",
+          "subdir": "jaeger-agent-mixin"
+        }
+      },
+      "version": "master"
+    },
+    {
+      "source": {
+        "git": {
+          "remote": "https://github.com/grafana/jsonnet-libs.git",
+          "subdir": "ksonnet-util"
+        }
+      },
+      "version": "master"
+    },
+    {
+      "source": {
+        "git": {
+          "remote": "https://github.com/grafana/jsonnet-libs.git",
+          "subdir": "memcached"
+        }
+      },
+      "version": "master"
+    }
+  ],
+  "legacyImports": true
 }
diff --git a/production/ksonnet/loki/loki.libsonnet b/production/ksonnet/loki/loki.libsonnet
@@ -1,5 +1,5 @@
 (import 'ksonnet-util/kausal.libsonnet') +
-(import 'ksonnet-util/jaeger.libsonnet') +
+(import 'jaeger-agent-mixin/jaeger.libsonnet') +
 (import 'images.libsonnet') +
 (import 'common.libsonnet') +
 (import 'config.libsonnet') +

diff --git a/production/ksonnet/promtail/jsonnetfile.json b/production/ksonnet/promtail/jsonnetfile.json
@@ -1,14 +1,15 @@
 {
-    "dependencies": [
-        {
-            "name": "ksonnet-util",
-            "source": {
-                "git": {
-                    "remote": "https://github.com/grafana/jsonnet-libs",
-                    "subdir": "ksonnet-util"
-                }
-            },
-            "version": "master"
+  "version": 1,
+  "dependencies": [
+    {
+      "source": {
+        "git": {
+          "remote": "https://github.com/grafana/jsonnet-libs.git",
+          "subdir": "ksonnet-util"
         }
-    ]
+      },
+      "version": "master"
+    }
+  ],
+  "legacyImports": true
 }