Move kube-manifests/ to jsonnet-compiled/ (#1454)

* Move kube-manifests/ to jsonnet-compiled/

Signed-off-by: Marco Pracucci <[email protected]>

* Fixed Makefile target

Signed-off-by: Marco Pracucci <[email protected]>

.github/workflows/ci.yml

@@ -136,7 +136,7 @@ jobs:
         run: make vendor-check
 
   tempo-mixin:
-    name: Check kube-manifests & tempo-mixin
+    name: Check jsonnet & tempo-mixin
     runs-on: ubuntu-latest
     steps:
       - name: Set up Go 1.17
@@ -158,8 +158,8 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v2
 
-      - name: Check kube-manifests
-        run: make kube-manifests-check
+      - name: Check jsonnet
+        run: make jsonnet-check
 
       - name: Check tempo-mixin
         run: make tempo-mixin-check

Makefile

@@ -225,13 +225,13 @@ docs-test:
 	docker pull ${DOCS_IMAGE}
 	docker run -v ${PWD}/docs/tempo/website:/hugo/content/docs/tempo/latest:z -p 3002:3002 --rm $(DOCS_IMAGE) /bin/bash -c 'mkdir -p content/docs/grafana/latest/ && touch content/docs/grafana/latest/menu.yaml && make prod'
 
-### kube-manifests
-.PHONY: kube-manifests kube-manifests-check
-kube-manifests:
-	$(MAKE) -C operations/kube-manifests/util gen
+### jsonnet
+.PHONY: jsonnet jsonnet-check
+jsonnet:
+	$(MAKE) -C operations/jsonnet-compiled/util gen
 
-kube-manifests-check:
-	$(MAKE) -C operations/kube-manifests/util check
+jsonnet-check:
+	$(MAKE) -C operations/jsonnet-compiled/util check
 
 
 ### serverless

docs/tempo/website/operations/deployment.md

@@ -33,7 +33,7 @@ Helm charts are available in the grafana/helm-charts repo:
 ## Kubernetes manifests
 
 You can find a collection of Kubernetes manifests to deploy Tempo in the
-[operations/kube-manifests](https://github.com/grafana/tempo/tree/main/operations/kube-manifests)
+[operations/jsonnet-compiled](https://github.com/grafana/tempo/tree/main/operations/jsonnet-compiled)
 folder.  These are generated using the Tanka / Jsonnet.
 
 # Deployment scenarios

operations/kube-manifests/util/README.md → operations/jsonnet-compiled/util/README.md

@@ -1,6 +1,6 @@
-# kube-manifests
+# jsonnet-compiled
 
-Example Kubernetes manifests to deploy Tempo distributed.
+Example Kubernetes manifests to deploy Tempo using Jsonnet.
 
 ### Build
 

operations/kube-manifests/util/example/main.jsonnet → operations/jsonnet-compiled/util/example/main.jsonnet

@@ -1,4 +1,4 @@
-// The jsonnet file used to generate these kube-manifests
+// The jsonnet file used to generate the Kubernetes manifests.
 
 local tempo = import 'microservices/tempo.libsonnet';