Properly detect chart version divergences
This is a regression bug fix due to the introduction of the default values in the source-controller CRDs. Signed-off-by: Hidde Beydals <hello@hidde.co>
This commit is contained in:
parent
cd220464fe
commit
b801b23911
|
@ -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"`
|
||||
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -826,7 +826,9 @@ 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
|
||||
|
|
|
@ -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"`
|
||||
|
||||
|
|
Loading…
Reference in New Issue