From 96515e31166f79cf552dd9d5ef226ccedebfa562 Mon Sep 17 00:00:00 2001 From: Jeroen Op 't Eynde Date: Mon, 20 Jul 2020 16:34:45 +0200 Subject: [PATCH] refactor: moved jaeger-agent-mixin (#2377) * refactor: use jaeger-agent-mixin lib got moved: https://github.com/grafana/jsonnet-libs/pull/291 used jb-0.4.0 which updates the jsonnetfile.json format * refactor: use jb-0.4.0 jsonnetfile.json format --- .../ksonnet/loki-canary/jsonnetfile.json | 23 +++--- production/ksonnet/loki/jsonnetfile.json | 70 +++++++++++-------- production/ksonnet/loki/loki.libsonnet | 2 +- production/ksonnet/promtail/jsonnetfile.json | 23 +++--- 4 files changed, 64 insertions(+), 54 deletions(-) diff --git a/production/ksonnet/loki-canary/jsonnetfile.json b/production/ksonnet/loki-canary/jsonnetfile.json index c903ac17c07c9..44f04bb797bba 100644 --- 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 index 7f40dd6152e7d..c46c23f64def6 100644 --- 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 index 6cc7add7cdbaa..7714b6ee4300f 100644 --- 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 index c903ac17c07c9..44f04bb797bba 100644 --- 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 }