From f6f6217411d41ffc91b7e04f32e7738e8cad161e Mon Sep 17 00:00:00 2001 From: xogoodnow Date: Wed, 11 Dec 2024 17:36:32 +0330 Subject: [PATCH 1/6] Updated memcached image Signed-off-by: xogoodnow --- charts/tempo-distributed/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index 4397b533ea..cce582263b 100755 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -1550,7 +1550,7 @@ memcached: # -- Memcached Docker image repository repository: memcached # -- Memcached Docker image tag - tag: 1.6.29-alpine + tag: 1.6.33-alpine # -- Memcached Docker image pull policy pullPolicy: IfNotPresent host: memcached From 077e417f072ee6445d36402049852b555cc5bede Mon Sep 17 00:00:00 2001 From: Tero Paloheimo Date: Tue, 10 Dec 2024 21:06:49 +0200 Subject: [PATCH 2/6] [grafana] Update to version 11.4.0 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 f8ff539e08..fd4b26b726 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: grafana -version: 8.6.4 -appVersion: 11.3.1 +version: 8.7.0 +appVersion: 11.4.0 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. home: https://grafana.com From 723b39f863818b5a02762fe56b345aadfa9614eb Mon Sep 17 00:00:00 2001 From: xogoodnow Date: Wed, 11 Dec 2024 23:02:48 +0330 Subject: [PATCH 3/6] ran helm-docs Signed-off-by: xogoodnow --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 8f3d845214..8d621925bb 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.25.1 +version: 1.25.2 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 d79d8b4f6d..595de261f8 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.25.1](https://img.shields.io/badge/Version-1.25.1-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.25.2](https://img.shields.io/badge/Version-1.25.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) Grafana Tempo in MicroService mode @@ -592,7 +592,7 @@ The memcached default args are removed and should be provided manually. The sett | memcached.image.pullSecrets | list | `[]` | Optional list of imagePullSecrets. Overrides `global.image.pullSecrets` | | memcached.image.registry | string | `nil` | The Docker registry for the Memcached image. Overrides `global.image.registry` | | memcached.image.repository | string | `"memcached"` | Memcached Docker image repository | -| memcached.image.tag | string | `"1.6.29-alpine"` | Memcached Docker image tag | +| memcached.image.tag | string | `"1.6.33-alpine"` | Memcached Docker image tag | | memcached.maxUnavailable | int | `1` | Pod Disruption Budget maxUnavailable | | memcached.podAnnotations | object | `{}` | Annotations for memcached pods | | memcached.podLabels | object | `{}` | Labels for memcached pods | From 4e2824317d2576d2a173ccc3cfdf45a592475145 Mon Sep 17 00:00:00 2001 From: Robert Lankford Date: Wed, 11 Dec 2024 13:58:28 -0800 Subject: [PATCH 4/6] grafana-sampling: bump alloy version (#3481) Signed-off-by: Robbie Lankford --- charts/grafana-sampling/Chart.lock | 8 ++++---- charts/grafana-sampling/Chart.yaml | 8 ++++---- charts/grafana-sampling/README.md | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/charts/grafana-sampling/Chart.lock b/charts/grafana-sampling/Chart.lock index acf12b4b57..6db60675b2 100644 --- a/charts/grafana-sampling/Chart.lock +++ b/charts/grafana-sampling/Chart.lock @@ -1,9 +1,9 @@ dependencies: - name: alloy repository: https://grafana.github.io/helm-charts - version: 0.6.0 + version: 0.10.1 - name: alloy repository: https://grafana.github.io/helm-charts - version: 0.6.0 -digest: sha256:e9dbff0d3707c403c1fb645eb33920a2219cc3156358134537e89caf39c588a5 -generated: "2024-08-14T10:41:47.606272-07:00" + version: 0.10.1 +digest: sha256:dc461e633c1504ba6c60e11c21afc3346444e175d4e3b7e0b538240c392c81d0 +generated: "2024-12-11T10:44:32.61011-08:00" diff --git a/charts/grafana-sampling/Chart.yaml b/charts/grafana-sampling/Chart.yaml index 90dadf2cd6..3b2c88ca6b 100644 --- a/charts/grafana-sampling/Chart.yaml +++ b/charts/grafana-sampling/Chart.yaml @@ -2,17 +2,17 @@ apiVersion: v2 name: grafana-sampling description: A Helm chart for a layered OTLP tail sampling and metrics generation pipeline. type: application -version: 1.1.0 -appVersion: "v1.3.0" +version: 1.1.1 +appVersion: "v1.5.1" sources: - https://github.com/grafana/alloy - https://grafana.com/docs/grafana-cloud/monitor-applications/application-observability/setup/sampling/tail/ dependencies: - name: alloy - version: 0.6.0 + version: 0.10.1 repository: https://grafana.github.io/helm-charts alias: alloy-deployment - name: alloy - version: 0.6.0 + version: 0.10.1 repository: https://grafana.github.io/helm-charts alias: alloy-statefulset diff --git a/charts/grafana-sampling/README.md b/charts/grafana-sampling/README.md index 24607dddc0..fede95c43a 100644 --- a/charts/grafana-sampling/README.md +++ b/charts/grafana-sampling/README.md @@ -1,6 +1,6 @@ # grafana-sampling -![Version: 1.1.0](https://img.shields.io/badge/Version-1.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.3.0](https://img.shields.io/badge/AppVersion-v1.3.0-informational?style=flat-square) +![Version: 1.1.1](https://img.shields.io/badge/Version-1.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.5.1](https://img.shields.io/badge/AppVersion-v1.5.1-informational?style=flat-square) A Helm chart for a layered OTLP tail sampling and metrics generation pipeline. From d45fbeacc1fb74ea85bd7a48fb2b5af963f0fb66 Mon Sep 17 00:00:00 2001 From: Zach Leslie Date: Wed, 11 Dec 2024 21:07:26 +0000 Subject: [PATCH 5/6] [tempo-distributed] Allow IPv6 support Signed-off-by: Zach Leslie --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 4 +++- .../templates/compactor/service-compactor.yaml | 2 ++ .../templates/distributor/service-distributor.yaml | 2 ++ .../templates/gossip-ring/service-gossip-ring.yaml | 2 ++ .../templates/ingester/service-ingester.yaml | 2 ++ .../templates/memcached/service-memcached.yaml | 2 ++ .../metrics-generator/service-metrics-generator.yaml | 2 ++ .../templates/querier/service-querier.yaml | 2 ++ .../templates/query-frontend/service-query-frontend.yaml | 2 ++ charts/tempo-distributed/values.yaml | 9 ++++++++- 11 files changed, 28 insertions(+), 3 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 8d621925bb..8eedcb4b6c 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.25.2 +version: 1.26.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 595de261f8..b0084f4350 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.25.2](https://img.shields.io/badge/Version-1.25.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.26.0](https://img.shields.io/badge/Version-1.26.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 @@ -859,6 +859,8 @@ The memcached default args are removed and should be provided manually. The sett | tempo.readinessProbe.initialDelaySeconds | int | `30` | | | tempo.readinessProbe.timeoutSeconds | int | `1` | | | tempo.securityContext | object | `{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]},"readOnlyRootFilesystem":true,"runAsGroup":1000,"runAsNonRoot":true,"runAsUser":1000}` | SecurityContext holds container-level security attributes and common container settings | +| tempo.service.ipFamilies | list | `["IPv4"]` | Configure the IP families for all tempo services See the Service spec for details: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.31/#servicespec-v1-core | +| tempo.service.ipFamilyPolicy | string | `"SingleStack"` | Configure the IP family policy for all tempo services. SingleStack, PreferDualStack or RequireDualStack | | tempo.structuredConfig | object | `{}` | Structured tempo configuration | | tokengenJob.annotations | object | `{}` | | | tokengenJob.containerSecurityContext | object | `{"readOnlyRootFilesystem":true}` | The SecurityContext for tokenjobgen containers | diff --git a/charts/tempo-distributed/templates/compactor/service-compactor.yaml b/charts/tempo-distributed/templates/compactor/service-compactor.yaml index dcbacc273b..fde2125f1b 100644 --- a/charts/tempo-distributed/templates/compactor/service-compactor.yaml +++ b/charts/tempo-distributed/templates/compactor/service-compactor.yaml @@ -17,3 +17,5 @@ spec: protocol: TCP selector: {{- include "tempo.selectorLabels" (dict "ctx" . "component" "compactor") | nindent 4 }} + ipFamilies: {{ .Values.tempo.service.ipFamilies }} + ipFamilyPolicy: {{ .Values.tempo.service.ipFamilyPolicy }} diff --git a/charts/tempo-distributed/templates/distributor/service-distributor.yaml b/charts/tempo-distributed/templates/distributor/service-distributor.yaml index 1f126212e0..15c6317544 100644 --- a/charts/tempo-distributed/templates/distributor/service-distributor.yaml +++ b/charts/tempo-distributed/templates/distributor/service-distributor.yaml @@ -16,6 +16,8 @@ metadata: spec: internalTrafficPolicy: {{ .Values.distributor.service.internalTrafficPolicy }} type: {{ .Values.distributor.service.type }} + ipFamilies: {{ .Values.tempo.service.ipFamilies }} + ipFamilyPolicy: {{ .Values.tempo.service.ipFamilyPolicy }} ports: - name: http-metrics port: 3100 diff --git a/charts/tempo-distributed/templates/gossip-ring/service-gossip-ring.yaml b/charts/tempo-distributed/templates/gossip-ring/service-gossip-ring.yaml index 98002c2d19..35fd54d1c4 100644 --- a/charts/tempo-distributed/templates/gossip-ring/service-gossip-ring.yaml +++ b/charts/tempo-distributed/templates/gossip-ring/service-gossip-ring.yaml @@ -12,6 +12,8 @@ metadata: spec: type: ClusterIP clusterIP: None + ipFamilies: {{ .Values.tempo.service.ipFamilies }} + ipFamilyPolicy: {{ .Values.tempo.service.ipFamilyPolicy }} ports: - name: gossip-ring port: {{ include "tempo.memberlistBindPort" . }} diff --git a/charts/tempo-distributed/templates/ingester/service-ingester.yaml b/charts/tempo-distributed/templates/ingester/service-ingester.yaml index bcabfa2ff9..96867f0dcd 100644 --- a/charts/tempo-distributed/templates/ingester/service-ingester.yaml +++ b/charts/tempo-distributed/templates/ingester/service-ingester.yaml @@ -17,6 +17,8 @@ metadata: spec: type: {{ .Values.ingester.service.type }} internalTrafficPolicy: {{ .Values.ingester.service.internalTrafficPolicy }} + ipFamilies: {{ .Values.tempo.service.ipFamilies }} + ipFamilyPolicy: {{ .Values.tempo.service.ipFamilyPolicy }} ports: - name: http-metrics port: 3100 diff --git a/charts/tempo-distributed/templates/memcached/service-memcached.yaml b/charts/tempo-distributed/templates/memcached/service-memcached.yaml index 64806afc63..ab9d99d6e8 100644 --- a/charts/tempo-distributed/templates/memcached/service-memcached.yaml +++ b/charts/tempo-distributed/templates/memcached/service-memcached.yaml @@ -11,6 +11,8 @@ metadata: {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: + ipFamilies: {{ .Values.tempo.service.ipFamilies }} + ipFamilyPolicy: {{ .Values.tempo.service.ipFamilyPolicy }} ports: - name: memcached-client port: 11211 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 f0ca27a68e..cc3055e95f 100644 --- a/charts/tempo-distributed/templates/metrics-generator/service-metrics-generator.yaml +++ b/charts/tempo-distributed/templates/metrics-generator/service-metrics-generator.yaml @@ -12,6 +12,8 @@ metadata: {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: + ipFamilies: {{ .Values.tempo.service.ipFamilies }} + ipFamilyPolicy: {{ .Values.tempo.service.ipFamilyPolicy }} ports: {{- range .Values.metricsGenerator.ports }} {{- if .service }} diff --git a/charts/tempo-distributed/templates/querier/service-querier.yaml b/charts/tempo-distributed/templates/querier/service-querier.yaml index b13348b0f8..05dd42c106 100644 --- a/charts/tempo-distributed/templates/querier/service-querier.yaml +++ b/charts/tempo-distributed/templates/querier/service-querier.yaml @@ -10,6 +10,8 @@ metadata: {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: + ipFamilies: {{ .Values.tempo.service.ipFamilies }} + ipFamilyPolicy: {{ .Values.tempo.service.ipFamilyPolicy }} ports: - name: http-metrics port: 3100 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 d737e7e52c..ad7c568d70 100644 --- a/charts/tempo-distributed/templates/query-frontend/service-query-frontend.yaml +++ b/charts/tempo-distributed/templates/query-frontend/service-query-frontend.yaml @@ -14,6 +14,8 @@ metadata: {{- end }} spec: type: {{ .Values.queryFrontend.service.type }} + ipFamilies: {{ .Values.tempo.service.ipFamilies }} + ipFamilyPolicy: {{ .Values.tempo.service.ipFamilyPolicy }} ports: - name: http-metrics port: 3100 diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index cce582263b..68e2157433 100755 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -89,7 +89,14 @@ tempo: service: # -- Sets optional annotations to the service field of the memberlist service. annotations: {} - + service: + # -- Configure the IP families for all tempo services + # See the Service spec for details: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.31/#servicespec-v1-core + ipFamilies: + - 'IPv4' + # - 'IPv6' + # -- Configure the IP family policy for all tempo services. SingleStack, PreferDualStack or RequireDualStack + ipFamilyPolicy: 'SingleStack' serviceAccount: # -- Specifies whether a ServiceAccount should be created create: true From fd51913b691f1007ffaef3de5a46bd64bd9602cc Mon Sep 17 00:00:00 2001 From: Nick Pillitteri Date: Thu, 12 Dec 2024 16:17:26 -0500 Subject: [PATCH 6/6] [rollout-operator] Bump rollout-operator version to 0.22.0 Signed-off-by: Nick Pillitteri --- charts/rollout-operator/Chart.yaml | 4 ++-- charts/rollout-operator/README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/rollout-operator/Chart.yaml b/charts/rollout-operator/Chart.yaml index cca369dbff..871542067e 100644 --- a/charts/rollout-operator/Chart.yaml +++ b/charts/rollout-operator/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: rollout-operator description: "Grafana rollout-operator" type: application -version: 0.21.0 -appVersion: v0.21.0 +version: 0.22.0 +appVersion: v0.22.0 home: https://github.com/grafana/rollout-operator kubeVersion: ^1.10.0-0 diff --git a/charts/rollout-operator/README.md b/charts/rollout-operator/README.md index 372e793841..6c580b0f74 100644 --- a/charts/rollout-operator/README.md +++ b/charts/rollout-operator/README.md @@ -4,7 +4,7 @@ Helm chart for deploying [Grafana rollout-operator](https://github.com/grafana/r # rollout-operator -![Version: 0.21.0](https://img.shields.io/badge/Version-0.21.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.21.0](https://img.shields.io/badge/AppVersion-v0.21.0-informational?style=flat-square) +![Version: 0.22.0](https://img.shields.io/badge/Version-0.22.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.22.0](https://img.shields.io/badge/AppVersion-v0.22.0-informational?style=flat-square) Grafana rollout-operator