From e0a7fb2f64a4488056b984bdcfa7e85f4bb73b83 Mon Sep 17 00:00:00 2001 From: Mathieu Bodjikian Date: Tue, 10 Sep 2024 15:58:35 +0200 Subject: [PATCH 01/13] feat: templatise tempo-distributed chart services annoations Signed-off-by: Mathieu Bodjikian --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 2 +- .../templates/compactor/service-compactor.yaml | 2 +- .../templates/distributor/service-distributor-discovery.yaml | 2 +- .../templates/distributor/service-distributor.yaml | 2 +- .../service-federation-frontend.yaml | 2 +- charts/tempo-distributed/templates/gateway/service-gateway.yaml | 2 +- .../templates/ingester/service-ingester-discovery.yaml | 2 +- .../tempo-distributed/templates/ingester/service-ingester.yaml | 2 +- .../templates/memcached/service-memcached.yaml | 2 +- .../metrics-generator/service-metrics-generator-discovery.yaml | 2 +- .../templates/metrics-generator/service-metrics-generator.yaml | 2 +- charts/tempo-distributed/templates/querier/service-querier.yaml | 2 +- .../query-frontend/service-query-frontend-discovery.yaml | 2 +- .../templates/query-frontend/service-query-frontend.yaml | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 0c31a9b274..9f57b1e752 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.18.0 +version: 1.19.0 appVersion: 2.6.0 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index fbbcf5dd28..8c8971cf25 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.18.0](https://img.shields.io/badge/Version-1.18.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) +![Version: 1.19.0](https://img.shields.io/badge/Version-1.19.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) Grafana Tempo in MicroService mode diff --git a/charts/tempo-distributed/templates/compactor/service-compactor.yaml b/charts/tempo-distributed/templates/compactor/service-compactor.yaml index d280df9322..dcbacc273b 100644 --- a/charts/tempo-distributed/templates/compactor/service-compactor.yaml +++ b/charts/tempo-distributed/templates/compactor/service-compactor.yaml @@ -6,7 +6,7 @@ metadata: {{- include "tempo.labels" (dict "ctx" . "component" "compactor") | nindent 4 }} {{- with .Values.compactor.service.annotations }} annotations: - {{- toYaml . | nindent 4 }} + {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: type: ClusterIP diff --git a/charts/tempo-distributed/templates/distributor/service-distributor-discovery.yaml b/charts/tempo-distributed/templates/distributor/service-distributor-discovery.yaml index d15797cac2..a226788b55 100644 --- a/charts/tempo-distributed/templates/distributor/service-distributor-discovery.yaml +++ b/charts/tempo-distributed/templates/distributor/service-distributor-discovery.yaml @@ -12,7 +12,7 @@ metadata: prometheus.io/service-monitor: "false" {{- with .Values.distributor.serviceDiscovery.annotations }} annotations: - {{- toYaml . | nindent 4 }} + {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: type: ClusterIP diff --git a/charts/tempo-distributed/templates/distributor/service-distributor.yaml b/charts/tempo-distributed/templates/distributor/service-distributor.yaml index efd7574110..a7174f2a00 100644 --- a/charts/tempo-distributed/templates/distributor/service-distributor.yaml +++ b/charts/tempo-distributed/templates/distributor/service-distributor.yaml @@ -11,7 +11,7 @@ metadata: {{- end }} {{- with .Values.distributor.service.annotations }} annotations: - {{- toYaml . | nindent 4 }} + {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: type: {{ .Values.distributor.service.type }} diff --git a/charts/tempo-distributed/templates/enterprise-federation-frontend/service-federation-frontend.yaml b/charts/tempo-distributed/templates/enterprise-federation-frontend/service-federation-frontend.yaml index 8eb08042d9..8d1db22ce1 100644 --- a/charts/tempo-distributed/templates/enterprise-federation-frontend/service-federation-frontend.yaml +++ b/charts/tempo-distributed/templates/enterprise-federation-frontend/service-federation-frontend.yaml @@ -8,7 +8,7 @@ metadata: {{- include "tempo.labels" (dict "ctx" . "component" "enterprise-federation-frontend") | nindent 4 }} {{- with .Values.enterpriseFederationFrontend.service.annotations }} annotations: - {{- toYaml . | nindent 4 }} + {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: type: {{ .Values.enterpriseFederationFrontend.service.type }} diff --git a/charts/tempo-distributed/templates/gateway/service-gateway.yaml b/charts/tempo-distributed/templates/gateway/service-gateway.yaml index 6270cf7578..97efb6fd19 100644 --- a/charts/tempo-distributed/templates/gateway/service-gateway.yaml +++ b/charts/tempo-distributed/templates/gateway/service-gateway.yaml @@ -11,7 +11,7 @@ metadata: {{- end }} {{- with .Values.gateway.service.annotations }} annotations: - {{- toYaml . | nindent 4 }} + {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: type: {{ .Values.gateway.service.type }} diff --git a/charts/tempo-distributed/templates/ingester/service-ingester-discovery.yaml b/charts/tempo-distributed/templates/ingester/service-ingester-discovery.yaml index 6c26ccf23a..2835cd866e 100644 --- a/charts/tempo-distributed/templates/ingester/service-ingester-discovery.yaml +++ b/charts/tempo-distributed/templates/ingester/service-ingester-discovery.yaml @@ -9,7 +9,7 @@ metadata: prometheus.io/service-monitor: "false" {{- with .Values.ingester.service.annotations }} annotations: - {{- toYaml . | nindent 4 }} + {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: type: ClusterIP diff --git a/charts/tempo-distributed/templates/ingester/service-ingester.yaml b/charts/tempo-distributed/templates/ingester/service-ingester.yaml index 61e2fa7ab5..988c891028 100644 --- a/charts/tempo-distributed/templates/ingester/service-ingester.yaml +++ b/charts/tempo-distributed/templates/ingester/service-ingester.yaml @@ -8,7 +8,7 @@ metadata: {{- include "tempo.labels" $dict | nindent 4 }} {{- with .Values.ingester.service.annotations }} annotations: - {{- toYaml . | nindent 4 }} + {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: ports: diff --git a/charts/tempo-distributed/templates/memcached/service-memcached.yaml b/charts/tempo-distributed/templates/memcached/service-memcached.yaml index 21e1455f02..64806afc63 100644 --- a/charts/tempo-distributed/templates/memcached/service-memcached.yaml +++ b/charts/tempo-distributed/templates/memcached/service-memcached.yaml @@ -8,7 +8,7 @@ metadata: {{- include "tempo.labels" (dict "ctx" . "component" "memcached") | nindent 4 }} {{- with .Values.memcached.service.annotations }} annotations: - {{- toYaml . | nindent 4 }} + {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: ports: diff --git a/charts/tempo-distributed/templates/metrics-generator/service-metrics-generator-discovery.yaml b/charts/tempo-distributed/templates/metrics-generator/service-metrics-generator-discovery.yaml index 48eb8468ba..8fb96f85cb 100644 --- a/charts/tempo-distributed/templates/metrics-generator/service-metrics-generator-discovery.yaml +++ b/charts/tempo-distributed/templates/metrics-generator/service-metrics-generator-discovery.yaml @@ -10,7 +10,7 @@ metadata: prometheus.io/service-monitor: "false" {{- with .Values.metricsGenerator.service.annotations }} annotations: - {{- toYaml . | nindent 4 }} + {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: type: ClusterIP diff --git a/charts/tempo-distributed/templates/metrics-generator/service-metrics-generator.yaml b/charts/tempo-distributed/templates/metrics-generator/service-metrics-generator.yaml index c2550fd96f..f0ca27a68e 100644 --- a/charts/tempo-distributed/templates/metrics-generator/service-metrics-generator.yaml +++ b/charts/tempo-distributed/templates/metrics-generator/service-metrics-generator.yaml @@ -9,7 +9,7 @@ metadata: {{- include "tempo.labels" $dict | nindent 4 }} {{- with .Values.metricsGenerator.service.annotations }} annotations: - {{- toYaml . | nindent 4 }} + {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: ports: diff --git a/charts/tempo-distributed/templates/querier/service-querier.yaml b/charts/tempo-distributed/templates/querier/service-querier.yaml index cea6816c03..b13348b0f8 100644 --- a/charts/tempo-distributed/templates/querier/service-querier.yaml +++ b/charts/tempo-distributed/templates/querier/service-querier.yaml @@ -7,7 +7,7 @@ metadata: {{- include "tempo.labels" (dict "ctx" . "component" "querier") | nindent 4 }} {{- with .Values.querier.service.annotations }} annotations: - {{- toYaml . | nindent 4 }} + {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: ports: diff --git a/charts/tempo-distributed/templates/query-frontend/service-query-frontend-discovery.yaml b/charts/tempo-distributed/templates/query-frontend/service-query-frontend-discovery.yaml index ba91e8f8a4..48d2c28f4c 100644 --- a/charts/tempo-distributed/templates/query-frontend/service-query-frontend-discovery.yaml +++ b/charts/tempo-distributed/templates/query-frontend/service-query-frontend-discovery.yaml @@ -10,7 +10,7 @@ metadata: {{- end }} {{- with .Values.queryFrontend.serviceDiscovery.annotations }} annotations: - {{ toYaml . | nindent 4 }} + {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: type: ClusterIP diff --git a/charts/tempo-distributed/templates/query-frontend/service-query-frontend.yaml b/charts/tempo-distributed/templates/query-frontend/service-query-frontend.yaml index 153ca95b41..d737e7e52c 100644 --- a/charts/tempo-distributed/templates/query-frontend/service-query-frontend.yaml +++ b/charts/tempo-distributed/templates/query-frontend/service-query-frontend.yaml @@ -10,7 +10,7 @@ metadata: {{- end }} {{- with .Values.queryFrontend.service.annotations }} annotations: - {{- toYaml . | nindent 4 }} + {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: type: {{ .Values.queryFrontend.service.type }} From 6ef8b0ddce30a6e877351a503327acbe151e790f Mon Sep 17 00:00:00 2001 From: Linas Klimaitis <38661008+bruksnys@users.noreply.github.com> Date: Wed, 9 Oct 2024 09:55:37 +0300 Subject: [PATCH 02/13] Fix global.extraEnv key support for metrics-generator statefulset Signed-off-by: Linas Klimaitis <38661008+bruksnys@users.noreply.github.com> --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 2 +- .../metrics-generator/statefulset-metrics-generator.yaml | 9 +++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 63250f02c2..110150795d 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.18.2 +version: 1.18.3 appVersion: 2.6.0 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index eb6cb3b692..2cdd83d17f 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.18.2](https://img.shields.io/badge/Version-1.18.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) +![Version: 1.18.3](https://img.shields.io/badge/Version-1.18.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) Grafana Tempo in MicroService mode diff --git a/charts/tempo-distributed/templates/metrics-generator/statefulset-metrics-generator.yaml b/charts/tempo-distributed/templates/metrics-generator/statefulset-metrics-generator.yaml index 5f1737ddc7..f057fba246 100644 --- a/charts/tempo-distributed/templates/metrics-generator/statefulset-metrics-generator.yaml +++ b/charts/tempo-distributed/templates/metrics-generator/statefulset-metrics-generator.yaml @@ -73,9 +73,14 @@ spec: - name: {{ .name | quote }} containerPort: {{ .port }} {{- end }} - {{- with .Values.metricsGenerator.extraEnv }} + {{- if or .Values.global.extraEnv .Values.metricsGenerator.extraEnv }} env: - {{- toYaml . | nindent 12 }} + {{- with .Values.global.extraEnv }} + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with .Values.metricsGenerator.extraEnv }} + {{- toYaml . | nindent 12 }} + {{- end }} {{- end }} {{- with .Values.metricsGenerator.extraEnvFrom }} envFrom: From b2ef11adf46896f6d827349ce5c5d629e68d4d8e Mon Sep 17 00:00:00 2001 From: Tero Paloheimo Date: Sun, 13 Oct 2024 12:33:20 +0300 Subject: [PATCH 03/13] Update Grafana to version 11.2.2 Signed-off-by: Tero Paloheimo --- charts/grafana/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index 58e6238907..d4ba361b75 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: grafana -version: 8.5.2 -appVersion: 11.2.1 +version: 8.5.3 +appVersion: 11.2.2 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. home: https://grafana.com From b7fb7d7f3eb68277ca194d20dbd6a4f730a274a7 Mon Sep 17 00:00:00 2001 From: Charles Korn Date: Mon, 14 Oct 2024 10:16:18 +1100 Subject: [PATCH 04/13] Bump actions/checkout Signed-off-by: Charles Korn --- .github/workflows/check-codeowners.yaml | 2 +- .github/workflows/lint-test.yaml | 2 +- .github/workflows/linter.yml | 2 +- .github/workflows/release.yaml | 2 +- .github/workflows/sync-readme.yaml | 4 ++-- .github/workflows/update-helm-repo.yaml | 6 +++--- .github/workflows/validate-pr.yaml | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/check-codeowners.yaml b/.github/workflows/check-codeowners.yaml index f77c5224b5..051ec859f9 100644 --- a/.github/workflows/check-codeowners.yaml +++ b/.github/workflows/check-codeowners.yaml @@ -6,7 +6,7 @@ jobs: build: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: install yq run: | sudo snap install yq diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index f5d3528496..f09c2ada3c 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -35,7 +35,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index daa9d1246d..7534269626 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Check Docs run: | diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index e46c9e748e..e99b2929e5 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/.github/workflows/sync-readme.yaml b/.github/workflows/sync-readme.yaml index e51ecdc964..7937e66e44 100644 --- a/.github/workflows/sync-readme.yaml +++ b/.github/workflows/sync-readme.yaml @@ -12,10 +12,10 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - run: | cp -f README.md ${{ runner.temp }}/README.md - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: ref: gh-pages - run: | diff --git a/.github/workflows/update-helm-repo.yaml b/.github/workflows/update-helm-repo.yaml index 5716b07eb5..a5001a73e9 100644 --- a/.github/workflows/update-helm-repo.yaml +++ b/.github/workflows/update-helm-repo.yaml @@ -50,7 +50,7 @@ jobs: chartpath: ${{ steps.list-changed.outputs.chartpath }} steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 path: source @@ -114,7 +114,7 @@ jobs: fi - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 path: source @@ -127,7 +127,7 @@ jobs: - name: Checkout helm-charts # The cr tool only works if the target repository is already checked out - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 repository: grafana/helm-charts diff --git a/.github/workflows/validate-pr.yaml b/.github/workflows/validate-pr.yaml index c23ec0153b..5510ed3fe1 100644 --- a/.github/workflows/validate-pr.yaml +++ b/.github/workflows/validate-pr.yaml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Code - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 From e6e9bef35020015b970193b3bc1a67db6680db23 Mon Sep 17 00:00:00 2001 From: Charles Korn Date: Mon, 14 Oct 2024 10:16:27 +1100 Subject: [PATCH 05/13] Bump actions/setup-python Signed-off-by: Charles Korn --- .github/workflows/lint-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index f09c2ada3c..3643e15721 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -47,7 +47,7 @@ jobs: # Python is required because `ct lint` runs Yamale (https://github.com/23andMe/Yamale) and # yamllint (https://github.com/adrienverge/yamllint) which require Python - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: 3.7 From 726a1ff4fa7d418e25c843cc2f96e87baa29b1c4 Mon Sep 17 00:00:00 2001 From: Charles Korn Date: Mon, 14 Oct 2024 10:17:47 +1100 Subject: [PATCH 06/13] Bump azure/setup-helm Signed-off-by: Charles Korn --- .github/workflows/lint-test.yaml | 2 +- .github/workflows/release.yaml | 2 +- .github/workflows/update-helm-repo.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index 3643e15721..021e74607c 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -40,7 +40,7 @@ jobs: fetch-depth: 0 - name: Set up Helm - uses: azure/setup-helm@v1 + uses: azure/setup-helm@v4 with: version: ${{ inputs.helm_version }} diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index e99b2929e5..1f1f7466f4 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -25,7 +25,7 @@ jobs: git config user.email "$GITHUB_ACTOR@users.noreply.github.com" - name: Set up Helm - uses: azure/setup-helm@v3.5 + uses: azure/setup-helm@v4 with: version: v3.12.0 diff --git a/.github/workflows/update-helm-repo.yaml b/.github/workflows/update-helm-repo.yaml index a5001a73e9..2ea76eecf8 100644 --- a/.github/workflows/update-helm-repo.yaml +++ b/.github/workflows/update-helm-repo.yaml @@ -141,7 +141,7 @@ jobs: git config user.email "$GITHUB_ACTOR@users.noreply.github.com" - name: Install Helm - uses: azure/setup-helm@v1 + uses: azure/setup-helm@v4 with: version: v3.5.2 From 695bcff9b5ebe9f7adb7884f9ab083e8cda07def Mon Sep 17 00:00:00 2001 From: Charles Korn Date: Mon, 14 Oct 2024 10:19:07 +1100 Subject: [PATCH 07/13] Remove use of deprecated `::set-output` Signed-off-by: Charles Korn --- .github/workflows/lint-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index 021e74607c..2d9a568dd6 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -59,7 +59,7 @@ jobs: run: | changed=$(ct list-changed --config "${CT_CONFIGFILE}") if [[ -n "$changed" ]]; then - echo "::set-output name=changed::true" + echo "changed=true" >> "$GITHUB_OUTPUT" fi - name: Run chart-testing (lint) From 29f15aa596a645f62c668bf90c35f8c35cc19dd8 Mon Sep 17 00:00:00 2001 From: Charles Korn Date: Mon, 14 Oct 2024 10:23:12 +1100 Subject: [PATCH 08/13] Bump Python version to one available in Ubuntu 24.04 runners Signed-off-by: Charles Korn --- .github/workflows/lint-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index 2d9a568dd6..b5134a83d4 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -49,7 +49,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: 3.7 + python-version: 3.12 - name: Set up chart-testing uses: helm/chart-testing-action@v2.1.0 From 778d2f324af30495ff9f2456c838d04fa35de82d Mon Sep 17 00:00:00 2001 From: Martin Lefler Date: Tue, 8 Oct 2024 12:26:00 +0200 Subject: [PATCH 09/13] [grafana] chore: bump k8s-sidecar to 1.28.0 Signed-off-by: Martin Lefler --- charts/grafana/README.md | 2 +- charts/grafana/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/grafana/README.md b/charts/grafana/README.md index 2c9609e122..4ab1a01c38 100644 --- a/charts/grafana/README.md +++ b/charts/grafana/README.md @@ -165,7 +165,7 @@ need to instead set `global.imageRegistry`. | `lifecycleHooks` | Lifecycle hooks for podStart and preStop [Example](https://kubernetes.io/docs/tasks/configure-pod-container/attach-handler-lifecycle-event/#define-poststart-and-prestop-handlers) | `{}` | | `sidecar.image.registry` | Sidecar image registry | `quay.io` | | `sidecar.image.repository` | Sidecar image repository | `kiwigrid/k8s-sidecar` | -| `sidecar.image.tag` | Sidecar image tag | `1.26.0` | +| `sidecar.image.tag` | Sidecar image tag | `1.28.0` | | `sidecar.image.sha` | Sidecar image sha (optional) | `""` | | `sidecar.imagePullPolicy` | Sidecar image pull policy | `IfNotPresent` | | `sidecar.resources` | Sidecar resources | `{}` | diff --git a/charts/grafana/values.yaml b/charts/grafana/values.yaml index 51e94e01ff..1d05a6fc19 100644 --- a/charts/grafana/values.yaml +++ b/charts/grafana/values.yaml @@ -861,7 +861,7 @@ sidecar: # -- The Docker registry registry: quay.io repository: kiwigrid/k8s-sidecar - tag: 1.27.4 + tag: 1.28.0 sha: "" imagePullPolicy: IfNotPresent resources: {} From 99bd41261d85fb5720be3b435547c4d61acb1856 Mon Sep 17 00:00:00 2001 From: Martin Lefler Date: Mon, 14 Oct 2024 10:18:43 +0200 Subject: [PATCH 10/13] bump chart version Signed-off-by: Martin Lefler --- 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 d4ba361b75..531a38cb85 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 8.5.3 +version: 8.5.4 appVersion: 11.2.2 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. From 25c81932b67e81e233bd7b0d36660478a1ab6274 Mon Sep 17 00:00:00 2001 From: MH Date: Tue, 15 Oct 2024 00:46:27 +0800 Subject: [PATCH 11/13] Update Chart.yaml Signed-off-by: MH Signed-off-by: MH --- charts/tempo-distributed/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 110150795d..6e660caad4 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.18.3 +version: 1.18.4 appVersion: 2.6.0 engine: gotpl home: https://grafana.com/docs/tempo/latest/ From 729a4d63815eb009569d40800555dd0673c0eeed Mon Sep 17 00:00:00 2001 From: MH Date: Tue, 15 Oct 2024 00:46:57 +0800 Subject: [PATCH 12/13] Update README.md Signed-off-by: MH Signed-off-by: MH --- charts/tempo-distributed/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 2cdd83d17f..10920f7bc7 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.18.3](https://img.shields.io/badge/Version-1.18.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) +![Version: 1.18.4](https://img.shields.io/badge/Version-1.18.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) Grafana Tempo in MicroService mode From c8841e8b4ce501a17f19eab3bec1a9dc16de47b3 Mon Sep 17 00:00:00 2001 From: Fabio Trigari Date: Mon, 14 Oct 2024 23:35:32 +0200 Subject: [PATCH 13/13] [grafana] Replicas could be 0 #3337 (#3343) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jan-Otto Kröpke --- charts/grafana/Chart.yaml | 2 +- charts/grafana/templates/deployment.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index 531a38cb85..5551f1b76b 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 8.5.4 +version: 8.5.5 appVersion: 11.2.2 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. diff --git a/charts/grafana/templates/deployment.yaml b/charts/grafana/templates/deployment.yaml index 46c016faa3..d309a7e5ff 100644 --- a/charts/grafana/templates/deployment.yaml +++ b/charts/grafana/templates/deployment.yaml @@ -14,7 +14,7 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} spec: - {{- if and (not .Values.autoscaling.enabled) (.Values.replicas) }} + {{- if (not .Values.autoscaling.enabled) }} replicas: {{ .Values.replicas }} {{- end }} revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}