fix: Helm release only supports one changed chart at a time (#4583)

* fix: Helm release only supports one changed chart at a time

* Update workflow hash

* Remove test branch

Author: simonswine

.github/workflows/helm-ci.yml

@@ -19,9 +19,15 @@ jobs:
               exit 1
           fi
 
-  call-lint-test:
-    uses: grafana/helm-charts/.github/workflows/lint-test.yaml@main
+  call-lint-test-pyroscope:
+    uses: grafana/helm-charts/.github/workflows/lint-test.yaml@191acd56a41783452d6e583fcad195de27959044
     with:
       ct_configfile: operations/pyroscope/helm/ct.yaml
       ct_check_version_increment: false
       helm_version: v3.14.3
+  call-lint-test-pyroscope-monitoring:
+    uses: grafana/helm-charts/.github/workflows/lint-test.yaml@191acd56a41783452d6e583fcad195de27959044
+    with:
+      ct_configfile: operations/monitoring/helm/ct.yaml
+      ct_check_version_increment: false
+      helm_version: v3.14.3

.github/workflows/helm-release.yml

@@ -7,15 +7,27 @@ on:
       - "release-[0-9]+.[0-9]+"
 
 jobs:
-  call-update-helm-repo:
+  call-update-helm-repo-pyroscope:
+    uses: grafana/helm-charts/.github/workflows/update-helm-repo.yaml@191acd56a41783452d6e583fcad195de27959044
     permissions:
       contents: "write"
       id-token: "write"
       packages: "write"
-    uses: grafana/helm-charts/.github/workflows/update-helm-repo.yaml@0b2c5a7aad1a11c1516aae3972d2961d41838167
     with:
       charts_dir: operations/pyroscope/helm/
       cr_configfile: operations/pyroscope/helm/cr.yaml
       ct_configfile: operations/pyroscope/helm/ct.yaml
     secrets:
       vault_repo_secret_name: grafana-pyroscope-releases
+  call-update-helm-repo-pyroscope-monitoring:
+    uses: grafana/helm-charts/.github/workflows/update-helm-repo.yaml@191acd56a41783452d6e583fcad195de27959044
+    permissions:
+      contents: "write"
+      id-token: "write"
+      packages: "write"
+    with:
+      charts_dir: operations/pyroscope/helm/
+      cr_configfile: operations/monitoring/helm/cr.yaml
+      ct_configfile: operations/monitoring/helm/ct.yaml
+    secrets:
+      vault_repo_secret_name: grafana-pyroscope-releases

Makefile

@@ -408,12 +408,12 @@ cve/check:
 .PHONY: helm/lint
 helm/lint: $(BIN)/helm
 	$(BIN)/helm lint ./operations/pyroscope/helm/pyroscope
-	$(BIN)/helm lint ./operations/pyroscope/helm/pyroscope-monitoring
+	$(BIN)/helm lint ./operations/monitoring/helm/pyroscope-monitoring
 
 .PHONY: helm/docs
 helm/docs: $(BIN)/helm-docs
 	$(BIN)/helm-docs -c operations/pyroscope/helm/pyroscope
-	$(BIN)/helm-docs -c operations/pyroscope/helm/pyroscope-monitoring
+	$(BIN)/helm-docs -c operations/monitoring/helm/pyroscope-monitoring
 
 .PHONY: goreleaser/lint
 goreleaser/lint: $(BIN)/goreleaser
@@ -454,7 +454,7 @@ helm/check: $(BIN)/kubeconform $(BIN)/helm
 		| go run ./tools/yaml-to-json \
 		> ./operations/pyroscope/jsonnet/values.json
 	# Generate dashboards and rules
-	$(BIN)/helm template pyroscope-monitoring --show-only templates/dashboards.yaml --show-only templates/rules.yaml operations/pyroscope/helm/pyroscope-monitoring \
+	$(BIN)/helm template pyroscope-monitoring --show-only templates/dashboards.yaml --show-only templates/rules.yaml operations/monitoring/helm/pyroscope-monitoring \
 		| go run ./tools/monitoring-chart-extractor
 
 .PHONY: deploy
@@ -476,7 +476,7 @@ deploy-micro-services-v1: $(BIN)/kind $(BIN)/helm docker-image/pyroscope/build
 .PHONY: deploy-monitoring
 deploy-monitoring: $(BIN)/kind $(BIN)/helm
 	$(BIN)/kind export kubeconfig --name $(KIND_CLUSTER) || $(BIN)/kind create cluster --name $(KIND_CLUSTER)
-	$(BIN)/helm upgrade --install pyroscope-monitoring ./operations/pyroscope/helm/pyroscope-monitoring
+	$(BIN)/helm upgrade --install pyroscope-monitoring ./operations/monitoring/helm/pyroscope-monitoring
 
 include Makefile.examples
 

operations/monitoring/helm/cr.yaml

@@ -0,0 +1,3 @@
+git-repo: helm-charts
+owner: grafana
+skip-existing: true

operations/monitoring/helm/ct.yaml

@@ -0,0 +1,10 @@
+# See https://github.com/helm/chart-testing#configuration
+remote: origin
+target-branch: main
+kubeVersion: "1.23"
+chart-dirs:
+  - operations/monitoring/helm
+chart-repos:
+  - grafana=https://grafana.github.io/helm-charts
+helm-extra-args: --timeout 600s
+validate-maintainers: false

operations/pyroscope/helm/pyroscope-monitoring/.helmignore renamed to operations/monitoring/helm/pyroscope-monitoring/.helmignore

@@ -3,7 +3,7 @@ name: pyroscope-monitoring
 description: A Helm chart for monitoring Grafana Pyroscope. This helm chart uses otel-lgtm to monitor the health of the Grafana Pyroscope backend.
 type: application
 
-version: 0.1.0
+version: 0.1.1
 appVersion: "0.0.0"
 
 dependencies: