moved e2e and lint folders to respective charts to simplify ci conditions

Author: AndrewChubatiuk

.github/workflows/run-lint.yaml

@@ -2,17 +2,17 @@ name: "Lint charts"
 
 on:
   push:
-    paths-ignore:
-      - 'packages/**'
-      - 'index.yaml'
-      - '**.md'
+    paths:
+      - Makefile
+      - 'charts/*/lint/**'
+      - '.github/workflows/run-lint.yaml'
     branches:
       - master
   pull_request:
-    paths-ignore:
-      - 'packages/**'
-      - 'index.yaml'
-      - '**.md'
+    paths:
+      - Makefile
+      - 'charts/*/lint/**'
+      - '.github/workflows/run-lint.yaml'
     branches:
       - master
 

.github/workflows/run-testing.yaml

@@ -2,17 +2,17 @@ name: "Test charts"
 
 on:
   push:
-    paths-ignore:
-      - 'charts/victoria-metrics-common/**'
-      - 'charts/victoria-metrics-operator-crds/**'
-      - '**.md'
+    paths:
+      - Makefile
+      - 'charts/*/e2e/**'
+      - '.github/workflows/run-testing.yaml'
     branches:
       - master
   pull_request:
-    paths-ignore:
-      - 'charts/victoria-metrics-common/**'
-      - 'charts/victoria-metrics-operator-crds/**'
-      - '**.md'
+    paths:
+      - Makefile
+      - 'charts/*/e2e/**'
+      - '.github/workflows/run-testing.yaml'
     branches:
       - master
 
@@ -37,6 +37,7 @@ jobs:
         id: changed-charts
         uses: tj-actions/changed-files@v46
         with:
