Skip to content

Allow non-drained updates based on node schedulability and kubelet status #30477

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
wants to merge 1 commit into from
Closed

Allow non-drained updates based on node schedulability and kubelet status #30477

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
23 changes: 21 additions & 2 deletions test/e2e/upgrade/upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ import (
"github.com/openshift/origin/test/e2e/upgrade/adminack"
"github.com/openshift/origin/test/e2e/upgrade/dns"
"github.com/openshift/origin/test/e2e/upgrade/manifestdelete"
mc "github.com/openshift/origin/test/extended/machine_config"
"github.com/openshift/origin/test/extended/prometheus"
"github.com/openshift/origin/test/extended/util/disruption"
"github.com/openshift/origin/test/extended/util/operator"
Expand Down Expand Up @@ -634,7 +633,7 @@ func clusterUpgrade(f *framework.Framework, c configv1client.Interface, dc dynam

allNodesReady := true
for _, node := range nodes.Items {
if !mc.IsNodeReady(node) {
if !isNodeNotDrained(node) {
allNodesReady = false
break
}
Expand Down Expand Up @@ -725,6 +724,26 @@ func recordClusterEvent(client kubernetes.Interface, uid, action string, reason
}
}

// isNodeNotDrained checks if a node is not drained (schedulable and kubelet ready).
// Returns true if the node is not cordoned and kubelet is ready, indicating drain is not needed.
func isNodeNotDrained(node v1.Node) bool {
// If node is cordoned, drain is happening or about to happen
if node.Spec.Unschedulable {
framework.Logf("Node %s is unschedulable", node.Name)
return false
}
// Check kubelet ready status
for _, condition := range node.Status.Conditions {
if condition.Type == v1.NodeReady && condition.Status == v1.ConditionTrue && condition.Reason == "KubeletReady" {
return true
}
}

framework.Logf("Node %s kubelet not ready", node.Name)

return false
}

// TODO(runcom): drop this when MCO types are in openshift/api and we can use the typed client directly
func IsPoolUpdated(dc dynamic.NamespaceableResourceInterface, name string) (poolUpToDate bool, poolIsUpdating bool) {
pool, err := dc.Get(context.Background(), name, metav1.GetOptions{})
Expand Down