Skip to content

Commit dd2e67c

Browse files
committed
Remove the dead code of setting the operator status for cgroupv1
clusters - Option of configuring cgroupv1 has been removed in OCP - 4.19 - It is safe to remove this check from the operator status for all the clusters greater than OCP - 4.19 - Also removed the cluster fleet evaluation that checks if a cluster is configured with cgroupv1 Signed-off-by: Sai Ramesh Vanka <[email protected]>
1 parent 9db4a37 commit dd2e67c

File tree

1 file changed

+0
-32
lines changed

1 file changed

+0
-32
lines changed

pkg/operator/status.go

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -271,15 +271,6 @@ func (optr *Operator) syncUpgradeableStatus(co *configv1.ClusterOperator) error
271271
Reason: asExpectedReason,
272272
}
273273

274-
configNode, err := optr.nodeClusterLister.Get(ctrlcommon.ClusterNodeInstanceName)
275-
if err != nil {
276-
return err
277-
}
278-
if configNode.Spec.CgroupMode == configv1.CgroupModeV1 {
279-
coStatusCondition.Status = configv1.ConditionFalse
280-
coStatusCondition.Reason = "ClusterOnCgroupV1"
281-
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"
282-
}
283274
var degraded, interrupted bool
284275
for _, pool := range pools {
285276
interrupted = isPoolStatusConditionTrue(pool, mcfgv1.MachineConfigPoolBuildInterrupted)
@@ -386,14 +377,6 @@ func (optr *Operator) generateClusterFleetEvaluations() ([]string, error) {
386377
evaluations = append(evaluations, "runc: transition to default crun")
387378
}
388379

389-
enabled, err = optr.cfeEvalCgroupsV1()
390-
if err != nil {
391-
return evaluations, err
392-
}
393-
if enabled {
394-
evaluations = append(evaluations, "cgroupsv1: support has been deprecated in favor of cgroupsv2")
395-
}
396-
397380
sort.Strings(evaluations)
398381

399382
return evaluations, nil
@@ -444,21 +427,6 @@ func (optr *Operator) cfeEvalRunc() (bool, error) {
444427
return false, nil
445428
}
446429

447-
func (optr *Operator) cfeEvalCgroupsV1() (bool, error) {
448-
// check for nil so we do not have to mock within tests
449-
if optr.nodeClusterLister == nil {
450-
return false, nil
451-
}
452-
nodeClusterConfig, err := optr.nodeClusterLister.Get(ctrlcommon.ClusterNodeInstanceName)
453-
if err != nil {
454-
if apierrors.IsNotFound(err) {
455-
return false, nil
456-
}
457-
return false, err
458-
}
459-
return nodeClusterConfig.Spec.CgroupMode == configv1.CgroupModeV1, nil
460-
}
461-
462430
// GetAllManagedNodes returns the nodes managed by MCO
463431
func (optr *Operator) GetAllManagedNodes(pools []*mcfgv1.MachineConfigPool) ([]*corev1.Node, error) {
464432
nodes := []*corev1.Node{}

0 commit comments

Comments
 (0)