diff --git a/pkg/daemon/daemon.go b/pkg/daemon/daemon.go index c8c7cdc27..36a0fee8c 100644 --- a/pkg/daemon/daemon.go +++ b/pkg/daemon/daemon.go @@ -580,6 +580,14 @@ func (dn *Daemon) nodeHasAnnotation(annoKey string, value string) bool { func (dn *Daemon) isNodeDraining() bool { if anno, ok := dn.node.Annotations[annoKey]; ok && (anno == annoDraining || anno == annoMcpPaused) { + // for openshift cluster draining should be true only if the annotation has MCP paused + if dn.openshiftContext.IsOpenshiftCluster() && !dn.openshiftContext.IsHypershift() { + if anno == annoMcpPaused { + return true + } else { + return false + } + } return true } return false