config: update grafana chart to 7.3.12

elastisys · Aug 21, 2024 · d8ba716 · d8ba716
1 parent b79ae3a
commit d8ba716
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 10 deletions.
diff --git a/helmfile.d/upstream/grafana/grafana/Chart.yaml b/helmfile.d/upstream/grafana/grafana/Chart.yaml
@@ -6,7 +6,7 @@ annotations:
     - name: Upstream Project
       url: https://github.com/grafana/grafana
 apiVersion: v2
-appVersion: 10.4.0
+appVersion: 10.4.3
 description: The leading tool for querying and visualizing time series and metrics.
 home: https://grafana.com
 icon: https://artifacthub.io/image/b4fed1a7-6c8f-4945-b99d-096efa3e4116
@@ -30,4 +30,4 @@ sources:
 - https://github.com/grafana/grafana
 - https://github.com/grafana/helm-charts
 type: application
-version: 7.3.7
+version: 7.3.12
diff --git a/helmfile.d/upstream/grafana/grafana/templates/_helpers.tpl b/helmfile.d/upstream/grafana/grafana/templates/_helpers.tpl
@@ -145,13 +145,11 @@ Return the appropriate apiVersion for ingress.
 Return the appropriate apiVersion for Horizontal Pod Autoscaler.
 */}}
 {{- define "grafana.hpa.apiVersion" -}}
-{{- if $.Capabilities.APIVersions.Has "autoscaling/v2/HorizontalPodAutoscaler" }}
-{{- print "autoscaling/v2" }}
-{{- else if $.Capabilities.APIVersions.Has "autoscaling/v2beta2/HorizontalPodAutoscaler" }}
-{{- print "autoscaling/v2beta2" }}
-{{- else }}
-{{- print "autoscaling/v2beta1" }}
-{{- end }}
+{{- if .Capabilities.APIVersions.Has "autoscaling/v2" }}  
+{{- print "autoscaling/v2" }}  
+{{- else }}  
+{{- print "autoscaling/v2beta2" }}  
+{{- end }} 
 {{- end }}
 
 {{/*

diff --git a/helmfile.d/upstream/grafana/grafana/templates/pvc.yaml b/helmfile.d/upstream/grafana/grafana/templates/pvc.yaml
@@ -25,6 +25,9 @@ spec:
   resources:
     requests:
       storage: {{ .Values.persistence.size | quote }}
+  {{- if (lookup "v1" "PersistentVolumeClaim" (include "grafana.namespace" .) (include "grafana.fullname" .)) }}
+  volumeName: {{ (lookup "v1" "PersistentVolumeClaim" (include "grafana.namespace" .) (include "grafana.fullname" .)).spec.volumeName }}
+  {{- end }}
   {{- with .Values.persistence.storageClassName }}
   storageClassName: {{ . }}
   {{- end }}

diff --git a/helmfile.d/upstream/grafana/grafana/templates/tests/test.yaml b/helmfile.d/upstream/grafana/grafana/templates/tests/test.yaml
@@ -41,6 +41,10 @@ spec:
         - mountPath: /tests
           name: tests
           readOnly: true
+      {{- with .Values.testFramework.resources }}
+      resources:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
   volumes:
     - name: tests
       configMap:

diff --git a/helmfile.d/upstream/grafana/grafana/values.yaml b/helmfile.d/upstream/grafana/grafana/values.yaml
@@ -121,6 +121,13 @@ testFramework:
     tag: "v1.4.1"
   imagePullPolicy: IfNotPresent
   securityContext: {}
+  resources: {}
+  #  limits:
+  #    cpu: 100m
+  #    memory: 128Mi
+  #  requests:
+  #    cpu: 100m
+  #    memory: 128Mi
 
 # dns configuration for pod
 dnsPolicy: ~

diff --git a/helmfile.d/upstream/index.yaml b/helmfile.d/upstream/index.yaml
@@ -46,7 +46,7 @@ charts:
 
   goharbor/harbor: 1.15.0
 
-  grafana/grafana: 7.3.7
+  grafana/grafana: 7.3.12
 
   jetstack/cert-manager: v1.12.8
 

diff --git a/helmfile.d/values/grafana/grafana-common.yaml.gotmpl b/helmfile.d/values/grafana/grafana-common.yaml.gotmpl
@@ -1,3 +1,8 @@
+# TODO: remove the image override next time the Grafana chart is upgraded
+# see https://github.com/elastisys/compliantkubernetes-apps/pull/2240 for context.
+image:
+  tag: 10.4.7
+
 testFramework:
     enabled: false