Skip to content

Commit

Permalink
Remove InvalidState check, but keep the information in the Conditions (
Browse files Browse the repository at this point in the history
  • Loading branch information
burmanm authored May 6, 2024
1 parent 689a692 commit 1e20370
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 14 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Changelog for Cass Operator, new PRs should update the `main / unreleased` secti
* [ENHANCEMENT] [#628](https://github.com/k8ssandra/cass-operator/issues/628) Replace pod task can replace any node, including those that have crashed
* [ENHANCEMENT] [#532](https://github.com/k8ssandra/cass-operator/issues/532) Instead of rejecting updates/creates with deprecated fields, return kubectl warnings.
* [ENHANCEMENT] [#637](https://github.com/k8ssandra/cass-operator/issues/637) Expand nodeStatuses to include IPs and racks.
* [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.

## v1.19.1

Expand Down
14 changes: 0 additions & 14 deletions pkg/reconciliation/reconcile_racks.go
Original file line number Diff line number Diff line change
Expand Up @@ -2279,16 +2279,6 @@ func (rc *ReconciliationContext) CheckClearActionConditions() result.ReconcileRe
return result.Continue()
}

func (rc *ReconciliationContext) CheckForInvalidState() result.ReconcileResult {
cond, isSet := rc.Datacenter.GetCondition(api.DatacenterValid)
if isSet && cond.Status == corev1.ConditionFalse {
err := fmt.Errorf("datacenter %s is not in a valid state: %s", rc.Datacenter.Name, cond.Message)
return result.Error(err)
}

return result.Continue()
}

func (rc *ReconciliationContext) CheckStatefulSetControllerCaughtUp() result.ReconcileResult {
if hasStatefulSetControllerCaughtUp(rc.statefulSets, rc.dcPods) {
// We do this here instead of in CheckPodsReady where we fix stuck pods
Expand Down Expand Up @@ -2341,10 +2331,6 @@ func (rc *ReconciliationContext) fixMissingPVC() (bool, error) {
func (rc *ReconciliationContext) ReconcileAllRacks() (reconcile.Result, error) {
rc.ReqLogger.Info("reconciliationContext::reconcileAllRacks")

if recResult := rc.CheckForInvalidState(); recResult.Completed() {
return recResult.Output()
}

logger := rc.ReqLogger

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

0 comments on commit 1e20370

Please sign in to comment.