+          matrix: true
           files: |
             charts/**
 
@@ -45,15 +46,15 @@ jobs:
       # this bash pipeline extracts unique chart names from the list
       - name: Build charts diff
         id: charts-diff
-        run: jq |
-          charts=$(echo "${{ steps.changed-charts.outputs.all_modified_files }}" | sed 's/ /\n/g' | awk -F/ '{print $2}' | sort | uniq | jq -ncR '[inputs]')
+        run: |
+          charts=$(echo '${{ steps.changed-charts.outputs.all_changed_files }}' | jq -c '. | map(. | split("/").[1] | select(. != null)) | unique');
           echo "charts=$charts" >> $GITHUB_OUTPUT
 
   install-chart:
     name: Install chart
     runs-on: ubuntu-24.04
     needs: get-changed-charts
-    if: ${{ needs.get-changed-charts.outputs.charts != '[""]' }}
+    if: ${{ needs.get-changed-charts.outputs.charts != '[]' }}
     permissions:
       contents: read
     strategy:
@@ -104,11 +105,11 @@ jobs:
           if [ "${{ matrix.chart }}" != "victoria-metrics-k8s-stack" ] && [ "${{ matrix.chart }}" != "victoria-metrics-distributed" ]; then
             helm template charts/${{ matrix.chart }} \
               --namespace ${{ matrix.chart }}-testing \
-              --values ./hack/helm/${{ matrix.chart }}/e2e/simple.yaml \
+              --values charts/${{ matrix.chart }}/e2e/simple.yaml \
               --validate | kubectl apply -f - --dry-run=server
           fi
           ct install \
             --namespace ${{ matrix.chart }}-testing \
             --config .github/ci/ct.yaml \
             --charts "charts/${{ matrix.chart }}" \
-            --helm-extra-set-args "--values ./hack/helm/${{ matrix.chart }}/e2e/simple.yaml" --skip-clean-up
+            --helm-extra-set-args "--values charts/${{ matrix.chart }}/e2e/simple.yaml" --skip-clean-up

Makefile

@@ -68,22 +68,22 @@ helm-repo-update:
 
 # Run linter for helm chart
 lint: helm-repo-update
-	$(foreach values,$(wildcard hack/helm/*/lint/*.yaml), \
-		$(eval chart := $(word 3, $(subst /, ,$(values)))) \
+	$(foreach values,$(wildcard charts/*/lint/*.yaml), \
+		$(eval chart := $(word 2, $(subst /, ,$(values)))) \
 		CMD="dep build charts/$(chart)" $(MAKE) $(HELM) || exit 1; \
 		CMD="lint charts/$(chart) -f $(values)" $(MAKE) $(HELM) || exit 1; \
 	)
 
 update: helm-repo-update
-	$(foreach values,$(wildcard hack/helm/*/lint/*.yaml), \
-		$(eval chart := $(word 3, $(subst /, ,$(values)))) \
+	$(foreach values,$(wildcard charts/*/lint/*.yaml), \
+		$(eval chart := $(word 2, $(subst /, ,$(values)))) \
 		CMD="dep update charts/$(chart)" $(MAKE) $(HELM) || exit 1; \
         )
 
 # Run template for helm charts
 template: helm-repo-update
-	$(foreach values,$(wildcard hack/helm/*/lint/*.yaml), \
-		$(eval chart := $(word 3, $(subst /, ,$(values)))) \
+	$(foreach values,$(wildcard charts/*/lint/*.yaml), \
+		$(eval chart := $(word 2, $(subst /, ,$(values)))) \
 		CMD="dep build charts/$(chart)" $(MAKE) $(HELM) || exit 1; \
 		CMD="template charts/$(chart) -f $(values)" $(MAKE) $(HELM) || exit 1; \
 	)

charts/victoria-logs-cluster/.helmignore

@@ -22,3 +22,6 @@
 .vscode/
 *.md
 *.md.gotmpl
+e2e/
+lint/
+tests/

hack/helm/victoria-logs-cluster/e2e/simple.yaml renamed to charts/victoria-logs-cluster/e2e/simple.yaml

@@ -22,3 +22,6 @@
 .vscode/
 *.md
 *.md.gotmpl
+e2e/
+lint/
+tests/

hack/helm/victoria-logs-cluster/lint/simple.yaml renamed to charts/victoria-logs-cluster/lint/simple.yaml

@@ -23,3 +23,6 @@
 .vscode/
 *.md
 *.md.gotmpl
+e2e/
+lint/
+tests/

charts/victoria-logs-single/.helmignore

@@ -23,3 +23,6 @@
 .vscode/
 *.md
 *.md.gotmpl
+e2e/
+lint/
+tests/

hack/helm/victoria-logs-single/e2e/simple.yaml renamed to charts/victoria-logs-single/e2e/simple.yaml

@@ -22,3 +22,6 @@
 .vscode/
 *.md
 *.md.gotmpl
+e2e/
+lint/
+tests/

hack/helm/victoria-logs-single/lint/simple.yaml renamed to charts/victoria-logs-single/lint/simple.yaml

@@ -22,3 +22,6 @@
 .vscode/
 *.md
 *.md.gotmpl
+e2e/
+lint/
+tests/

charts/victoria-metrics-agent/.helmignore

@@ -22,3 +22,6 @@
 .vscode/
 *.md
 *.md.gotmpl
+e2e/
+lint/
+tests/

hack/helm/victoria-metrics-agent/e2e/simple.yaml renamed to charts/victoria-metrics-agent/e2e/simple.yaml

@@ -23,3 +23,6 @@
 .vscode/
 *.md
 *.md.gotmpl
+e2e/
+lint/
+tests/

hack/helm/victoria-metrics-agent/lint/cluster.yaml renamed to charts/victoria-metrics-agent/lint/cluster.yaml

@@ -22,3 +22,6 @@
 .vscode/
 *.md
 *.md.gotmpl
+e2e/
+lint/
+tests/

hack/helm/victoria-metrics-agent/lint/simple.yaml renamed to charts/victoria-metrics-agent/lint/simple.yaml

@@ -26,3 +26,6 @@
 img/
 *.md
 *.md.gotmpl
+e2e/
+lint/
+tests/

charts/victoria-metrics-alert/.helmignore

@@ -22,3 +22,6 @@
 .vscode/
 *.md
 *.md.gotmpl
+e2e/
+lint/
+tests/

hack/helm/victoria-metrics-alert/e2e/simple.yaml renamed to charts/victoria-metrics-alert/e2e/simple.yaml

@@ -22,3 +22,6 @@
 .vscode/
 *.md
 *.md.gotmpl
+e2e/
+lint/
+tests/