From 5b5c4895003308409ccc87dd5db03ddb9e488f9c Mon Sep 17 00:00:00 2001 From: dbluxo <20679842+dbluxo@users.noreply.github.com> Date: Fri, 16 Feb 2024 14:08:16 +0100 Subject: [PATCH 01/15] feat: add possibility to set resources for the testframework container Signed-off-by: dbluxo <20679842+dbluxo@users.noreply.github.com> --- charts/grafana/Chart.yaml | 2 +- charts/grafana/templates/tests/test.yaml | 4 ++++ charts/grafana/values.yaml | 7 +++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index c027fc1ade..922f932ca3 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 7.3.0 +version: 7.3.1 appVersion: 10.3.1 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. diff --git a/charts/grafana/templates/tests/test.yaml b/charts/grafana/templates/tests/test.yaml index 15067ae307..9e88afcfa0 100644 --- a/charts/grafana/templates/tests/test.yaml +++ b/charts/grafana/templates/tests/test.yaml @@ -41,6 +41,10 @@ spec: - mountPath: /tests name: tests readOnly: true + {{- with .Values.testFramework.resources }} + resources: + {{- toYaml . | nindent 8 }} + {{- end }} volumes: - name: tests configMap: diff --git a/charts/grafana/values.yaml b/charts/grafana/values.yaml index ab853e09c7..cc6e9aec78 100644 --- a/charts/grafana/values.yaml +++ b/charts/grafana/values.yaml @@ -115,6 +115,13 @@ testFramework: tag: "v1.4.1" imagePullPolicy: IfNotPresent securityContext: {} + resources: {} + # limits: + # cpu: 100m + # memory: 128Mi + # requests: + # cpu: 100m + # memory: 128Mi # dns configuration for pod dnsPolicy: ~ From eb62f384704453389d96d5758563b65289515291 Mon Sep 17 00:00:00 2001 From: Gritzko Daniel Kleiner Date: Sun, 31 Mar 2024 16:32:02 +0200 Subject: [PATCH 02/15] chore: related issues: - #2558 - #2493 - #1391 - #2126 Signed-off-by: Gritzko Daniel Kleiner --- charts/grafana/Chart.yaml | 2 +- charts/grafana/templates/_helpers.tpl | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index ab3f6a3636..7127c28b43 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 7.3.7 +version: 7.3.8 appVersion: 10.4.0 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. diff --git a/charts/grafana/templates/_helpers.tpl b/charts/grafana/templates/_helpers.tpl index 790d5a293a..570b92742c 100644 --- a/charts/grafana/templates/_helpers.tpl +++ b/charts/grafana/templates/_helpers.tpl @@ -145,13 +145,11 @@ Return the appropriate apiVersion for ingress. Return the appropriate apiVersion for Horizontal Pod Autoscaler. */}} {{- define "grafana.hpa.apiVersion" -}} -{{- if $.Capabilities.APIVersions.Has "autoscaling/v2/HorizontalPodAutoscaler" }} -{{- print "autoscaling/v2" }} -{{- else if $.Capabilities.APIVersions.Has "autoscaling/v2beta2/HorizontalPodAutoscaler" }} -{{- print "autoscaling/v2beta2" }} -{{- else }} -{{- print "autoscaling/v2beta1" }} -{{- end }} + {{- if .Capabilities.APIVersions.Has "autoscaling/v2" }} + {{- "autoscaling/v2" }} + {{- else }} + {{- "autoscaling/v2beta2" }} + {{- end }} {{- end }} {{/* From 32ac08b9dd50f16d0a544f754f739089bac398fc Mon Sep 17 00:00:00 2001 From: Gritzko Daniel Kleiner Date: Tue, 9 Apr 2024 08:33:06 -0300 Subject: [PATCH 03/15] include review suggested by @zanhsieh Signed-off-by: Gritzko Daniel Kleiner --- charts/grafana/templates/_helpers.tpl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/charts/grafana/templates/_helpers.tpl b/charts/grafana/templates/_helpers.tpl index 570b92742c..f3ebc37c93 100644 --- a/charts/grafana/templates/_helpers.tpl +++ b/charts/grafana/templates/_helpers.tpl @@ -145,11 +145,11 @@ Return the appropriate apiVersion for ingress. Return the appropriate apiVersion for Horizontal Pod Autoscaler. */}} {{- define "grafana.hpa.apiVersion" -}} - {{- if .Capabilities.APIVersions.Has "autoscaling/v2" }} - {{- "autoscaling/v2" }} - {{- else }} - {{- "autoscaling/v2beta2" }} - {{- end }} +{{- if .Capabilities.APIVersions.Has "autoscaling/v2" }} +{{- print "autoscaling/v2" }} +{{- else }} +{{- print "autoscaling/v2beta2" }} +{{- end }} {{- end }} {{/* From 3acbc5d03830bf750808d58966f9a38656fcb978 Mon Sep 17 00:00:00 2001 From: Gritzko Daniel Kleiner Date: Fri, 19 Apr 2024 10:30:46 -0300 Subject: [PATCH 04/15] bumb chart version Signed-off-by: Gritzko Daniel Kleiner --- charts/grafana/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index efd3bd081c..167bdf17a8 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 7.3.9 +version: 7.3.8 appVersion: 10.4.1 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. From 6db205c65da69139b3740a215394f8c98e1b4eb5 Mon Sep 17 00:00:00 2001 From: Gritzko Daniel Kleiner Date: Fri, 19 Apr 2024 10:31:29 -0300 Subject: [PATCH 05/15] fix: chart bumb Signed-off-by: Gritzko Daniel Kleiner --- charts/grafana/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index 167bdf17a8..3e9fcac6f2 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 7.3.8 +version: 7.3.10 appVersion: 10.4.1 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. From bcc6ecfdd933b4801bae6beff1568097c87f6fcf Mon Sep 17 00:00:00 2001 From: Jordan Simonovski Date: Fri, 3 May 2024 15:35:34 +1000 Subject: [PATCH 06/15] fix invalid selector configuration for tokengenjob Signed-off-by: Jordan Simonovski --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 2 +- charts/tempo-distributed/templates/tokengen/tokengen-job.yaml | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 81d86e75fc..92117a4c59 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.9.5 +version: 1.9.6 appVersion: 2.4.1 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index c74b45a53f..395f3f5d8c 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.9.5](https://img.shields.io/badge/Version-1.9.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.1](https://img.shields.io/badge/AppVersion-2.4.1-informational?style=flat-square) +![Version: 1.9.6](https://img.shields.io/badge/Version-1.9.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.1](https://img.shields.io/badge/AppVersion-2.4.1-informational?style=flat-square) Grafana Tempo in MicroService mode diff --git a/charts/tempo-distributed/templates/tokengen/tokengen-job.yaml b/charts/tempo-distributed/templates/tokengen/tokengen-job.yaml index c516237ab5..8e727e9d57 100644 --- a/charts/tempo-distributed/templates/tokengen/tokengen-job.yaml +++ b/charts/tempo-distributed/templates/tokengen/tokengen-job.yaml @@ -18,6 +18,8 @@ spec: completions: 1 parallelism: 1 selector: + matchLabels: + {{- include "tempo.selectorLabels" $dict | nindent 6 }} template: metadata: labels: From 3fbc19b1499c7ac180b9949f14fb015a5ee58327 Mon Sep 17 00:00:00 2001 From: Vladimir Varankin Date: Fri, 3 May 2024 13:01:17 +0200 Subject: [PATCH 07/15] don't hardcode helm charts dependencies Signed-off-by: Vladimir Varankin --- .github/workflows/update-helm-repo.yaml | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/.github/workflows/update-helm-repo.yaml b/.github/workflows/update-helm-repo.yaml index 883f675808..afc937ae24 100644 --- a/.github/workflows/update-helm-repo.yaml +++ b/.github/workflows/update-helm-repo.yaml @@ -145,19 +145,6 @@ jobs: with: version: v3.5.2 - - name: Add dependency chart repos - # Todo replace this by https://github.com/grafana/helm-charts/issues/1534 - run: | - helm repo add elastic https://helm.elastic.co - helm repo add grafana https://grafana.github.io/helm-charts - helm repo add prometheus https://prometheus-community.github.io/helm-charts - helm repo add bitnami https://charts.bitnami.com/bitnami - helm repo add bitnami-pre-2022 https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami - helm repo add hashicorp https://helm.releases.hashicorp.com - helm repo add minio-new https://charts.min.io - helm repo add jetstack https://charts.jetstack.io - helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx - - name: Parse Chart.yaml id: parse-chart run: | @@ -175,6 +162,18 @@ jobs: fi echo "packagename=${name}-${version}" >> $GITHUB_OUTPUT + - name: Add dependency chart repos + run: | + cd source + # Skip the header line and make sure that tabs are expanded into spaces + deps=$(helm dependency list "${{ steps.parse-chart.outputs.chartpath }}" | tail +2 | expand) + while read -r row; do + IFS=' ' read -ra parts <<< "$row" + name="${parts[0]}" + repo="${parts[2]}" + helm repo add "$name" "$repo" + done <<< "$deps" + - name: Install CR tool run: | mkdir "${CR_TOOL_PATH}" From 90ed5301175ff0714070587d1e6c8d91eb166ad4 Mon Sep 17 00:00:00 2001 From: Joe Elliott Date: Fri, 3 May 2024 14:38:22 -0400 Subject: [PATCH 08/15] remove example name Signed-off-by: Joe Elliott --- charts/tempo-distributed/README.md | 2 +- charts/tempo-distributed/README.md.gotmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 395f3f5d8c..05928f27b1 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -924,7 +924,7 @@ config: | backend: s3 s3: access_key: tempo - bucket: tempo + bucket: endpoint: minio:9000 insecure: true secret_key: supersecret diff --git a/charts/tempo-distributed/README.md.gotmpl b/charts/tempo-distributed/README.md.gotmpl index 72219e0359..446c654362 100644 --- a/charts/tempo-distributed/README.md.gotmpl +++ b/charts/tempo-distributed/README.md.gotmpl @@ -323,7 +323,7 @@ config: | backend: s3 s3: access_key: tempo - bucket: tempo + bucket: endpoint: minio:9000 insecure: true secret_key: supersecret From 2f5503153ec965c2a5796f4e41e17e4f672e153b Mon Sep 17 00:00:00 2001 From: Joe Elliott Date: Fri, 3 May 2024 14:39:22 -0400 Subject: [PATCH 09/15] remove bucket from comment Signed-off-by: Joe Elliott --- charts/tempo/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tempo/values.yaml b/charts/tempo/values.yaml index e0a521d8e3..f19418fb52 100644 --- a/charts/tempo/values.yaml +++ b/charts/tempo/values.yaml @@ -66,7 +66,7 @@ tempo: # backend: s3 # store traces in s3 # s3: - # bucket: tempo # store traces in this bucket + # bucket: # store traces in this bucket # endpoint: s3.dualstack.us-east-2.amazonaws.com # api endpoint # access_key: ... # optional. access key when using static credentials. # secret_key: ... # optional. secret key when using static credentials. From 8fe010ce1b5a9eabfb0c9e8a133eb604aa581a24 Mon Sep 17 00:00:00 2001 From: Joe Elliott Date: Mon, 6 May 2024 08:07:12 -0400 Subject: [PATCH 10/15] bump version Signed-off-by: Joe Elliott --- charts/tempo/Chart.yaml | 2 +- charts/tempo/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/tempo/Chart.yaml b/charts/tempo/Chart.yaml index 104e2126c5..5dfa24f2e6 100644 --- a/charts/tempo/Chart.yaml +++ b/charts/tempo/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo description: Grafana Tempo Single Binary Mode type: application -version: 1.7.2 +version: 1.7.3 appVersion: 2.3.1 engine: gotpl home: https://grafana.net diff --git a/charts/tempo/README.md b/charts/tempo/README.md index 9e61f7a23b..07321130fd 100644 --- a/charts/tempo/README.md +++ b/charts/tempo/README.md @@ -1,6 +1,6 @@ # tempo -![Version: 1.7.2](https://img.shields.io/badge/Version-1.7.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) +![Version: 1.7.3](https://img.shields.io/badge/Version-1.7.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square) Grafana Tempo Single Binary Mode From 8fb506d31a56f1fcc1435f48853629e790782cd8 Mon Sep 17 00:00:00 2001 From: Joe Elliott Date: Mon, 6 May 2024 08:10:21 -0400 Subject: [PATCH 11/15] bump version Signed-off-by: Joe Elliott --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 92117a4c59..8d1c64ddf0 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.9.6 +version: 1.9.7 appVersion: 2.4.1 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 05928f27b1..6c1a911e22 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.9.6](https://img.shields.io/badge/Version-1.9.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.1](https://img.shields.io/badge/AppVersion-2.4.1-informational?style=flat-square) +![Version: 1.9.7](https://img.shields.io/badge/Version-1.9.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.1](https://img.shields.io/badge/AppVersion-2.4.1-informational?style=flat-square) Grafana Tempo in MicroService mode From fc1997e6494736b42e3c6559e361b7f3ac29e4c8 Mon Sep 17 00:00:00 2001 From: Vladimir Varankin Date: Tue, 7 May 2024 14:45:41 +0200 Subject: [PATCH 12/15] skip repository with unsupported schemas Signed-off-by: Vladimir Varankin --- .github/workflows/update-helm-repo.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/update-helm-repo.yaml b/.github/workflows/update-helm-repo.yaml index afc937ae24..5716b07eb5 100644 --- a/.github/workflows/update-helm-repo.yaml +++ b/.github/workflows/update-helm-repo.yaml @@ -171,7 +171,10 @@ jobs: IFS=' ' read -ra parts <<< "$row" name="${parts[0]}" repo="${parts[2]}" - helm repo add "$name" "$repo" + case "$repo" in + "https://"*) helm repo add "$name" "$repo" ;; + *) echo >&2 "Skipping dependency $name: unsupported schema for \"$repo\"" ;; + esac done <<< "$deps" - name: Install CR tool From 462862e137b7799034421cf1fcd87fd616ed3346 Mon Sep 17 00:00:00 2001 From: Benjamin Martensson Date: Tue, 7 May 2024 10:07:22 -0300 Subject: [PATCH 13/15] [tempo-distributed] fixed broken gateway path Fixes braking change introduced in PR #2729. Signed-off-by: Benjamin Martensson --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 2 +- charts/tempo-distributed/values.yaml | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 8d1c64ddf0..832b0de0c1 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.9.7 +version: 1.9.8 appVersion: 2.4.1 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 6c1a911e22..1c998ee940 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.9.7](https://img.shields.io/badge/Version-1.9.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.1](https://img.shields.io/badge/AppVersion-2.4.1-informational?style=flat-square) +![Version: 1.9.8](https://img.shields.io/badge/Version-1.9.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.1](https://img.shields.io/badge/AppVersion-2.4.1-informational?style=flat-square) Grafana Tempo in MicroService mode diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index f3126609c2..d47c76db75 100644 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -1836,6 +1836,10 @@ gateway: proxy_pass http://{{ include "tempo.resourceName" (dict "ctx" . "component" "distributor") }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}:4318/v1/traces; } + location = /otlp/v1/traces { + proxy_pass http://{{ include "tempo.resourceName" (dict "ctx" . "component" "distributor") }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}:4318/v1/traces; + } + location ^~ /api { proxy_pass http://{{ include "tempo.resourceName" (dict "ctx" . "component" "query-frontend") }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}:3100$request_uri; } From 8cb815afa9ff9b9ab21b9789cbae23ec88704eb1 Mon Sep 17 00:00:00 2001 From: Jordan Simonovski Date: Mon, 6 May 2024 11:38:05 +1000 Subject: [PATCH 14/15] The Selector should not be manually specified unless otherwise configured in spec. Removing the selector altogether ensures the job configuration is valid, while also allowing for templating without null values causing errors Signed-off-by: Jordan Simonovski --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 2 +- charts/tempo-distributed/templates/tokengen/tokengen-job.yaml | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 832b0de0c1..4cd2f6cd74 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.9.8 +version: 1.9.9 appVersion: 2.4.1 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 1c998ee940..7e3f743496 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.9.8](https://img.shields.io/badge/Version-1.9.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.1](https://img.shields.io/badge/AppVersion-2.4.1-informational?style=flat-square) +![Version: 1.9.9](https://img.shields.io/badge/Version-1.9.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.1](https://img.shields.io/badge/AppVersion-2.4.1-informational?style=flat-square) Grafana Tempo in MicroService mode diff --git a/charts/tempo-distributed/templates/tokengen/tokengen-job.yaml b/charts/tempo-distributed/templates/tokengen/tokengen-job.yaml index 8e727e9d57..0af68007c7 100644 --- a/charts/tempo-distributed/templates/tokengen/tokengen-job.yaml +++ b/charts/tempo-distributed/templates/tokengen/tokengen-job.yaml @@ -17,9 +17,6 @@ spec: backoffLimit: 6 completions: 1 parallelism: 1 - selector: - matchLabels: - {{- include "tempo.selectorLabels" $dict | nindent 6 }} template: metadata: labels: From 6eba5e9c96ca8b05290bd802886d0d356599d3b6 Mon Sep 17 00:00:00 2001 From: MH Date: Fri, 10 May 2024 13:51:24 +0800 Subject: [PATCH 15/15] Update Chart.yaml Signed-off-by: MH --- charts/grafana/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index 3e9fcac6f2..f9b619ef6c 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 7.3.10 +version: 7.3.11 appVersion: 10.4.1 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics.