Skip to content

[release-4.20] OCPNODE-3883: Remove the dead code of setting the operator status for cgroupv1 based clusters #5446

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

Open
wants to merge 1 commit into
base: release-4.20
Choose a base branch
from
Open

[release-4.20] OCPNODE-3883: Remove the dead code of setting the operator status for cgroupv1 based clusters #5446

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
32 changes: 0 additions & 32 deletions pkg/operator/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,15 +271,6 @@ func (optr *Operator) syncUpgradeableStatus(co *configv1.ClusterOperator) error
Reason: asExpectedReason,
}

configNode, err := optr.nodeClusterLister.Get(ctrlcommon.ClusterNodeInstanceName)
if err != nil {
return err
}
if configNode.Spec.CgroupMode == configv1.CgroupModeV1 {
coStatusCondition.Status = configv1.ConditionFalse
coStatusCondition.Reason = "ClusterOnCgroupV1"
coStatusCondition.Message = "Cluster is using deprecated cgroup v1 and is not upgradable. Please update the `CgroupMode` in the `nodes.config.openshift.io` object to 'v2'. Once upgraded, the cluster cannot be changed back to cgroup v1"
}
var degraded, interrupted bool
for _, pool := range pools {
interrupted = isPoolStatusConditionTrue(pool, mcfgv1.MachineConfigPoolBuildInterrupted)
Expand Down Expand Up @@ -386,14 +377,6 @@ func (optr *Operator) generateClusterFleetEvaluations() ([]string, error) {
evaluations = append(evaluations, "runc: transition to default crun")
}

enabled, err = optr.cfeEvalCgroupsV1()
if err != nil {
return evaluations, err
}
if enabled {
evaluations = append(evaluations, "cgroupsv1: support has been deprecated in favor of cgroupsv2")
}

sort.Strings(evaluations)

return evaluations, nil
Expand Down Expand Up @@ -444,21 +427,6 @@ func (optr *Operator) cfeEvalRunc() (bool, error) {
return false, nil
}

func (optr *Operator) cfeEvalCgroupsV1() (bool, error) {
// check for nil so we do not have to mock within tests
if optr.nodeClusterLister == nil {
return false, nil
}
nodeClusterConfig, err := optr.nodeClusterLister.Get(ctrlcommon.ClusterNodeInstanceName)
if err != nil {
if apierrors.IsNotFound(err) {
return false, nil
}
return false, err
}
return nodeClusterConfig.Spec.CgroupMode == configv1.CgroupModeV1, nil
}

// GetAllManagedNodes returns the nodes managed by MCO
func (optr *Operator) GetAllManagedNodes(pools []*mcfgv1.MachineConfigPool) ([]*corev1.Node, error) {
nodes := []*corev1.Node{}
Expand Down