Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove InvalidState check, but keep the information in the Conditions #643

Merged
merged 1 commit into from
May 6, 2024
Merged

Remove InvalidState check, but keep the information in the Conditions #643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
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
View file
Open in desktop
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
Loading