diff --git a/api/v2alpha1/condition_types.go b/api/v2alpha1/condition_types.go index 28b57c6df..c7182aaa2 100644 --- a/api/v2alpha1/condition_types.go +++ b/api/v2alpha1/condition_types.go @@ -18,16 +18,16 @@ package v2alpha1 const ( // ReleasedCondition represents the status of the last release attempt - // (install/upgrade/test) against the current state. + // (install/upgrade/test) against the latest desired state. ReleasedCondition string = "Released" // TestSuccessCondition represents the status of the last test attempt against - // the current state. + // the latest desired state. TestSuccessCondition string = "TestSuccess" // RemediatedCondition represents the status of the last remediation attempt // (uninstall/rollback) due to a failure of the last release attempt against the - // current state. + // latest desired state. RemediatedCondition string = "Remediated" ) diff --git a/api/v2alpha1/helmrelease_types.go b/api/v2alpha1/helmrelease_types.go index 21efe5b7c..a657b4eb7 100644 --- a/api/v2alpha1/helmrelease_types.go +++ b/api/v2alpha1/helmrelease_types.go @@ -33,7 +33,7 @@ import ( const HelmReleaseKind = "HelmRelease" const HelmReleaseFinalizer = "finalizers.fluxcd.io" -// HelmReleaseSpec defines the desired state of a Helm Release. +// HelmReleaseSpec defines the desired state of a Helm release. type HelmReleaseSpec struct { // Chart defines the template of the v1alpha1.HelmChart that should be created // for this HelmRelease. @@ -500,6 +500,7 @@ const ( // RollbackRemediationStrategy represents a Helm remediation strategy of Helm // rollback. RollbackRemediationStrategy RemediationStrategy = "rollback" + // UninstallRemediationStrategy represents a Helm remediation strategy of Helm // uninstall. UninstallRemediationStrategy RemediationStrategy = "uninstall" @@ -639,17 +640,17 @@ type HelmReleaseStatus struct { // +optional HelmChart string `json:"helmChart,omitempty"` - // Failures is the reconciliation failure count against the latest observed + // Failures is the reconciliation failure count against the latest desired // state. It is reset after a successful reconciliation. // +optional Failures int64 `json:"failures,omitempty"` - // InstallFailures is the install failure count against the latest observed + // InstallFailures is the install failure count against the latest desired // state. It is reset after a successful reconciliation. // +optional InstallFailures int64 `json:"installFailures,omitempty"` - // UpgradeFailures is the upgrade failure count against the latest observed + // UpgradeFailures is the upgrade failure count against the latest desired // state. It is reset after a successful reconciliation. // +optional UpgradeFailures int64 `json:"upgradeFailures,omitempty"` diff --git a/config/crd/bases/helm.toolkit.fluxcd.io_helmreleases.yaml b/config/crd/bases/helm.toolkit.fluxcd.io_helmreleases.yaml index a640629a8..5e054206a 100644 --- a/config/crd/bases/helm.toolkit.fluxcd.io_helmreleases.yaml +++ b/config/crd/bases/helm.toolkit.fluxcd.io_helmreleases.yaml @@ -429,7 +429,7 @@ spec: type: array failures: description: Failures is the reconciliation failure count against - the latest observed state. It is reset after a successful reconciliation. + the latest desired state. It is reset after a successful reconciliation. format: int64 type: integer helmChart: @@ -438,7 +438,7 @@ spec: type: string installFailures: description: InstallFailures is the install failure count against - the latest observed state. It is reset after a successful reconciliation. + the latest desired state. It is reset after a successful reconciliation. format: int64 type: integer lastAppliedRevision: @@ -467,7 +467,7 @@ spec: type: integer upgradeFailures: description: UpgradeFailures is the upgrade failure count against - the latest observed state. It is reset after a successful reconciliation. + the latest desired state. It is reset after a successful reconciliation. format: int64 type: integer type: object diff --git a/docs/api/helmrelease.md b/docs/api/helmrelease.md index 42a264521..c565b57ee 100644 --- a/docs/api/helmrelease.md +++ b/docs/api/helmrelease.md @@ -564,7 +564,7 @@ relative path in the SourceRef. Ignored when omitted.
(Appears on: HelmRelease) -HelmReleaseSpec defines the desired state of a Helm Release.
+HelmReleaseSpec defines the desired state of a Helm release.
(Optional)
- Failures is the reconciliation failure count against the latest observed + Failures is the reconciliation failure count against the latest desired state. It is reset after a successful reconciliation. |
@@ -927,7 +927,7 @@ int64
(Optional)
- InstallFailures is the install failure count against the latest observed + InstallFailures is the install failure count against the latest desired state. It is reset after a successful reconciliation. |
@@ -940,7 +940,7 @@ int64
(Optional)
- UpgradeFailures is the upgrade failure count against the latest observed + UpgradeFailures is the upgrade failure count against the latest desired state. It is reset after a successful reconciliation. |
diff --git a/docs/spec/v2alpha1/helmreleases.md b/docs/spec/v2alpha1/helmreleases.md
index ccd837399..189547993 100644
--- a/docs/spec/v2alpha1/helmreleases.md
+++ b/docs/spec/v2alpha1/helmreleases.md
@@ -447,16 +447,16 @@ type HelmReleaseStatus struct {
```go
const (
// ReleasedCondition represents the status of the last release attempt
- // (install/upgrade/test) against the current state.
+ // (install/upgrade/test) against the latest desired state.
ReleasedCondition string = "Released"
// TestSuccessCondition represents the status of the last test attempt against
- // the current state.
+ // the latest desired state.
TestSuccessCondition string = "TestSuccess"
// RemediatedCondition represents the status of the last remediation attempt
// (uninstall/rollback) due to a failure of the last release attempt against the
- // current state.
+ // latest desired state.
RemediatedCondition string = "Remediated"
)
```
@@ -524,7 +524,7 @@ const (
The namespace/name in which to deploy the Helm release defaults to the namespace/name of the
`HelmRelease`. These can be overridden respectively via `spec.targetNamespace` and
`spec.releaseName`. If `spec.targetNamespace` is set, `spec.releaseName` defaults to
-`