Skip to content

OCPBUGS-92836: fix bootstrap deadlock when ManagementCPUsOverride rejects pods with 0 nodes #2712

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

Closed
bhuvi-op wants to merge 1 commit into from
+5 −4
Closed

OCPBUGS-92836: fix bootstrap deadlock when ManagementCPUsOverride rejects pods with 0 nodes #2712

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
6 changes: 4 additions & 2 deletions openshift-kube-apiserver/admission/autoscaling/managementcpusoverride/admission.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,11 @@ func (a *managementCPUsOverride) Admit(ctx context.Context, attr admission.Attri
return admission.NewForbidden(attr, err) // can happen due to informer latency
}

// we still need to have nodes under the cluster to decide if the management resource enabled or not
// if the cluster has no nodes yet (e.g. during bootstrap), we cannot determine whether
// CPU partitioning is enabled — allow the pod without mutation rather than blocking it,
// which would prevent the machine-approver from starting and create a deadlock.
if len(nodes) == 0 {
return admission.NewForbidden(attr, fmt.Errorf("%s the cluster does not have any nodes", PluginName))
return nil
}

clusterInfra, err := a.infraConfigLister.Get(infraClusterName)
Expand Down
3 changes: 1 addition & 2 deletions openshift-kube-apiserver/admission/autoscaling/managementcpusoverride/admission_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,13 +268,12 @@ func TestAdmit(t *testing.T) {
infra: testClusterInfraWithoutWorkloadPartitioning(),
},
{
name: "should return admission error when the cluster does not have any nodes",
name: "should allow pod without mutation when the cluster does not have any nodes",
pod: testManagedPod("500m", "250m", "500Mi", "250Mi"),
expectedCpuRequest: resource.MustParse("250m"),
namespace: testManagedNamespace(),
nodes: []*corev1.Node{},
infra: testClusterSNOInfra(),
expectedError: fmt.Errorf("the cluster does not have any nodes"),
},
}

Expand Down