Skip to content

Commit 1e20370

Browse files
authored
Remove InvalidState check, but keep the information in the Conditions (#643)
1 parent 689a692 commit 1e20370

2 files changed

Lines changed: 1 addition & 14 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ Changelog for Cass Operator, new PRs should update the `main / unreleased` secti
1717
* [ENHANCEMENT] [#628](https://github.com/k8ssandra/cass-operator/issues/628) Replace pod task can replace any node, including those that have crashed
1818
* [ENHANCEMENT] [#532](https://github.com/k8ssandra/cass-operator/issues/532) Instead of rejecting updates/creates with deprecated fields, return kubectl warnings.
1919
* [ENHANCEMENT] [#637](https://github.com/k8ssandra/cass-operator/issues/637) Expand nodeStatuses to include IPs and racks.
20+
* [BUGFIX] [#639](https://github.com/k8ssandra/cass-operator/issues/639) Remove InvalidState check, there's no need to block reconcile here. Keep the InvalidState as information for the user only.
2021

2122
## v1.19.1
2223

pkg/reconciliation/reconcile_racks.go

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2279,16 +2279,6 @@ func (rc *ReconciliationContext) CheckClearActionConditions() result.ReconcileRe
22792279
return result.Continue()
22802280
}
22812281

2282-
func (rc *ReconciliationContext) CheckForInvalidState() result.ReconcileResult {
2283-
cond, isSet := rc.Datacenter.GetCondition(api.DatacenterValid)
2284-
if isSet && cond.Status == corev1.ConditionFalse {
2285-
err := fmt.Errorf("datacenter %s is not in a valid state: %s", rc.Datacenter.Name, cond.Message)
2286-
return result.Error(err)
2287-
}
2288-
2289-
return result.Continue()
2290-
}
2291-
22922282
func (rc *ReconciliationContext) CheckStatefulSetControllerCaughtUp() result.ReconcileResult {
22932283
if hasStatefulSetControllerCaughtUp(rc.statefulSets, rc.dcPods) {
22942284
// We do this here instead of in CheckPodsReady where we fix stuck pods
@@ -2341,10 +2331,6 @@ func (rc *ReconciliationContext) fixMissingPVC() (bool, error) {
23412331
func (rc *ReconciliationContext) ReconcileAllRacks() (reconcile.Result, error) {
23422332
rc.ReqLogger.Info("reconciliationContext::reconcileAllRacks")
23432333

2344-
if recResult := rc.CheckForInvalidState(); recResult.Completed() {
2345-
return recResult.Output()
2346-
}
2347-
23482334
logger := rc.ReqLogger
23492335

23502336
podList, err := rc.listPods(rc.Datacenter.GetClusterLabels())

0 commit comments

Comments
 (0)