Merge pull request #140 from fluxcd/chart-values-overwrite

Author: hiddeco

.github/workflows/e2e.yaml

@@ -57,7 +57,13 @@ jobs:
           kubectl -n source-system wait gitrepository/gitrepository-sample --for=condition=ready --timeout=1m
           kubectl -n source-system wait helmrepository/helmrepository-sample --for=condition=ready --timeout=1m
           kubectl -n source-system wait helmchart/helmchart-sample --for=condition=ready --timeout=1m
-          kubectl -n source-system logs deploy/source-controller
+          kubectl -n source-system delete -f ./config/samples
+      - name: Run HelmChart values file tests
+        run: |
+          kubectl -n source-system apply -f ./config/testdata/helmchart-valuesfile
+          kubectl -n source-system wait helmchart/mariadb --for=condition=ready --timeout=5m
+          kubectl -n source-system wait helmchart/mariadb-git --for=condition=ready --timeout=5m
+          kubectl -n source-system delete -f ./config/testdata/helmchart-valuesfile
       - name: Debug failure
         if: failure()
         run: |

api/v1alpha1/helmchart_types.go

@@ -41,6 +41,11 @@ type HelmChartSpec struct {
 	// The interval at which to check the Source for updates.
 	// +required
 	Interval metav1.Duration `json:"interval"`
+
+	// Alternative values file to use as the default chart values, expected to be
+	// a relative path in the SourceRef. Ignored when omitted.
+	// +optional
+	ValuesFile string `json:"valuesFile,omitempty"`
 }
 
 // LocalHelmChartSourceReference contains enough information to let you locate the

config/crd/bases/source.toolkit.fluxcd.io_helmcharts.yaml

@@ -85,6 +85,10 @@ spec:
                 - kind
                 - name
                 type: object
+              valuesFile:
+                description: Alternative values file to use as the default chart values,
+                  expected to be a relative path in the SourceRef. Ignored when omitted.
+                type: string
               version:
                 description: The chart version semver expression, ignored for charts
                   from GitRepository sources. Defaults to latest when omitted.

config/samples/source_v1alpha1_helmchart_gitrepository.yaml

@@ -4,7 +4,6 @@ metadata:
   name: helmchart-git-sample
 spec:
   chart: charts/podinfo
-  version: '^2.0.0'
   sourceRef:
     kind: GitRepository
     name: gitrepository-sample

config/testdata/helmchart-valuesfile/gitrepository.yaml

@@ -0,0 +1,12 @@
+apiVersion: source.toolkit.fluxcd.io/v1alpha1
+kind: GitRepository
+metadata:
+  name: bitnami-charts
+spec:
+  interval: 1m
+  url: https://github.com/bitnami/charts
+  ref:
+    branch: master
+  ignore:
+    /*
+    !/bitnami/

config/testdata/helmchart-valuesfile/helmchart_gitrepository.yaml

@@ -0,0 +1,11 @@
+apiVersion: source.toolkit.fluxcd.io/v1alpha1
+kind: HelmChart
+metadata:
+  name: mariadb-git
+spec:
+  chart: bitnami/mariadb
+  valuesFile: values-production.yaml
+  sourceRef:
+    kind: GitRepository
+    name: bitnami-charts
+  interval: 1m

config/testdata/helmchart-valuesfile/helmchart_helmrepository.yaml

@@ -0,0 +1,11 @@
+apiVersion: source.toolkit.fluxcd.io/v1alpha1
+kind: HelmChart
+metadata:
+  name: mariadb
+spec:
+  chart: mariadb
+  valuesFile: values-production.yaml
+  sourceRef:
+    kind: HelmRepository
+    name: bitnami-charts
+  interval: 1m

config/testdata/helmchart-valuesfile/helmrepository.yaml

@@ -0,0 +1,7 @@
+apiVersion: source.toolkit.fluxcd.io/v1alpha1
+kind: HelmRepository
+metadata:
+  name: bitnami-charts
+spec:
+  interval: 1m
+  url: https://charts.bitnami.com/bitnami