From 5a38e72bbbf973e3bf150288b4bf277ae9d3837a Mon Sep 17 00:00:00 2001 From: Jimmy Bourque Date: Tue, 12 Nov 2024 10:58:03 -0600 Subject: [PATCH 1/6] Updated pod labels to include all labels Signed-off-by: Jimmy Bourque --- charts/grafana/templates/deployment.yaml | 2 +- charts/grafana/templates/statefulset.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/grafana/templates/deployment.yaml b/charts/grafana/templates/deployment.yaml index d309a7e5ff..7bf7521550 100644 --- a/charts/grafana/templates/deployment.yaml +++ b/charts/grafana/templates/deployment.yaml @@ -28,7 +28,7 @@ spec: template: metadata: labels: - {{- include "grafana.selectorLabels" . | nindent 8 }} + {{- include "grafana.labels" . | nindent 8 }} {{- with .Values.podLabels }} {{- toYaml . | nindent 8 }} {{- end }} diff --git a/charts/grafana/templates/statefulset.yaml b/charts/grafana/templates/statefulset.yaml index 7546c18876..896f8107f7 100644 --- a/charts/grafana/templates/statefulset.yaml +++ b/charts/grafana/templates/statefulset.yaml @@ -20,7 +20,7 @@ spec: template: metadata: labels: - {{- include "grafana.selectorLabels" . | nindent 8 }} + {{- include "grafana.labels" . | nindent 8 }} {{- with .Values.podLabels }} {{- toYaml . | nindent 8 }} {{- end }} From 8562a6c90334dbc2f4dae98425b3383a06a8913f Mon Sep 17 00:00:00 2001 From: Jimmy Bourque Date: Wed, 13 Nov 2024 06:22:00 -0600 Subject: [PATCH 2/6] bumped charted version Signed-off-by: Jimmy Bourque --- 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 2e3260979a..1acd70e631 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 8.6.0 +version: 8.6.1 appVersion: 11.3.0 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. From 531e7ef4dbc599e73917376038e275cd05d0b605 Mon Sep 17 00:00:00 2001 From: Jimmy Bourque Date: Fri, 22 Nov 2024 06:08:09 -0600 Subject: [PATCH 3/6] Resolving conflict --- 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 1acd70e631..38016558ea 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: grafana version: 8.6.1 -appVersion: 11.3.0 +appVersion: 11.3.1 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. home: https://grafana.com From a05f038d298aef08d5d6e524a9cb233a4f2e39e6 Mon Sep 17 00:00:00 2001 From: Jimmy Bourque Date: Sat, 23 Nov 2024 07:46:34 -0600 Subject: [PATCH 4/6] Revert "Resolving conflict" This reverts commit 531e7ef4dbc599e73917376038e275cd05d0b605. --- 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 38016558ea..1acd70e631 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: grafana version: 8.6.1 -appVersion: 11.3.1 +appVersion: 11.3.0 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. home: https://grafana.com From d8c69fc8de9964eb86f1aa8e5ccce4b35a2b5608 Mon Sep 17 00:00:00 2001 From: Jimmy Bourque Date: Sat, 23 Nov 2024 07:48:20 -0600 Subject: [PATCH 5/6] Resolving conflict Signed-off-by: Jimmy Bourque --- 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 1acd70e631..38016558ea 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: grafana version: 8.6.1 -appVersion: 11.3.0 +appVersion: 11.3.1 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. home: https://grafana.com From 2801dcef0bb6080f2ae9d67dde32ec456b900e85 Mon Sep 17 00:00:00 2001 From: MH Date: Tue, 26 Nov 2024 15:10:15 +0800 Subject: [PATCH 6/6] Update Chart.yaml Signed-off-by: MH 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 38016558ea..09ee77aa31 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 8.6.1 +version: 8.6.2 appVersion: 11.3.1 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics.