logs: bump jsonnet dep to start using ConfigMap and Services from

loki.mixins Signed-off-by: JoaoBraveCoding <[email protected]>
rhobs · Apr 11, 2023 · 6114895 · 6114895
1 parent 064bba6
commit 6114895
Show file tree

Hide file tree

Showing 9 changed files with 220 additions and 265 deletions.
diff --git a/Makefile b/Makefile
@@ -34,7 +34,7 @@ format: $(JSONNET_SRC) $(JSONNETFMT) go-format
 .PHONY: lint
 lint: $(JSONNET_LINT) $(JSONNET_VENDOR_DIR) go-lint
 	@echo ">>>>> Running linter"
-	echo ${JSONNET_SRC} | $(XARGS) -n 1 -- $(JSONNET_LINT) -J "$(JSONNET_VENDOR_DIR)"
+	echo ${JSONNET_SRC} | $(XARGS) -n 1 -- $(JSONNET_LINT) -J "$(JSONNET_VENDOR_DIR)" -J lib
 
 .PHONY: go-lint
 go-lint: ## Runs various static analysis against our code.
@@ -157,15 +157,15 @@ resources/services/observatorium-tenants-template.yaml: services/observatorium-t
 
 resources/services/observatorium-template.yaml: resources/.tmp/tenants/rbac.json services/observatorium.libsonnet services/observatorium-template.jsonnet $(JSONNET) $(GOJSONTOYAML) $(JSONNETFMT)
 	@echo ">>>>> Running observatorium templates"
-	$(JSONNET) -J "$(JSONNET_VENDOR_DIR)" services/observatorium-template.jsonnet | $(GOJSONTOYAML) > $@
+	$(JSONNET) -J "$(JSONNET_VENDOR_DIR)" -J lib services/observatorium-template.jsonnet | $(GOJSONTOYAML) > $@
 
 resources/services/observatorium-metrics-template.yaml: $(wildcard services/observatorium-metrics-*) $(JSONNET) $(GOJSONTOYAML) $(JSONNETFMT)
 	@echo ">>>>> Running observatorium-metrics templates"
 	$(JSONNET) -J "$(JSONNET_VENDOR_DIR)" services/observatorium-metrics-template.jsonnet | $(GOJSONTOYAML) > $@
 
 resources/services/observatorium-logs-template.yaml: $(wildcard services/observatorium-logs-*) $(JSONNET) $(GOJSONTOYAML) $(JSONNETFMT)
 	@echo ">>>>> Running observatorium-logs templates"
-	$(JSONNET) -J "$(JSONNET_VENDOR_DIR)" services/observatorium-logs-template.jsonnet | $(GOJSONTOYAML) > $@
+	$(JSONNET) -J "$(JSONNET_VENDOR_DIR)" -J lib services/observatorium-logs-template.jsonnet | $(GOJSONTOYAML) > $@
 
 resources/services/observatorium-traces-template.yaml: $(wildcard services/observatorium-traces-*) $(JSONNET) $(GOJSONTOYAML) $(JSONNETFMT)
 	@echo ">>>>> Running observatorium-traces templates"

diff --git a/jsonnetfile.json b/jsonnetfile.json
@@ -37,6 +37,15 @@
       },
       "version": "master"
     },
+    {
+      "source": {
+        "git": {
+          "remote": "https://github.com/jsonnet-libs/docsonnet.git",
+          "subdir": "doc-util"
+        }
+      },
+      "version": "master"
+    },
     {
       "source": {
         "git": {
@@ -142,4 +151,4 @@
     }
   ],
   "legacyImports": true
-}
+}
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
@@ -51,6 +51,16 @@
       "version": "6db00c292d3a1c71661fc875f90e0ec7caa538c2",
       "sum": "gCtR9s/4D5fxU9aKXg0Bru+/njZhA0YjLjPiASc61FM="
     },
