diff --git a/.github/workflows/update-helm-repo.yaml b/.github/workflows/update-helm-repo.yaml index 883f675808..5716b07eb5 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,21 @@ 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]}" + 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 run: | mkdir "${CR_TOOL_PATH}" diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index efd3bd081c..f9b619ef6c 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.11 appVersion: 10.4.1 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..f3ebc37c93 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" }} +{{- print "autoscaling/v2" }} +{{- else }} +{{- print "autoscaling/v2beta2" }} +{{- end }} {{- end }} {{/* 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 81fcda59a0..a327a7a01e 100644 --- a/charts/grafana/values.yaml +++ b/charts/grafana/values.yaml @@ -121,6 +121,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: ~ diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 92117a4c59..84fd69c449 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.10 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 395f3f5d8c..7e3f743496 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.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 @@ -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 diff --git a/charts/tempo-distributed/templates/tokengen/tokengen-job.yaml b/charts/tempo-distributed/templates/tokengen/tokengen-job.yaml index c516237ab5..0af68007c7 100644 --- a/charts/tempo-distributed/templates/tokengen/tokengen-job.yaml +++ b/charts/tempo-distributed/templates/tokengen/tokengen-job.yaml @@ -17,7 +17,6 @@ spec: backoffLimit: 6 completions: 1 parallelism: 1 - selector: template: metadata: labels: 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; } 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 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.