From 6b528e37d91c4bc9fd9952a5710d7b8e90719cc2 Mon Sep 17 00:00:00 2001 From: fabio trigari Date: Wed, 30 Oct 2024 00:48:02 +0100 Subject: [PATCH 1/3] [rollout-operator] Add commonLabels (#3319) Signed-off-by: fabio trigari --- charts/rollout-operator/Chart.yaml | 2 +- charts/rollout-operator/README.md | 3 ++- charts/rollout-operator/templates/_helpers.tpl | 3 +++ charts/rollout-operator/templates/role.yaml | 2 ++ charts/rollout-operator/templates/rolebinding.yaml | 2 ++ charts/rollout-operator/values.yaml | 6 ++++++ 6 files changed, 16 insertions(+), 2 deletions(-) diff --git a/charts/rollout-operator/Chart.yaml b/charts/rollout-operator/Chart.yaml index c8bf8e01dc..cbec568880 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.18.0 +version: 0.19.0 appVersion: v0.19.1 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 e988430065..4d716ad8cb 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.18.0](https://img.shields.io/badge/Version-0.18.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.19.1](https://img.shields.io/badge/AppVersion-v0.19.1-informational?style=flat-square) +![Version: 0.19.0](https://img.shields.io/badge/Version-0.19.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.19.1](https://img.shields.io/badge/AppVersion-v0.19.1-informational?style=flat-square) Grafana rollout-operator @@ -41,6 +41,7 @@ It is not a highly available application and runs as a single pod. |-----|------|---------|-------------| | affinity | object | `{}` | | | fullnameOverride | string | `""` | | +| global.commonLabels | object | `{}` | Common labels for all object directly managed by this chart. | | hostAliases | list | `[]` | hostAliases to add | | image.pullPolicy | string | `"IfNotPresent"` | | | image.repository | string | `"grafana/rollout-operator"` | | diff --git a/charts/rollout-operator/templates/_helpers.tpl b/charts/rollout-operator/templates/_helpers.tpl index bf3553abfe..68ae702a06 100644 --- a/charts/rollout-operator/templates/_helpers.tpl +++ b/charts/rollout-operator/templates/_helpers.tpl @@ -48,6 +48,9 @@ helm.sh/chart: {{ include "rollout-operator.chart" . }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }} app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- with .Values.global.commonLabels }} +{{ toYaml . }} +{{- end }} {{- end }} {{/* diff --git a/charts/rollout-operator/templates/role.yaml b/charts/rollout-operator/templates/role.yaml index 210c456d03..7bc2570b4e 100644 --- a/charts/rollout-operator/templates/role.yaml +++ b/charts/rollout-operator/templates/role.yaml @@ -2,6 +2,8 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: name: {{ include "rollout-operator.fullname" . }} + labels: + {{- include "rollout-operator.labels" . | nindent 4 }} rules: - apiGroups: - "" diff --git a/charts/rollout-operator/templates/rolebinding.yaml b/charts/rollout-operator/templates/rolebinding.yaml index 24fcd72663..d1cfe6826c 100644 --- a/charts/rollout-operator/templates/rolebinding.yaml +++ b/charts/rollout-operator/templates/rolebinding.yaml @@ -2,6 +2,8 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: name: {{ include "rollout-operator.fullname" . }} + labels: + {{- include "rollout-operator.labels" . | nindent 4 }} roleRef: apiGroup: rbac.authorization.k8s.io kind: Role diff --git a/charts/rollout-operator/values.yaml b/charts/rollout-operator/values.yaml index 66f9486b1a..1711671f7a 100644 --- a/charts/rollout-operator/values.yaml +++ b/charts/rollout-operator/values.yaml @@ -2,6 +2,12 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. + +global: + # -- Common labels for all object directly managed by this chart. + commonLabels: {} + + image: repository: grafana/rollout-operator pullPolicy: IfNotPresent From 74160c292a64bb84869a0e5fdff0d4d171d2f7ff Mon Sep 17 00:00:00 2001 From: fabio trigari Date: Tue, 29 Oct 2024 01:04:21 +0100 Subject: [PATCH 2/3] [tempo-vulture] Add commonLabels (#3319) Signed-off-by: fabio trigari --- charts/tempo-vulture/Chart.yaml | 2 +- charts/tempo-vulture/README.md | 1 + charts/tempo-vulture/templates/_helpers.tpl | 3 +++ charts/tempo-vulture/values.yaml | 5 +++++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/charts/tempo-vulture/Chart.yaml b/charts/tempo-vulture/Chart.yaml index 59fb60cd0e..44393355ca 100644 --- a/charts/tempo-vulture/Chart.yaml +++ b/charts/tempo-vulture/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-vulture description: Grafana Tempo Vulture - A tool to monitor Tempo performance. type: application -version: 0.5.0 +version: 0.5.1 appVersion: 2.5.0 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-vulture/README.md b/charts/tempo-vulture/README.md index 86b510d5fa..5378a14ab8 100644 --- a/charts/tempo-vulture/README.md +++ b/charts/tempo-vulture/README.md @@ -54,6 +54,7 @@ tempoAddress: | extraEnv | list | `[]` | Environment variables to add to the vulture pods | | extraEnvFrom | list | `[]` | Environment variables from secrets or configmaps to add to the vulture pods | | fullnameOverride | string | `""` | Overrides the chart's computed fullname | +| global.commonLabels | object | `{}` | Common labels for all object directly managed by this chart. scope: * | | hostAliases | list | `[]` | hostAliases to add | | image.pullPolicy | string | `"IfNotPresent"` | Docker image pull policy | | image.repository | string | `"docker.io/grafana/tempo-vulture"` | Docker image repository | diff --git a/charts/tempo-vulture/templates/_helpers.tpl b/charts/tempo-vulture/templates/_helpers.tpl index d19656be82..f183cfe9fd 100644 --- a/charts/tempo-vulture/templates/_helpers.tpl +++ b/charts/tempo-vulture/templates/_helpers.tpl @@ -40,6 +40,9 @@ helm.sh/chart: {{ include "tempo-vulture.chart" . }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }} app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- with .Values.global.commonLabels }} +{{ toYaml . }} +{{- end }} {{- end }} {{/* diff --git a/charts/tempo-vulture/values.yaml b/charts/tempo-vulture/values.yaml index f056143a49..def34f9d1c 100644 --- a/charts/tempo-vulture/values.yaml +++ b/charts/tempo-vulture/values.yaml @@ -1,3 +1,8 @@ +global: + # -- Common labels for all object directly managed by this chart. + # scope: * + commonLabels: {} + # -- Overrides the chart's name nameOverride: "" # -- Overrides the chart's computed fullname From 711a08d4d31cf8bb15818ef5b3af3da9616270b3 Mon Sep 17 00:00:00 2001 From: fabio trigari Date: Tue, 29 Oct 2024 01:22:05 +0100 Subject: [PATCH 3/3] [tempo-vulture] Update README and chart version (#3319) Signed-off-by: fabio trigari --- charts/tempo-vulture/Chart.yaml | 2 +- charts/tempo-vulture/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/tempo-vulture/Chart.yaml b/charts/tempo-vulture/Chart.yaml index 44393355ca..de91cadb86 100644 --- a/charts/tempo-vulture/Chart.yaml +++ b/charts/tempo-vulture/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-vulture description: Grafana Tempo Vulture - A tool to monitor Tempo performance. type: application -version: 0.5.1 +version: 0.6.0 appVersion: 2.5.0 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-vulture/README.md b/charts/tempo-vulture/README.md index 5378a14ab8..032c498ddf 100644 --- a/charts/tempo-vulture/README.md +++ b/charts/tempo-vulture/README.md @@ -1,6 +1,6 @@ # tempo-vulture -![Version: 0.5.0](https://img.shields.io/badge/Version-0.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square) +![Version: 0.6.0](https://img.shields.io/badge/Version-0.6.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square) Grafana Tempo Vulture - A tool to monitor Tempo performance.