From 5b5c4895003308409ccc87dd5db03ddb9e488f9c Mon Sep 17 00:00:00 2001
From: dbluxo <20679842+dbluxo@users.noreply.github.com>
Date: Fri, 16 Feb 2024 14:08:16 +0100
Subject: [PATCH 1/4] feat: add possibility to set resources for the
 testframework container

Signed-off-by: dbluxo <20679842+dbluxo@users.noreply.github.com>
---
 charts/grafana/Chart.yaml                | 2 +-
 charts/grafana/templates/tests/test.yaml | 4 ++++
 charts/grafana/values.yaml               | 7 +++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml
index c027fc1ade..922f932ca3 100644
--- a/charts/grafana/Chart.yaml
+++ b/charts/grafana/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: grafana
-version: 7.3.0
+version: 7.3.1
 appVersion: 10.3.1
 kubeVersion: "^1.8.0-0"
 description: The leading tool for querying and visualizing time series and metrics.
diff --git a/charts/grafana/templates/tests/test.yaml b/charts/grafana/templates/tests/test.yaml
index 15067ae307..9e88afcfa0 100644
--- a/charts/grafana/templates/tests/test.yaml
+++ b/charts/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/charts/grafana/values.yaml b/charts/grafana/values.yaml
index ab853e09c7..cc6e9aec78 100644
--- a/charts/grafana/values.yaml
+++ b/charts/grafana/values.yaml
@@ -115,6 +115,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: ~

From 3fbc19b1499c7ac180b9949f14fb015a5ee58327 Mon Sep 17 00:00:00 2001
From: Vladimir Varankin <vladimir.varankin@grafana.com>
Date: Fri, 3 May 2024 13:01:17 +0200
Subject: [PATCH 2/4] don't hardcode helm charts dependencies

Signed-off-by: Vladimir Varankin <vladimir.varankin@grafana.com>
---
 .github/workflows/update-helm-repo.yaml | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/update-helm-repo.yaml b/.github/workflows/update-helm-repo.yaml
index 883f675808..afc937ae24 100644
--- a/.github/workflows/update-helm-repo.yaml
+++ b/.github/workflows/update-helm-repo.yaml
@@ -145,19 +145,6 @@ jobs:
         with:
           version: v3.5.2
 
-      - name: Add dependency chart repos
-        # Todo replace this by https://github.com/grafana/helm-charts/issues/1534
-        run: |
-          helm repo add elastic https://helm.elastic.co
-          helm repo add grafana https://grafana.github.io/helm-charts
-          helm repo add prometheus https://prometheus-community.github.io/helm-charts
-          helm repo add bitnami https://charts.bitnami.com/bitnami
-          helm repo add bitnami-pre-2022 https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami
-          helm repo add hashicorp https://helm.releases.hashicorp.com
-          helm repo add minio-new https://charts.min.io
-          helm repo add jetstack https://charts.jetstack.io
-          helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx
-
       - name: Parse Chart.yaml
         id: parse-chart
         run: |
@@ -175,6 +162,18 @@ jobs:
           fi
           echo "packagename=${name}-${version}" >> $GITHUB_OUTPUT
 
+      - name: Add dependency chart repos
+        run: |
+          cd source
+          # Skip the header line and make sure that tabs are expanded into spaces
+          deps=$(helm dependency list "${{ steps.parse-chart.outputs.chartpath }}" | tail +2 | expand)
+          while read -r row; do
+            IFS=' ' read -ra parts <<< "$row"
+            name="${parts[0]}"
+            repo="${parts[2]}"
+            helm repo add "$name" "$repo"
+          done <<< "$deps"
+
       - name: Install CR tool
         run: |
           mkdir "${CR_TOOL_PATH}"

From fc1997e6494736b42e3c6559e361b7f3ac29e4c8 Mon Sep 17 00:00:00 2001
From: Vladimir Varankin <vladimir.varankin@grafana.com>
Date: Tue, 7 May 2024 14:45:41 +0200
Subject: [PATCH 3/4] skip repository with unsupported schemas

Signed-off-by: Vladimir Varankin <vladimir.varankin@grafana.com>
---
 .github/workflows/update-helm-repo.yaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/update-helm-repo.yaml b/.github/workflows/update-helm-repo.yaml
index afc937ae24..5716b07eb5 100644
--- a/.github/workflows/update-helm-repo.yaml
+++ b/.github/workflows/update-helm-repo.yaml
@@ -171,7 +171,10 @@ jobs:
             IFS=' ' read -ra parts <<< "$row"
             name="${parts[0]}"
             repo="${parts[2]}"
-            helm repo add "$name" "$repo"
+            case "$repo" in
+              "https://"*) helm repo add "$name" "$repo" ;;
+              *) echo >&2 "Skipping dependency $name: unsupported schema for \"$repo\"" ;;
+            esac
           done <<< "$deps"
 
       - name: Install CR tool

From 6eba5e9c96ca8b05290bd802886d0d356599d3b6 Mon Sep 17 00:00:00 2001
From: MH <zanhsieh@gmail.com>
Date: Fri, 10 May 2024 13:51:24 +0800
Subject: [PATCH 4/4] Update Chart.yaml

Signed-off-by: MH <zanhsieh@gmail.com>
---
 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 3e9fcac6f2..f9b619ef6c 100644
--- a/charts/grafana/Chart.yaml
+++ b/charts/grafana/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: grafana
-version: 7.3.10
+version: 7.3.11
 appVersion: 10.4.1
 kubeVersion: "^1.8.0-0"
 description: The leading tool for querying and visualizing time series and metrics.