From 9920a27f06b9a808bcd0d7323a55041bc343a8bc Mon Sep 17 00:00:00 2001 From: Trevor Whitney Date: Wed, 1 Feb 2023 14:45:30 -0700 Subject: [PATCH] Update GEL plugin in k3d env to latest (#8378) --- .../k3d/environments/helm-cluster/main.jsonnet | 2 +- .../k3d/environments/helm-cluster/spec.json | 2 +- tools/dev/k3d/jsonnetfile.lock.json | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tools/dev/k3d/environments/helm-cluster/main.jsonnet b/tools/dev/k3d/environments/helm-cluster/main.jsonnet index b95cdfb79b987..ebcd35205d79a 100644 --- a/tools/dev/k3d/environments/helm-cluster/main.jsonnet +++ b/tools/dev/k3d/environments/helm-cluster/main.jsonnet @@ -205,7 +205,7 @@ local tenant = 'loki'; + k.core.v1.secret.metadata.withNamespace('loki'), grafana+: grafana.withEnterpriseLicenseText(importstr '../../secrets/grafana.jwt') + grafana.addPlugin( - 'https://dl.grafana.com/gel/releases/grafana-enterprise-logs-app-v2.6.0.zip;grafana-enterprise-logs-app' + 'https://storage.googleapis.com/grafana-enterprise-logs/dev/grafana-enterprise-logs-app-9515528.zip' ) + { grafana_deployment+: k.apps.v1.deployment.spec.template.spec.withInitContainersMixin([ diff --git a/tools/dev/k3d/environments/helm-cluster/spec.json b/tools/dev/k3d/environments/helm-cluster/spec.json index 702641acd0ec2..de3524e8f0f35 100644 --- a/tools/dev/k3d/environments/helm-cluster/spec.json +++ b/tools/dev/k3d/environments/helm-cluster/spec.json @@ -6,7 +6,7 @@ "namespace": "environments/helm-cluster/main.jsonnet" }, "spec": { - "apiServer": "https://0.0.0.0:43619", + "apiServer": "https://0.0.0.0:38539", "namespace": "k3d-helm-cluster", "resourceDefaults": {}, "expectVersions": {} diff --git a/tools/dev/k3d/jsonnetfile.lock.json b/tools/dev/k3d/jsonnetfile.lock.json index f1fd9bce10aa4..b78b4cb1c1ade 100644 --- a/tools/dev/k3d/jsonnetfile.lock.json +++ b/tools/dev/k3d/jsonnetfile.lock.json @@ -8,7 +8,7 @@ "subdir": "consul" } }, - "version": "09a66a888bfedc6a347a07544bf533fd5975acdb", + "version": "e87aa70c8857d09235fa658a6780e7646a625ce6", "sum": "Po3c1Ic96ngrJCtOazic/7OsLkoILOKZWXWyZWl+od8=" }, { @@ -18,7 +18,7 @@ "subdir": "enterprise-metrics" } }, - "version": "09a66a888bfedc6a347a07544bf533fd5975acdb", + "version": "e87aa70c8857d09235fa658a6780e7646a625ce6", "sum": "hi2ZpHKl7qWXmSZ46sAycjWEQK6oGsoECuDKQT1dA+k=" }, { @@ -28,7 +28,7 @@ "subdir": "etcd-operator" } }, - "version": "09a66a888bfedc6a347a07544bf533fd5975acdb", + "version": "e87aa70c8857d09235fa658a6780e7646a625ce6", "sum": "duHm6wmUju5KHQurOe6dnXoKgl5gTUsfGplgbmAOsHw=" }, { @@ -38,7 +38,7 @@ "subdir": "grafana" } }, - "version": "09a66a888bfedc6a347a07544bf533fd5975acdb", + "version": "e87aa70c8857d09235fa658a6780e7646a625ce6", "sum": "Y5nheroSOIwmE+djEVPq4OvvTxKenzdHhpEwaR3Ebjs=" }, { @@ -48,7 +48,7 @@ "subdir": "jaeger-agent-mixin" } }, - "version": "09a66a888bfedc6a347a07544bf533fd5975acdb", + "version": "e87aa70c8857d09235fa658a6780e7646a625ce6", "sum": "nsukyr2SS8h97I2mxvBazXZp2fxu1i6eg+rKq3/NRwY=" }, { @@ -58,7 +58,7 @@ "subdir": "ksonnet-util" } }, - "version": "09a66a888bfedc6a347a07544bf533fd5975acdb", + "version": "e87aa70c8857d09235fa658a6780e7646a625ce6", "sum": "/pkNOLhRqvQoPA0yYdUuJvpPHqhkCLauAUMD2ZHMIkE=" }, { @@ -78,7 +78,7 @@ "subdir": "memcached" } }, - "version": "09a66a888bfedc6a347a07544bf533fd5975acdb", + "version": "e87aa70c8857d09235fa658a6780e7646a625ce6", "sum": "SWywAq4U0MRPMbASU0Ez8O9ArRNeoZzb75sEuReueow=" }, { @@ -88,7 +88,7 @@ "subdir": "tanka-util" } }, - "version": "09a66a888bfedc6a347a07544bf533fd5975acdb", + "version": "e87aa70c8857d09235fa658a6780e7646a625ce6", "sum": "ShSIissXdvCy1izTCDZX6tY7qxCoepE5L+WJ52Hw7ZQ=" }, { @@ -108,7 +108,7 @@ "subdir": "doc-util" } }, - "version": "37dd4fbc103ef9beff67a7c205b60753c0172431", + "version": "01f689fb4a2d93f0fa4415491e95ea3ca641d6d8", "sum": "yRBlDzGmyJ4eTdfftx51XrRW1fcBrtym+/yJENZywyE=" }, {