Skip to content

OCPBUGS-81737: Dynamically find worker-generated-kubelet MC name to support different platforms #30967

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

Merged
openshift-merge-bot merged 1 commit into from
Apr 8, 2026
+33 −12
Merged

OCPBUGS-81737: Dynamically find worker-generated-kubelet MC name to support different platforms #30967

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
20 changes: 8 additions & 12 deletions test/extended/node/node_swap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@ import (
exutil "github.com/openshift/origin/test/extended/util"
)

const (
workerGeneratedKubeletMC = "99-worker-generated-kubelet"
)

var _ = g.Describe("[Jira:Node][sig-node] Node non-cnv swap configuration", func() {
defer g.GinkgoRecover()

Expand Down Expand Up @@ -117,10 +113,10 @@ var _ = g.Describe("[Jira:Node][sig-node] Node non-cnv swap configuration", func

g.By("Getting initial machine config resourceVersion")
// Get the initial resourceVersion of the worker machine config before creating KubeletConfig
workerMC, err := mcClient.MachineconfigurationV1().MachineConfigs().Get(ctx, workerGeneratedKubeletMC, metav1.GetOptions{})
o.Expect(err).NotTo(o.HaveOccurred(), "Failed to get initial machine config %s", workerGeneratedKubeletMC)
initialResourceVersion := workerMC.ResourceVersion
framework.Logf("Initial %s resourceVersion: %s", workerGeneratedKubeletMC, initialResourceVersion)
workerGeneratedKubeletMC, err := getWorkerGeneratedKubeletMC(ctx, mcClient)
o.Expect(err).NotTo(o.HaveOccurred(), "Failed to find worker-generated-kubelet MachineConfig")
initialResourceVersion := workerGeneratedKubeletMC.ResourceVersion
framework.Logf("Initial %s resourceVersion: %s", workerGeneratedKubeletMC.Name, initialResourceVersion)

g.By("Creating a KubeletConfig with swap settings")
kcName := fmt.Sprintf("test-swap-override-%d", time.Now().UnixNano())
Expand Down Expand Up @@ -187,10 +183,10 @@ var _ = g.Describe("[Jira:Node][sig-node] Node non-cnv swap configuration", func
time.Sleep(5 * time.Second)

// Check if the machine config was created or updated (compare to initial resourceVersion captured earlier)
workerMC, err = mcClient.MachineconfigurationV1().MachineConfigs().Get(ctx, workerGeneratedKubeletMC, metav1.GetOptions{})
o.Expect(err).NotTo(o.HaveOccurred(), "Failed to get machine config %s for verification", workerGeneratedKubeletMC)
o.Expect(workerMC.ResourceVersion).To(o.Equal(initialResourceVersion), "Machine config %s should not be updated when failSwapOn is rejected", workerGeneratedKubeletMC)
framework.Logf("Verified: %s was not updated (resourceVersion: %s)", workerGeneratedKubeletMC, workerMC.ResourceVersion)
workerMCAfter, err := getWorkerGeneratedKubeletMC(ctx, mcClient)
o.Expect(err).NotTo(o.HaveOccurred(), "Failed to find worker-generated-kubelet MachineConfig for verification")
o.Expect(workerMCAfter.ResourceVersion).To(o.Equal(initialResourceVersion), "Machine config %s should not be updated when failSwapOn is rejected", workerMCAfter.Name)
framework.Logf("Verified: %s was not updated (resourceVersion: %s)", workerMCAfter.Name, workerMCAfter.ResourceVersion)

g.By("Verifying worker nodes still have correct swap settings")
allWorkerNodes, err := getNodesByLabel(ctx, oc, "node-role.kubernetes.io/worker")
Expand Down
25 changes: 25 additions & 0 deletions test/extended/node/node_utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (

o "github.com/onsi/gomega"

machineconfigv1 "github.com/openshift/api/machineconfiguration/v1"
machineconfigclient "github.com/openshift/client-go/machineconfiguration/clientset/versioned"
exutil "github.com/openshift/origin/test/extended/util"
)
Expand Down Expand Up @@ -523,6 +524,30 @@ func waitForMCP(ctx context.Context, mcClient *machineconfigclient.Clientset, po
})
}

// getWorkerGeneratedKubeletMC finds and returns the highest numbered worker-generated-kubelet MachineConfig.
// KubeletConfig changes affect the highest numbered config, so we return that one.
func getWorkerGeneratedKubeletMC(ctx context.Context, mcClient *machineconfigclient.Clientset) (*machineconfigv1.MachineConfig, error) {
mcList, err := mcClient.MachineconfigurationV1().MachineConfigs().List(ctx, metav1.ListOptions{})
if err != nil {
return nil, err
}

var highestMC *machineconfigv1.MachineConfig
for i := range mcList.Items {
if strings.Contains(mcList.Items[i].Name, "worker-generated-kubelet") {
if highestMC == nil || mcList.Items[i].Name > highestMC.Name {
highestMC = &mcList.Items[i]
}
}
}

if highestMC == nil {
return nil, fmt.Errorf("worker-generated-kubelet MachineConfig not found")
}

return highestMC, nil
}

// labelWorkerNodesForCNV labels all worker nodes with kubevirt.io/schedulable=true
func labelWorkerNodesForCNV(ctx context.Context, oc *exutil.CLI) error {
framework.Logf("Labeling worker nodes for CNV...")
Expand Down