From 61052424c3000661e9a1e693e1428b39826bd525 Mon Sep 17 00:00:00 2001 From: Rob Watson Date: Tue, 20 Dec 2022 08:40:36 +0100 Subject: [PATCH] grafana: Update chart --- .../grafana/templates/clusterrole.yaml | 4 +- .../grafana/templates/clusterrolebinding.yaml | 4 +- .../inflated/grafana/templates/configmap.yaml | 35 ++++++++++--- .../templates/dashboards-json-configmap.yaml | 4 +- .../grafana/templates/deployment.yaml | 19 +++---- .../grafana/templates/podsecuritypolicy.yaml | 51 ------------------- .../base/inflated/grafana/templates/role.yaml | 12 ++--- .../grafana/templates/rolebinding.yaml | 4 +- .../inflated/grafana/templates/service.yaml | 5 +- .../grafana/templates/serviceaccount.yaml | 4 +- deploy/base/kustomization.yaml | 1 - 11 files changed, 51 insertions(+), 92 deletions(-) delete mode 100644 deploy/base/inflated/grafana/templates/podsecuritypolicy.yaml diff --git a/deploy/base/inflated/grafana/templates/clusterrole.yaml b/deploy/base/inflated/grafana/templates/clusterrole.yaml index 6dab22f..f7c0810 100644 --- a/deploy/base/inflated/grafana/templates/clusterrole.yaml +++ b/deploy/base/inflated/grafana/templates/clusterrole.yaml @@ -4,10 +4,10 @@ kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: labels: - helm.sh/chart: grafana-6.29.2 + helm.sh/chart: grafana-6.48.0 app.kubernetes.io/name: grafana app.kubernetes.io/instance: grafana - app.kubernetes.io/version: "8.5.0" + app.kubernetes.io/version: "9.3.1" app.kubernetes.io/managed-by: Helm name: grafana-clusterrole rules: [] diff --git a/deploy/base/inflated/grafana/templates/clusterrolebinding.yaml b/deploy/base/inflated/grafana/templates/clusterrolebinding.yaml index 66d0b94..9e2df22 100644 --- a/deploy/base/inflated/grafana/templates/clusterrolebinding.yaml +++ b/deploy/base/inflated/grafana/templates/clusterrolebinding.yaml @@ -5,10 +5,10 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: grafana-clusterrolebinding labels: - helm.sh/chart: grafana-6.29.2 + helm.sh/chart: grafana-6.48.0 app.kubernetes.io/name: grafana app.kubernetes.io/instance: grafana - app.kubernetes.io/version: "8.5.0" + app.kubernetes.io/version: "9.3.1" app.kubernetes.io/managed-by: Helm subjects: - kind: ServiceAccount diff --git a/deploy/base/inflated/grafana/templates/configmap.yaml b/deploy/base/inflated/grafana/templates/configmap.yaml index 84a49c6..93e6a30 100644 --- a/deploy/base/inflated/grafana/templates/configmap.yaml +++ b/deploy/base/inflated/grafana/templates/configmap.yaml @@ -6,10 +6,10 @@ metadata: name: grafana namespace: default labels: - helm.sh/chart: grafana-6.29.2 + helm.sh/chart: grafana-6.48.0 app.kubernetes.io/name: grafana app.kubernetes.io/instance: grafana - app.kubernetes.io/version: "8.5.0" + app.kubernetes.io/version: "9.3.1" app.kubernetes.io/managed-by: Helm data: grafana.ini: | @@ -24,7 +24,8 @@ data: logs = /var/log/grafana plugins = /var/lib/grafana/plugins provisioning = /etc/grafana/provisioning - + [server] + domain = '' datasources.yaml: | apiVersion: 1 datasources: @@ -53,33 +54,51 @@ data: --max-time 60 \ -H "Accept: application/json" \ -H "Content-Type: application/json;charset=UTF-8" \ - "https://grafana.com/api/dashboards/10046/revisions/1/download" | sed '/-- .* --/! s/"datasource":.*,/"datasource": "Prometheus",/g'\ + "https://grafana.com/api/dashboards/13192/revisions/1/download" \ + | sed '/-- .* --/! s/"datasource":.*,/"datasource": "Prometheus",/g' \ > "/var/lib/grafana/dashboards/default/gitea.json" + curl -skf \ --connect-timeout 60 \ --max-time 60 \ -H "Accept: application/json" \ -H "Content-Type: application/json;charset=UTF-8" \ - "https://grafana.com/api/dashboards/12006/revisions/1/download" | sed '/-- .* --/! s/"datasource":.*,/"datasource": "Prometheus",/g'\ + "https://grafana.com/api/dashboards/12006/revisions/1/download" \ + | sed '/-- .* --/! s/"datasource":.*,/"datasource": "Prometheus",/g' \ > "/var/lib/grafana/dashboards/default/kubernetes-apiserver.json" + curl -skf \ --connect-timeout 60 \ --max-time 60 \ -H "Accept: application/json" \ -H "Content-Type: application/json;charset=UTF-8" \ - "https://grafana.com/api/dashboards/9614/revisions/1/download" | sed '/-- .* --/! s/"datasource":.*,/"datasource": "Prometheus",/g'\ + "https://grafana.com/api/dashboards/9614/revisions/1/download" \ + | sed '/-- .* --/! s/"datasource":.*,/"datasource": "Prometheus",/g' \ > "/var/lib/grafana/dashboards/default/nginx-ingress.json" + curl -skf \ --connect-timeout 60 \ --max-time 60 \ -H "Accept: application/json" \ -H "Content-Type: application/json;charset=UTF-8" \ - "https://grafana.com/api/dashboards/1860/revisions/26/download" | sed '/-- .* --/! s/"datasource":.*,/"datasource": "Prometheus",/g'\ + "https://grafana.com/api/dashboards/1860/revisions/26/download" \ + | sed '/-- .* --/! s/"datasource":.*,/"datasource": "Prometheus",/g' \ > "/var/lib/grafana/dashboards/default/node.json" + curl -skf \ --connect-timeout 60 \ --max-time 60 \ -H "Accept: application/json" \ -H "Content-Type: application/json;charset=UTF-8" \ - "https://grafana.com/api/dashboards/9628/revisions/7/download" | sed '/-- .* --/! s/"datasource":.*,/"datasource": "Prometheus",/g'\ + "https://grafana.com/api/dashboards/9628/revisions/7/download" \ + | sed '/-- .* --/! s/"datasource":.*,/"datasource": "Prometheus",/g' \ > "/var/lib/grafana/dashboards/default/postgresql.json" + + curl -skf \ + --connect-timeout 60 \ + --max-time 60 \ + -H "Accept: application/json" \ + -H "Content-Type: application/json;charset=UTF-8" \ + "https://grafana.com/api/dashboards/10046/revisions/1/download" \ + | sed '/-- .* --/! s/"datasource":.*,/"datasource": "Prometheus",/g' \ + > "/var/lib/grafana/dashboards/default/synapse.json" diff --git a/deploy/base/inflated/grafana/templates/dashboards-json-configmap.yaml b/deploy/base/inflated/grafana/templates/dashboards-json-configmap.yaml index 1caa5a2..2c64d89 100644 --- a/deploy/base/inflated/grafana/templates/dashboards-json-configmap.yaml +++ b/deploy/base/inflated/grafana/templates/dashboards-json-configmap.yaml @@ -6,10 +6,10 @@ metadata: name: grafana-dashboards-default namespace: default labels: - helm.sh/chart: grafana-6.29.2 + helm.sh/chart: grafana-6.48.0 app.kubernetes.io/name: grafana app.kubernetes.io/instance: grafana - app.kubernetes.io/version: "8.5.0" + app.kubernetes.io/version: "9.3.1" app.kubernetes.io/managed-by: Helm dashboard-provider: default data: diff --git a/deploy/base/inflated/grafana/templates/deployment.yaml b/deploy/base/inflated/grafana/templates/deployment.yaml index eeea176..0cbfbdf 100644 --- a/deploy/base/inflated/grafana/templates/deployment.yaml +++ b/deploy/base/inflated/grafana/templates/deployment.yaml @@ -6,10 +6,10 @@ metadata: name: grafana namespace: default labels: - helm.sh/chart: grafana-6.29.2 + helm.sh/chart: grafana-6.48.0 app.kubernetes.io/name: grafana app.kubernetes.io/instance: grafana - app.kubernetes.io/version: "8.5.0" + app.kubernetes.io/version: "9.3.1" app.kubernetes.io/managed-by: Helm spec: replicas: 1 @@ -26,8 +26,8 @@ spec: app.kubernetes.io/name: grafana app.kubernetes.io/instance: grafana annotations: - checksum/config: 6060638a52f08e279c64b37a63b59ec99aa0b12a2a25e594b3d7acd41512ea01 - checksum/dashboards-json-config: 60bfce132b37398fa9329494762f049aebef4ba473dabdd67d4f15d6a86a578c + checksum/config: 60be875675b2ad83279ee347d5a150559b24646f43fbc740f51b97915a0b9c31 + checksum/dashboards-json-config: 703b33634d715cefba0501f04654c5d6dc28aba46888183ea3420ccdae3c8ecf checksum/sc-dashboard-provider-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b spec: @@ -39,12 +39,10 @@ spec: runAsUser: 472 initContainers: - name: download-dashboards - image: "curlimages/curl:7.73.0" + image: "curlimages/curl:7.85.0" imagePullPolicy: IfNotPresent command: ["/bin/sh"] args: [ "-c", "mkdir -p /var/lib/grafana/dashboards/default && /bin/sh -x /etc/grafana/download_dashboards.sh" ] - resources: - {} env: volumeMounts: - name: config @@ -55,7 +53,7 @@ spec: enableServiceLinks: true containers: - name: grafana - image: "grafana/grafana:8.5.0" + image: "grafana/grafana:9.3.1" imagePullPolicy: IfNotPresent volumeMounts: - name: config @@ -70,9 +68,6 @@ spec: mountPath: "/etc/grafana/provisioning/dashboards/dashboardproviders.yaml" subPath: "dashboardproviders.yaml" ports: - - name: service - containerPort: 80 - protocol: TCP - name: grafana containerPort: 3000 protocol: TCP @@ -106,8 +101,6 @@ spec: httpGet: path: /api/health port: 3000 - resources: - {} volumes: - name: config configMap: diff --git a/deploy/base/inflated/grafana/templates/podsecuritypolicy.yaml b/deploy/base/inflated/grafana/templates/podsecuritypolicy.yaml deleted file mode 100644 index b4dcf77..0000000 --- a/deploy/base/inflated/grafana/templates/podsecuritypolicy.yaml +++ /dev/null @@ -1,51 +0,0 @@ ---- -# Source: grafana/templates/podsecuritypolicy.yaml -apiVersion: policy/v1beta1 -kind: PodSecurityPolicy -metadata: - name: grafana - labels: - helm.sh/chart: grafana-6.29.2 - app.kubernetes.io/name: grafana - app.kubernetes.io/instance: grafana - app.kubernetes.io/version: "8.5.0" - app.kubernetes.io/managed-by: Helm - annotations: - seccomp.security.alpha.kubernetes.io/allowedProfileNames: 'docker/default,runtime/default' - seccomp.security.alpha.kubernetes.io/defaultProfileName: 'docker/default' - apparmor.security.beta.kubernetes.io/allowedProfileNames: 'runtime/default' - apparmor.security.beta.kubernetes.io/defaultProfileName: 'runtime/default' -spec: - privileged: false - allowPrivilegeEscalation: false - requiredDropCapabilities: - # Default set from Docker, with DAC_OVERRIDE and CHOWN - - ALL - volumes: - - 'configMap' - - 'emptyDir' - - 'projected' - - 'csi' - - 'secret' - - 'downwardAPI' - - 'persistentVolumeClaim' - hostNetwork: false - hostIPC: false - hostPID: false - runAsUser: - rule: 'RunAsAny' - seLinux: - rule: 'RunAsAny' - supplementalGroups: - rule: 'MustRunAs' - ranges: - # Forbid adding the root group. - - min: 1 - max: 65535 - fsGroup: - rule: 'MustRunAs' - ranges: - # Forbid adding the root group. - - min: 1 - max: 65535 - readOnlyRootFilesystem: false diff --git a/deploy/base/inflated/grafana/templates/role.yaml b/deploy/base/inflated/grafana/templates/role.yaml index d49603c..eab406c 100644 --- a/deploy/base/inflated/grafana/templates/role.yaml +++ b/deploy/base/inflated/grafana/templates/role.yaml @@ -6,13 +6,13 @@ metadata: name: grafana namespace: default labels: - helm.sh/chart: grafana-6.29.2 + helm.sh/chart: grafana-6.48.0 app.kubernetes.io/name: grafana app.kubernetes.io/instance: grafana - app.kubernetes.io/version: "8.5.0" + app.kubernetes.io/version: "9.3.1" app.kubernetes.io/managed-by: Helm rules: -- apiGroups: ['extensions'] - resources: ['podsecuritypolicies'] - verbs: ['use'] - resourceNames: [grafana] + - apiGroups: ['extensions'] + resources: ['podsecuritypolicies'] + verbs: ['use'] + resourceNames: [grafana] diff --git a/deploy/base/inflated/grafana/templates/rolebinding.yaml b/deploy/base/inflated/grafana/templates/rolebinding.yaml index 0ab6ad0..f47ff96 100644 --- a/deploy/base/inflated/grafana/templates/rolebinding.yaml +++ b/deploy/base/inflated/grafana/templates/rolebinding.yaml @@ -6,10 +6,10 @@ metadata: name: grafana namespace: default labels: - helm.sh/chart: grafana-6.29.2 + helm.sh/chart: grafana-6.48.0 app.kubernetes.io/name: grafana app.kubernetes.io/instance: grafana - app.kubernetes.io/version: "8.5.0" + app.kubernetes.io/version: "9.3.1" app.kubernetes.io/managed-by: Helm roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/deploy/base/inflated/grafana/templates/service.yaml b/deploy/base/inflated/grafana/templates/service.yaml index 89fe3a7..04858bc 100644 --- a/deploy/base/inflated/grafana/templates/service.yaml +++ b/deploy/base/inflated/grafana/templates/service.yaml @@ -6,10 +6,10 @@ metadata: name: grafana namespace: default labels: - helm.sh/chart: grafana-6.29.2 + helm.sh/chart: grafana-6.48.0 app.kubernetes.io/name: grafana app.kubernetes.io/instance: grafana - app.kubernetes.io/version: "8.5.0" + app.kubernetes.io/version: "9.3.1" app.kubernetes.io/managed-by: Helm spec: type: ClusterIP @@ -18,7 +18,6 @@ spec: port: 80 protocol: TCP targetPort: 3000 - selector: app.kubernetes.io/name: grafana app.kubernetes.io/instance: grafana diff --git a/deploy/base/inflated/grafana/templates/serviceaccount.yaml b/deploy/base/inflated/grafana/templates/serviceaccount.yaml index ca08b16..a5af69a 100644 --- a/deploy/base/inflated/grafana/templates/serviceaccount.yaml +++ b/deploy/base/inflated/grafana/templates/serviceaccount.yaml @@ -4,10 +4,10 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - helm.sh/chart: grafana-6.29.2 + helm.sh/chart: grafana-6.48.0 app.kubernetes.io/name: grafana app.kubernetes.io/instance: grafana - app.kubernetes.io/version: "8.5.0" + app.kubernetes.io/version: "9.3.1" app.kubernetes.io/managed-by: Helm name: grafana namespace: default diff --git a/deploy/base/kustomization.yaml b/deploy/base/kustomization.yaml index 7e9bed2..e0d2fd5 100644 --- a/deploy/base/kustomization.yaml +++ b/deploy/base/kustomization.yaml @@ -66,7 +66,6 @@ resources: - inflated/grafana/templates/role.yaml - inflated/grafana/templates/service.yaml - inflated/grafana/templates/clusterrole.yaml -- inflated/grafana/templates/podsecuritypolicy.yaml - inflated/grafana/templates/configmap.yaml - inflated/grafana/templates/clusterrolebinding.yaml # kubernetes-replicator