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

Rename conditions to describe the current state 

As "condition type names should describe the current observed state of
the resource, rather than describing the current state transitions".

Described by the draft convention for update conditions in
kubernetes/community#4521.
This commit is contained in:
Hidde Beydals 2020-07-23 12:13:10 +02:00
parent 2316c6b8db
commit 354590249e
4 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
api/v2alpha1/condition_types.go
View File

@ -51,20 +51,20 @@ const (
// ReadyCondition represents the fact that the HelmRelease has been successfully reconciled. // ReadyCondition represents the fact that the HelmRelease has been successfully reconciled.
ReadyCondition string = "Ready" ReadyCondition string = "Ready"
// InstallCondition represents the fact that the HelmRelease has been successfully installed. // InstalledCondition represents the fact that the HelmRelease has been successfully installed.
InstallCondition string = "Install" InstalledCondition string = "Installed"
// UpgradeCondition represents the fact that the HelmRelease has been successfully upgraded. // UpgradedCondition represents the fact that the HelmRelease has been successfully upgraded.
UpgradeCondition string = "Upgrade" UpgradedCondition string = "Upgraded"
// TestCondition represents the fact that the HelmRelease has been successfully tested. // TestedCondition represents the fact that the HelmRelease has been successfully tested.
TestCondition string = "Test" TestedCondition string = "Tested"
// RollbackCondition represents the fact that the HelmRelease has been successfully rolled back. // RolledBackCondition represents the fact that the HelmRelease has been successfully rolled back.
RollbackCondition string = "Rollback" RolledBackCondition string = "RolledBack"
// UninstallCondition represents the fact that the HelmRelease has been successfully uninstalled. // UninstalledCondition represents the fact that the HelmRelease has been successfully uninstalled.
UninstallCondition string = "Uninstall" UninstalledCondition string = "Uninstall"
) )
const ( const (

6
api/v2alpha1/helmrelease_types.go
View File

@ -449,7 +449,7 @@ func ShouldUpgrade(hr HelmRelease, revision string, releaseRevision int) bool {
func ShouldTest(hr HelmRelease) bool { func ShouldTest(hr HelmRelease) bool {
if hr.Spec.Test.Enable { if hr.Spec.Test.Enable {
for _, c := range hr.Status.Conditions { for _, c := range hr.Status.Conditions {
if c.Status == corev1.ConditionTrue && (c.Type == InstallCondition || c.Type == UpgradeCondition) { if c.Status == corev1.ConditionTrue && (c.Type == InstalledCondition || c.Type == UpgradedCondition) {
return true return true
} }
} }
@ -464,7 +464,7 @@ func ShouldRollback(hr HelmRelease, releaseRevision int) bool {
return false return false
} }
for _, c := range hr.Status.Conditions { for _, c := range hr.Status.Conditions {
if c.Type == UpgradeCondition && c.Status == corev1.ConditionFalse { if c.Type == UpgradedCondition && c.Status == corev1.ConditionFalse {
return true return true
} }
} }
@ -478,7 +478,7 @@ func ShouldUninstall(hr HelmRelease, releaseRevision int) bool {
return false return false
} }
for _, c := range hr.Status.Conditions { for _, c := range hr.Status.Conditions {
if c.Type == InstallCondition && c.Status == corev1.ConditionFalse { if c.Type == InstalledCondition && c.Status == corev1.ConditionFalse {
return true return true
} }
} }

10
controllers/helmrelease_controller.go
View File

@ -308,25 +308,25 @@ func (r *HelmReleaseReconciler) release(log logr.Logger, hr v2.HelmRelease, sour
success := true success := true
if errors.Is(err, driver.ErrNoDeployedReleases) { if errors.Is(err, driver.ErrNoDeployedReleases) {
rel, err = install(cfg, loadedChart, hr) rel, err = install(cfg, loadedChart, hr)
r.handleHelmActionResult(hr, source, err, "install", v2.InstallCondition, v2.InstallSucceededReason, v2.InstallFailedReason) r.handleHelmActionResult(hr, source, err, "install", v2.InstalledCondition, v2.InstallSucceededReason, v2.InstallFailedReason)
success = err == nil success = err == nil
} else if v2.ShouldUpgrade(hr, source.GetArtifact().Revision, rel.Version) { } else if v2.ShouldUpgrade(hr, source.GetArtifact().Revision, rel.Version) {
rel, err = upgrade(cfg, loadedChart, hr) rel, err = upgrade(cfg, loadedChart, hr)
r.handleHelmActionResult(hr, source, err, "upgrade", v2.UpgradeCondition, v2.UpgradeSucceededReason, v2.UpgradeFailedReason) r.handleHelmActionResult(hr, source, err, "upgrade", v2.UpgradedCondition, v2.UpgradeSucceededReason, v2.UpgradeFailedReason)
success = err == nil success = err == nil
} }
// Run tests // Run tests
if v2.ShouldTest(hr) { if v2.ShouldTest(hr) {
rel, err = test(cfg, hr) rel, err = test(cfg, hr)
r.handleHelmActionResult(hr, source, err, "test", v2.TestCondition, v2.TestSucceededReason, v2.TestFailedReason) r.handleHelmActionResult(hr, source, err, "test", v2.TestedCondition, v2.TestSucceededReason, v2.TestFailedReason)
} }
// Run rollback // Run rollback
if rel != nil && v2.ShouldRollback(hr, rel.Version) { if rel != nil && v2.ShouldRollback(hr, rel.Version) {
success = false success = false
err = rollback(cfg, hr) err = rollback(cfg, hr)
r.handleHelmActionResult(hr, source, err, "rollback", v2.RollbackCondition, v2.RollbackSucceededReason, v2.RollbackFailedReason) r.handleHelmActionResult(hr, source, err, "rollback", v2.RolledBackCondition, v2.RollbackSucceededReason, v2.RollbackFailedReason)
} }
// Determine release number after action runs // Determine release number after action runs
@ -342,7 +342,7 @@ func (r *HelmReleaseReconciler) release(log logr.Logger, hr v2.HelmRelease, sour
if err == nil { if err == nil {
releaseRevision = 0 releaseRevision = 0
} }
r.handleHelmActionResult(hr, source, err, "uninstall", v2.UninstallCondition, v2.UninstallSucceededReason, v2.UninstallFailedReason) r.handleHelmActionResult(hr, source, err, "uninstall", v2.UninstalledCondition, v2.UninstallSucceededReason, v2.UninstallFailedReason)
} }
if !success { if !success {

20
docs/spec/v2alpha1/helmreleases.md
View File

@ -248,20 +248,20 @@ const (
// ReadyCondition represents the fact that the HelmRelease has been successfully reconciled. // ReadyCondition represents the fact that the HelmRelease has been successfully reconciled.
ReadyCondition string = "Ready" ReadyCondition string = "Ready"
// InstallCondition represents the fact that the HelmRelease has been successfully installed. // InstalledCondition represents the fact that the HelmRelease has been successfully installed.
InstallCondition string = "Install" InstalledCondition string = "Installed"
// UpgradeCondition represents the fact that the HelmRelease has been successfully upgraded. // UpgradedCondition represents the fact that the HelmRelease has been successfully upgraded.
UpgradeCondition string = "Upgrade" UpgradedCondition string = "Upgraded"
// TestCondition represents the fact that the HelmRelease has been successfully tested. // TestedCondition represents the fact that the HelmRelease has been successfully tested.
TestCondition string = "Test" TestedCondition string = "Tested"
// RollbackCondition represents the fact that the HelmRelease has been successfully rolled back. // RolledBackCondition represents the fact that the HelmRelease has been successfully rolled back.
RollbackCondition string = "Rollback" RolledBackCondition string = "RolledBack"
// UninstallCondition represents the fact that the HelmRelease has been successfully uninstalled. // UninstalledCondition represents the fact that the HelmRelease has been successfully uninstalled.
UninstallCondition string = "Uninstall" UninstalledCondition string = "Uninstalled"
) )
``` ```