+    {
+      "source": {
+        "git": {
+          "remote": "https://github.com/grafana/jsonnet-libs.git",
+          "subdir": "consul"
+        }
+      },
+      "version": "18a7aa2cd2154057a16d4667f6b1debda8bc50a6",
+      "sum": "Po3c1Ic96ngrJCtOazic/7OsLkoILOKZWXWyZWl+od8="
+    },
     {
       "source": {
         "git": {
@@ -61,6 +71,36 @@
       "version": "4d4b5b1ce01003547a110f93cc86b8b7afb282a6",
       "sum": "GRf2GvwEU4jhXV+JOonXSZ4wdDv8mnHBPCQ6TUVd+g8="
     },
+    {
+      "source": {
+        "git": {
+          "remote": "https://github.com/grafana/jsonnet-libs.git",
+          "subdir": "jaeger-agent-mixin"
+        }
+      },
+      "version": "18a7aa2cd2154057a16d4667f6b1debda8bc50a6",
+      "sum": "nsukyr2SS8h97I2mxvBazXZp2fxu1i6eg+rKq3/NRwY="
+    },
+    {
+      "source": {
+        "git": {
+          "remote": "https://github.com/grafana/jsonnet-libs.git",
+          "subdir": "ksonnet-util"
+        }
+      },
+      "version": "18a7aa2cd2154057a16d4667f6b1debda8bc50a6",
+      "sum": "0y3AFX9LQSpfWTxWKSwoLgbt0Wc9nnCwhMH2szKzHv0="
+    },
+    {
+      "source": {
+        "git": {
+          "remote": "https://github.com/grafana/jsonnet-libs.git",
+          "subdir": "memcached"
+        }
+      },
+      "version": "18a7aa2cd2154057a16d4667f6b1debda8bc50a6",
+      "sum": "SWywAq4U0MRPMbASU0Ez8O9ArRNeoZzb75sEuReueow="
+    },
     {
       "source": {
         "git": {
@@ -81,6 +121,16 @@
       "version": "881db2241f0c5007c3e831caf34b0c645202b4ab",
       "sum": "Je2SxBKu+1WrKEEG60zjSKaY/6TPX8uRz5bsaw0a8oA="
     },
+    {
+      "source": {
+        "git": {
+          "remote": "https://github.com/grafana/loki.git",
+          "subdir": "production/ksonnet/loki"
+        }
+      },
+      "version": "ea14d1348e5a3ae7ed075a5fc0b0b93304bb2ebd",
+      "sum": "i2I9UmJ1Etvw2QsHyi0zJ6PQMKwR+1X/Ohs1jmKEV24="
+    },
     {
       "source": {
         "git": {
@@ -111,6 +161,26 @@
       "version": "6f8fe448c7a021bbdac78e5d848e2fb7346a1d99",
       "sum": "U/RwaRP/ps+5dVyeVxeFEb2psfZHQgEjHU2Jeb454Kg="
     },
+    {
+      "source": {
+        "git": {
+          "remote": "https://github.com/jsonnet-libs/docsonnet.git",
+          "subdir": "doc-util"
+        }
+      },
+      "version": "2eae33a828320269c42acf38e808479a33e416db",
+      "sum": "lppHbNARpG3YTpuSv94X9TyIE9TfV3CyTVceIHSRxpc="
+    },
+    {
+      "source": {
+        "git": {
+          "remote": "https://github.com/jsonnet-libs/k8s-libsonnet.git",
+          "subdir": "1.26"
+        }
+      },
+      "version": "9e5b48eee32913938d3cac30f183b49ecd9fe13a",
+      "sum": "7pl3HQqiKg4zJ0dWFqMo9yMGDEvlVdxgPGr1rMm0/LE="
+    },
     {
       "source": {
         "git": {
@@ -170,8 +240,8 @@
           "subdir": "configuration"
         }
       },
-      "version": "361c20e9bbc6533e10e1582fa0e88c378818018b",
-      "sum": "l1Xz/Hs/ba0wdjugaK90fCxqy2DuW8sMY95HuR0/QHI="
+      "version": "5dddfa3082e9f02c2f44b13332ddfe9574fb6ef6",
+      "sum": "Kyp8MKBlUoqJhKb8MQ6QfwwE/BEMIO5MlF1f0Zb/Szs="
     },
     {
       "source": {

diff --git a/lib/k.libsonnet b/lib/k.libsonnet
@@ -0,0 +1 @@
+(import 'github.com/jsonnet-libs/k8s-libsonnet/1.26/main.libsonnet')