init push to plural for testing

Signed-off-by: David van der Spek <vanderspek.david@gmail.com>
pluralsh · Jun 19, 2023 · 7d97372 · 7d97372
1 parent 9ff0792
commit 7d97372
Show file tree

Hide file tree

Showing 11 changed files with 49 additions and 32 deletions.
diff --git a/tempo/helm/tempo/Chart.lock b/tempo/helm/tempo/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: tempo-distributed
   repository: https://grafana.github.io/helm-charts
-  version: 0.27.9
-digest: sha256:f6d5bd28384135283663e2fcc97d19f108c5c3a4736831a09c9d7588d7f11a1b
-generated: "2022-11-22T17:11:19.255991+01:00"
+  version: 1.4.2
+digest: sha256:30034397ef5b154779ac5e723bf64b00210af56e34b6aa1d804ed854505fe2e5
+generated: "2023-06-19T12:15:16.257723+02:00"
diff --git a/tempo/helm/tempo/Chart.yaml b/tempo/helm/tempo/Chart.yaml
@@ -3,8 +3,8 @@ name: tempo
 description: A Helm chart for Kubernetes
 type: application
 version: 0.1.0
-appVersion: "1.5.0"
+appVersion: "2.1.1"
 dependencies:
 - name: tempo-distributed
-  version: 0.27.9
+  version: 1.4.2
   repository: https://grafana.github.io/helm-charts
diff --git a/tempo/helm/tempo/charts/tempo-distributed-0.27.9.tgz b/tempo/helm/tempo/charts/tempo-distributed-0.27.9.tgz
diff --git a/tempo/helm/tempo/charts/tempo-distributed-1.4.2.tgz b/tempo/helm/tempo/charts/tempo-distributed-1.4.2.tgz
diff --git a/tempo/helm/tempo/templates/azure.yaml b/tempo/helm/tempo/templates/azure.yaml
@@ -7,8 +7,8 @@ metadata:
     aadpodidentity.k8s.io/Behavior: namespaced
 spec:
   type: 0
-  resourceID: {{ .Values.externalDnsIdentityId }}
-  clientID: {{ .Values.externalDnsIdentityClientId }}
+  resourceID: {{ .Values.tempoStorageIdentityId }}
+  clientID: {{ .Values.tempoStorageIdentityClientId }}
 ---
 apiVersion: "aadpodidentity.k8s.io/v1"
 kind: AzureIdentityBinding

diff --git a/tempo/helm/tempo/templates/grafana-datasource.yaml b/tempo/helm/tempo/templates/grafana-datasource.yaml
@@ -1,3 +1,4 @@
+{{ $dict := dict "ctx" . "component" "query-frontend" }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -14,7 +15,7 @@ data:
       access: proxy
       orgId: 1
       uid: tempo
-      url: http://.{{ .Release.Namespace }}:3100
+      url: http://{{ template "tempo.resourceName" $dict }}.{{ .Release.Namespace }}:3100
       jsonData:
         tracesToLogs:
           {{- if eq .Values.lokiMode "distributed" }}

diff --git a/tempo/helm/tempo/values.yaml b/tempo/helm/tempo/values.yaml
@@ -6,37 +6,52 @@ tempoStorageIdentityClientId: ""
 lokiMode: simple
 
 tempo-distributed:
+  multitenancyEnabled: true
   tempo:
     image:
       registry: dkr.plural.sh
-      repository: grafana-tempo/docker.io/grafana/tempo
+      repository: tempo/grafana/tempo
+      tag: 2.1.1
   queryFrontend:
     query:
       image:
-        repository: grafana-tempo/docker.io/grafana/tempo-query
-  serviceAccount:
-    name: grafana-tempo
+        registry: dkr.plural.sh
+        repository: tempo/grafana/tempo-query
+        tag: 2.1.1
+  # serviceAccount:
+  #   name: grafana-tempo # TODO: check IRSA and GCP workload identity
   traces:
     jaeger:
-      grpc: true
-    zipkin: true
+      grpc:
+        enabled: true
+      thriftBinary:
+        enabled: true
+      thriftCompact:
+        enabled: true
+      thriftHttp:
+        enabled: true
+    zipkin:
+      enabled: true
     otlp:
-      http: true
-      grpc: true
-    opencensus: true
+      http:
+        enabled: true
+      grpc:
+        enabled: true
+    opencensus:
+      enabled: true
   storage:
     trace:
-      cache: redis
-      redis:
-        endpoint: ""
-        db: 5
-        password: ""
+      # cache: redis
+      # redis:
+      #   endpoint: ""
+      #   db: 5
+      #   password: ""
       memcached:
         consistent_hash: true
-        host: grafana-tempo-tempo-distributed-memcached
+        host: tempo-tempo-distributed-memcached
         service: memcached-client
         timeout: 500ms
   serviceMonitor:
     enabled: true
   memcached:
-    enabled: false
+    enabled: true
diff --git a/tempo/plural/recipes/grafana-tempo-aws.yaml b/tempo/plural/recipes/grafana-tempo-aws.yaml
@@ -6,8 +6,8 @@ private: true
 dependencies:
 - repo: bootstrap
   name: aws-k8s
-- repo: redis
-  name: aws-redis
+# - repo: redis
+#   name: aws-redis
 sections:
 - name: tempo
   configuration:

diff --git a/tempo/plural/recipes/grafana-tempo-azure.yaml b/tempo/plural/recipes/grafana-tempo-azure.yaml
@@ -6,8 +6,8 @@ private: true
 dependencies:
 - repo: bootstrap
   name: azure-k8s
-- repo: redis
-  name: azure-redis
+# - repo: redis
+#   name: azure-redis
 sections:
 - name: tempo
   configuration:

diff --git a/tempo/plural/recipes/grafana-tempo-gcp.yaml b/tempo/plural/recipes/grafana-tempo-gcp.yaml
@@ -6,8 +6,8 @@ private: true
 dependencies:
 - repo: bootstrap
   name: gcp-k8s
-- repo: redis
-  name: gcp-redis
+# - repo: redis
+#   name: gcp-redis
 sections:
 - name: tempo
   configuration:

diff --git a/tempo/vendor_images.yaml b/tempo/vendor_images.yaml
@@ -1,4 +1,5 @@
 docker.io:
   images-by-tag-regex:
-    grafana/tempo-query: ^v?[0-9]+\.[0-9]+?\.[0-9]+$
-    grafana/tempo: ^v?[0-9]+\.[0-9]+?\.[0-9]+$
+    # the below regex can be used to limit the regex range so that only versions >= 2.1.0 are matched
+    grafana/tempo-query: (?:^v?2\.(?:[1-9]|[1-9][0-9]{1,})+?\.[0-9]+$)|(?:^v?[3-9]+\.[0-9]+?\.[0-9]+$)
+    grafana/tempo: (?:^v?2\.(?:[1-9]|[1-9][0-9]{1,})+?\.[0-9]+$)|(?:^v?[3-9]+\.[0-9]+?\.[0-9]+$)