Merge pull request #146 from fluxcd/helm-chart-change

fluxcd · Nov 18, 2020 · 7e67f21 · 7e67f21
2 parents cd22046 + f18ddbf
commit 7e67f21
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/api/v2beta1/helmrelease_types.go b/api/v2beta1/helmrelease_types.go
@@ -190,6 +190,7 @@ type HelmChartTemplateSpec struct {
 
 	// Version semver expression, ignored for charts from v1beta1.GitRepository and
 	// v1beta1.Bucket sources. Defaults to latest when omitted.
+	// +kubebuilder:default:=*
 	// +optional
 	Version string `json:"version,omitempty"`
 

diff --git a/config/crd/bases/helm.toolkit.fluxcd.io_helmreleases.yaml b/config/crd/bases/helm.toolkit.fluxcd.io_helmreleases.yaml
@@ -97,6 +97,7 @@ spec:
                           Ignored when omitted.
                         type: string
                       version:
+                        default: '*'
                         description: Version semver expression, ignored for charts
                           from v1beta1.GitRepository and v1beta1.Bucket sources. Defaults
                           to latest when omitted.

diff --git a/controllers/helmrelease_controller.go b/controllers/helmrelease_controller.go
@@ -826,14 +826,18 @@ func helmChartRequiresUpdate(hr v2.HelmRelease, chart sourcev1.HelmChart) bool {
 	switch {
 	case template.Spec.Chart != chart.Spec.Chart:
 		return true
-	case template.Spec.Version != chart.Spec.Version:
+	// TODO(hidde): remove emptiness checks on next MINOR version
+	case template.Spec.Version == "" && chart.Spec.Version != "*",
+		template.Spec.Version != "" && template.Spec.Version != chart.Spec.Version:
 		return true
 	case template.Spec.SourceRef.Name != chart.Spec.SourceRef.Name:
 		return true
 	case template.Spec.SourceRef.Kind != chart.Spec.SourceRef.Kind:
 		return true
 	case template.GetInterval(hr.Spec.Interval) != chart.Spec.Interval:
 		return true
+	case template.Spec.ValuesFile != chart.Spec.ValuesFile:
+		return true
 	default:
 		return false
 	}

diff --git a/docs/spec/v2beta1/helmreleases.md b/docs/spec/v2beta1/helmreleases.md
@@ -123,6 +123,7 @@ type HelmChartTemplateSpec struct {
 
 	// Version semver expression, ignored for charts from v1beta1.GitRepository and
 	// v1beta1.Bucket sources. Defaults to latest when omitted.
+	// +kubebuilder:default:=*
 	// +optional
 	Version string `json:"version,omitempty"`