Merge pull request #381 from viccuad/rm-chart-values

refactor: Remove `chart-values.yaml`, use `make check-common-values` from now on

Author: viccuad

.github/workflows/ci.yaml

@@ -15,9 +15,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-      - name: Check Helm generated values are up-to-date
+      - name: Check that the contents of common-values.yaml are included in values.yaml
         run: |
-          make check-generated-values
+          make check-common-values
       - name: Run shellcheck in the shell scripts
         run: |
           make shellcheck

Makefile

@@ -1,23 +1,5 @@
 SHELL:=bash
 
-.PHONY: generate-values
-generate-values:
-# build values.yaml for each chart, from the common-values.yaml and their specific
-# chart-values.yaml
-	@echo "# This file was autogenerated." > charts/kubewarden-crds/values.yaml
-	@echo >> charts/kubewarden-crds/values.yaml
-	@cat charts/kubewarden-crds/chart-values.yaml >> charts/kubewarden-crds/values.yaml
-	@echo "# This file was autogenerated." > charts/kubewarden-controller/values.yaml
-	@echo >> charts/kubewarden-controller/values.yaml
-	@cat common-values.yaml charts/kubewarden-controller/chart-values.yaml >> charts/kubewarden-controller/values.yaml
-	@echo "# This file was autogenerated." > charts/kubewarden-defaults/values.yaml
-	@echo >> charts/kubewarden-defaults/values.yaml
-	@cat common-values.yaml charts/kubewarden-defaults/chart-values.yaml >> charts/kubewarden-defaults/values.yaml
-
-.PHONY: check-generated-values
-check-generated-values: generate-values
-	@sh -c 'git diff --exit-code charts || (echo; echo "There are chart differences that have to be checked in"; exit 1)'
-	
 .PHONY: check-common-values
 check-common-values:
 	@./scripts/check-common-values.sh