refactor: use jaeger-agent-mixin

lib got moved: grafana/jsonnet-libshttps://github.com/grafana/cortex-jsonnet/pull/291 used jb-0.4.0 which updates the jsonnetfile.json format
grafana · Jul 20, 2020 · 366e99c · 366e99c
1 parent dea1138
commit 366e99c
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 19 deletions.
diff --git a/operations/mimir/cortex.libsonnet b/operations/mimir/cortex.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/operations/mimir/jsonnetfile.json b/operations/mimir/jsonnetfile.json
@@ -1,44 +1,51 @@
 {
+  "version": 1,
   "dependencies": [
     {
-      "name": "consul",
       "source": {
         "git": {
-          "remote": "https://github.com/grafana/jsonnet-libs",
+          "remote": "https://github.com/grafana/jsonnet-libs.git",
           "subdir": "consul"
         }
       },
       "version": "master"
     },
     {
-      "name": "etcd-operator",
       "source": {
         "git": {
-          "remote": "https://github.com/grafana/jsonnet-libs",
+          "remote": "https://github.com/grafana/jsonnet-libs.git",
           "subdir": "etcd-operator"
         }
       },
       "version": "master"
     },
     {
-      "name": "ksonnet-util",
       "source": {
         "git": {
-          "remote": "https://github.com/grafana/jsonnet-libs",
+          "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"
     },
     {
-      "name": "memcached",
       "source": {
         "git": {
-          "remote": "https://github.com/grafana/jsonnet-libs",
+          "remote": "https://github.com/grafana/jsonnet-libs.git",
           "subdir": "memcached"
         }
       },
       "version": "master"
     }
-  ]
+  ],
+  "legacyImports": true
 }
diff --git a/operations/mimir/jsonnetfile.lock.json b/operations/mimir/jsonnetfile.lock.json
@@ -1,48 +1,56 @@
 {
+  "version": 1,
   "dependencies": [
     {
-      "name": "consul",
       "source": {
         "git": {
-          "remote": "https://github.com/grafana/jsonnet-libs",
+          "remote": "https://github.com/grafana/jsonnet-libs.git",
           "subdir": "consul"
         }
       },
       "version": "c19a92e586a6752f11745b47f309b13f02ef7147",
       "sum": "qlVBnIShhHEPglAl1xYIAmOP/W8LD0wQmHCT0m9sTLU="
     },
     {
-      "name": "etcd-operator",
       "source": {
         "git": {
-          "remote": "https://github.com/grafana/jsonnet-libs",
+          "remote": "https://github.com/grafana/jsonnet-libs.git",
           "subdir": "etcd-operator"
         }
       },
       "version": "c19a92e586a6752f11745b47f309b13f02ef7147",
       "sum": "RbSlOsk0EBAMOfMOKPBdD0joHN6UKZqeP3zy9LjBQTE="
     },
     {
-      "name": "ksonnet-util",
       "source": {
         "git": {
-          "remote": "https://github.com/grafana/jsonnet-libs",
+          "remote": "https://github.com/grafana/jsonnet-libs.git",
+          "subdir": "jaeger-agent-mixin"
+        }
+      },
+      "version": "65a623593025007ef54549550a3569c0e72f085d",
+      "sum": "DsdBoqgx5kE3zc6fMYnfiGjW2+9Mx2OXFieWm1oFHgY="
+    },
+    {
+      "source": {
+        "git": {
+          "remote": "https://github.com/grafana/jsonnet-libs.git",
           "subdir": "ksonnet-util"
         }
       },
       "version": "c19a92e586a6752f11745b47f309b13f02ef7147",
       "sum": "LKsTTBcH8TXX5ANgRUu5I7Y1tf5le4nANFV3/W53I+c="
     },
     {
-      "name": "memcached",
       "source": {
         "git": {
-          "remote": "https://github.com/grafana/jsonnet-libs",
+          "remote": "https://github.com/grafana/jsonnet-libs.git",
           "subdir": "memcached"
         }
       },
       "version": "c19a92e586a6752f11745b47f309b13f02ef7147",
       "sum": "GQeyWFtqhwM+hGxQbdywWG1PFJ/KmSC1at0hai7AHXU="
     }
-  ]
+  ],
+  "legacyImports": false
 }