fluxcd
/
helm-controller
mirror of https://github.com/fluxcd/helm-controller.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #35 from fluxcd/fix-chartupdate

This commit is contained in:
Hidde Beydals 2020-07-21 18:13:21 +02:00 committed by GitHub
parent 8b1f39ea73 5411834f14
commit 3e3951593d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/testdata/dependencies/helmrelease-backend.yaml vendored
View File

@ -9,7 +9,7 @@ spec:
version: '^4.0.0' version: '^4.0.0'
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: podinfo name: webapp
interval: 1m interval: 1m
test: test:
enable: true enable: true

2
config/testdata/dependencies/helmrelease-frontend.yaml vendored
View File

@ -9,7 +9,7 @@ spec:
version: '^4.0.0' version: '^4.0.0'
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: podinfo name: webapp
interval: 1m interval: 1m
dependsOn: dependsOn:
- backend - backend

2
config/testdata/dependencies/helmrepository.yaml vendored
View File

@ -1,7 +1,7 @@
apiVersion: source.fluxcd.io/v1alpha1 apiVersion: source.fluxcd.io/v1alpha1
kind: HelmRepository kind: HelmRepository
metadata: metadata:
name: podinfo name: webapp
spec: spec:
interval: 1m interval: 1m
url: https://stefanprodan.github.io/podinfo url: https://stefanprodan.github.io/podinfo

5
controllers/helmrelease_controller.go
View File

@ -252,8 +252,9 @@ func (r *HelmReleaseReconciler) reconcileChart(ctx context.Context, hr *v2.HelmR
hr.Status.HelmChart = chartName.String() hr.Status.HelmChart = chartName.String()
return nil, false, nil return nil, false, nil
case helmChartRequiresUpdate(*hr, helmChart): case helmChartRequiresUpdate(*hr, helmChart):
r.Log.Info("chart diverged from template", strings.ToLower(sourcev1.HelmChartKind), chartName.String())
helmChart.Spec = hc.Spec helmChart.Spec = hc.Spec
if err = r.Client.Update(ctx, hc); err != nil { if err = r.Client.Update(ctx, &helmChart); err != nil {
return nil, false, err return nil, false, err
} }
hr.Status.HelmChart = chartName.String() hr.Status.HelmChart = chartName.String()
@ -483,7 +484,7 @@ func helmChartRequiresUpdate(hr v2.HelmRelease, chart sourcev1.HelmChart) bool {
return true return true
case template.Version != chart.Spec.Version: case template.Version != chart.Spec.Version:
return true return true
case template.SourceRef.Name != chart.Spec.Name: case template.SourceRef.Name != chart.Spec.HelmRepositoryRef.Name:
return true return true
case template.GetInterval(hr.Spec.Interval) != chart.Spec.Interval: case template.GetInterval(hr.Spec.Interval) != chart.Spec.Interval:
return true return true