From de2ba712c459dfe5253525a79dd38edb643993c4 Mon Sep 17 00:00:00 2001 From: Rob Watson Date: Sat, 26 Apr 2025 17:53:11 +0200 Subject: [PATCH] chore: update grafana --- .../grafana/templates/clusterrole.yaml | 5 ++--- .../grafana/templates/clusterrolebinding.yaml | 5 ++--- .../inflated/grafana/templates/configmap.yaml | 5 ++--- .../templates/dashboards-json-configmap.yaml | 5 ++--- .../grafana/templates/deployment.yaml | 19 ++++++++++++------- .../base/inflated/grafana/templates/role.yaml | 5 ++--- .../grafana/templates/rolebinding.yaml | 5 ++--- .../inflated/grafana/templates/service.yaml | 5 ++--- .../grafana/templates/serviceaccount.yaml | 5 ++--- 9 files changed, 28 insertions(+), 31 deletions(-) diff --git a/deploy/base/inflated/grafana/templates/clusterrole.yaml b/deploy/base/inflated/grafana/templates/clusterrole.yaml index 79cf4a2..cdc8e35 100644 --- a/deploy/base/inflated/grafana/templates/clusterrole.yaml +++ b/deploy/base/inflated/grafana/templates/clusterrole.yaml @@ -4,10 +4,9 @@ kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: labels: - helm.sh/chart: grafana-7.3.8 + helm.sh/chart: grafana-8.13.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: grafana - app.kubernetes.io/version: "10.4.1" - app.kubernetes.io/managed-by: Helm + app.kubernetes.io/version: "11.6.1" name: grafana-clusterrole rules: [] diff --git a/deploy/base/inflated/grafana/templates/clusterrolebinding.yaml b/deploy/base/inflated/grafana/templates/clusterrolebinding.yaml index e8287f1..1eaf78d 100644 --- a/deploy/base/inflated/grafana/templates/clusterrolebinding.yaml +++ b/deploy/base/inflated/grafana/templates/clusterrolebinding.yaml @@ -5,11 +5,10 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: grafana-clusterrolebinding labels: - helm.sh/chart: grafana-7.3.8 + helm.sh/chart: grafana-8.13.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: grafana - app.kubernetes.io/version: "10.4.1" - app.kubernetes.io/managed-by: Helm + app.kubernetes.io/version: "11.6.1" subjects: - kind: ServiceAccount name: grafana diff --git a/deploy/base/inflated/grafana/templates/configmap.yaml b/deploy/base/inflated/grafana/templates/configmap.yaml index 73d6bb9..b8b6be7 100644 --- a/deploy/base/inflated/grafana/templates/configmap.yaml +++ b/deploy/base/inflated/grafana/templates/configmap.yaml @@ -6,11 +6,10 @@ metadata: name: grafana namespace: default labels: - helm.sh/chart: grafana-7.3.8 + helm.sh/chart: grafana-8.13.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: grafana - app.kubernetes.io/version: "10.4.1" - app.kubernetes.io/managed-by: Helm + app.kubernetes.io/version: "11.6.1" data: grafana.ini: | diff --git a/deploy/base/inflated/grafana/templates/dashboards-json-configmap.yaml b/deploy/base/inflated/grafana/templates/dashboards-json-configmap.yaml index e5bcc7c..f72a1b5 100644 --- a/deploy/base/inflated/grafana/templates/dashboards-json-configmap.yaml +++ b/deploy/base/inflated/grafana/templates/dashboards-json-configmap.yaml @@ -6,11 +6,10 @@ metadata: name: grafana-dashboards-default namespace: default labels: - helm.sh/chart: grafana-7.3.8 + helm.sh/chart: grafana-8.13.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: grafana - app.kubernetes.io/version: "10.4.1" - app.kubernetes.io/managed-by: Helm + app.kubernetes.io/version: "11.6.1" dashboard-provider: default data: {} diff --git a/deploy/base/inflated/grafana/templates/deployment.yaml b/deploy/base/inflated/grafana/templates/deployment.yaml index 5f2fa30..68f045a 100644 --- a/deploy/base/inflated/grafana/templates/deployment.yaml +++ b/deploy/base/inflated/grafana/templates/deployment.yaml @@ -6,11 +6,10 @@ metadata: name: grafana namespace: default labels: - helm.sh/chart: grafana-7.3.8 + helm.sh/chart: grafana-8.13.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: grafana - app.kubernetes.io/version: "10.4.1" - app.kubernetes.io/managed-by: Helm + app.kubernetes.io/version: "11.6.1" spec: replicas: 1 revisionHistoryLimit: 10 @@ -23,17 +22,20 @@ spec: template: metadata: labels: + helm.sh/chart: grafana-8.13.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: grafana + app.kubernetes.io/version: "11.6.1" annotations: checksum/config: d247383d611034ff04b37cc27677f166bc48f1eb6f5bb108696cb8a488b1c954 - checksum/dashboards-json-config: 6cafd198a0669840a2973e251c2a9a6dade8318043557e28a0c85c0de28e3b46 - checksum/sc-dashboard-provider-config: 593c0a8778b83f11fe80ccb21dfb20bc46705e2be3178df1dc4c89d164c8cd9c + checksum/dashboards-json-config: 495e1c22f129c999f0023fc9328b482ab76cc69ab7db8fd42f6b03604712e205 + checksum/sc-dashboard-provider-config: e70bf6a851099d385178a76de9757bb0bef8299da6d8443602590e44f05fdf24 kubectl.kubernetes.io/default-container: grafana spec: serviceAccountName: grafana automountServiceAccountToken: true + shareProcessNamespace: false securityContext: fsGroup: 472 runAsGroup: 472 @@ -41,7 +43,7 @@ spec: runAsUser: 472 initContainers: - name: download-dashboards - image: "docker.io/curlimages/curl:7.85.0" + image: "docker.io/curlimages/curl:8.9.1" imagePullPolicy: IfNotPresent command: ["/bin/sh"] args: [ "-c", "mkdir -p /var/lib/grafana/dashboards/default && /bin/sh -x /etc/grafana/download_dashboards.sh" ] @@ -62,7 +64,7 @@ spec: enableServiceLinks: true containers: - name: grafana - image: "docker.io/grafana/grafana:10.4.1" + image: "docker.io/grafana/grafana:11.6.1" imagePullPolicy: IfNotPresent securityContext: allowPrivilegeEscalation: false @@ -99,6 +101,9 @@ spec: - name: gossip-udp containerPort: 9094 protocol: UDP + - name: profiling + containerPort: 6060 + protocol: TCP env: - name: POD_IP valueFrom: diff --git a/deploy/base/inflated/grafana/templates/role.yaml b/deploy/base/inflated/grafana/templates/role.yaml index c4ab2aa..4d6a407 100644 --- a/deploy/base/inflated/grafana/templates/role.yaml +++ b/deploy/base/inflated/grafana/templates/role.yaml @@ -6,9 +6,8 @@ metadata: name: grafana namespace: default labels: - helm.sh/chart: grafana-7.3.8 + helm.sh/chart: grafana-8.13.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: grafana - app.kubernetes.io/version: "10.4.1" - app.kubernetes.io/managed-by: Helm + app.kubernetes.io/version: "11.6.1" rules: [] diff --git a/deploy/base/inflated/grafana/templates/rolebinding.yaml b/deploy/base/inflated/grafana/templates/rolebinding.yaml index 4cdd249..1226294 100644 --- a/deploy/base/inflated/grafana/templates/rolebinding.yaml +++ b/deploy/base/inflated/grafana/templates/rolebinding.yaml @@ -6,11 +6,10 @@ metadata: name: grafana namespace: default labels: - helm.sh/chart: grafana-7.3.8 + helm.sh/chart: grafana-8.13.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: grafana - app.kubernetes.io/version: "10.4.1" - app.kubernetes.io/managed-by: Helm + app.kubernetes.io/version: "11.6.1" roleRef: apiGroup: rbac.authorization.k8s.io kind: Role diff --git a/deploy/base/inflated/grafana/templates/service.yaml b/deploy/base/inflated/grafana/templates/service.yaml index d782803..3c1bd7e 100644 --- a/deploy/base/inflated/grafana/templates/service.yaml +++ b/deploy/base/inflated/grafana/templates/service.yaml @@ -6,11 +6,10 @@ metadata: name: grafana namespace: default labels: - helm.sh/chart: grafana-7.3.8 + helm.sh/chart: grafana-8.13.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: grafana - app.kubernetes.io/version: "10.4.1" - app.kubernetes.io/managed-by: Helm + app.kubernetes.io/version: "11.6.1" spec: type: ClusterIP ports: diff --git a/deploy/base/inflated/grafana/templates/serviceaccount.yaml b/deploy/base/inflated/grafana/templates/serviceaccount.yaml index f82825a..e99d357 100644 --- a/deploy/base/inflated/grafana/templates/serviceaccount.yaml +++ b/deploy/base/inflated/grafana/templates/serviceaccount.yaml @@ -5,10 +5,9 @@ kind: ServiceAccount automountServiceAccountToken: false metadata: labels: - helm.sh/chart: grafana-7.3.8 + helm.sh/chart: grafana-8.13.1 app.kubernetes.io/name: grafana app.kubernetes.io/instance: grafana - app.kubernetes.io/version: "10.4.1" - app.kubernetes.io/managed-by: Helm + app.kubernetes.io/version: "11.6.1" name: grafana namespace: default