Skip to content

NO-ISSUE: Fix pre-OS Image Stream OS validation for OKD clusters #31617

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

Open
sarthakpurohit wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −5
Open

NO-ISSUE: Fix pre-OS Image Stream OS validation for OKD clusters #31617

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
19 changes: 14 additions & 5 deletions test/extended/ci/job_names.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,14 +196,23 @@ var _ = g.Describe("[sig-ci] [Early] prow job name", func() {
})
})

func validatePreOSImageStreamsNodeOS(coreClient kclientset.Interface) {
// In clusters with no OSImageStreams the nodes should be always RHEL 9
func validatePreOSImageStreamsNodeOS(coreClient kclientset.Interface, isOKD bool) {
nodes, err := coreClient.CoreV1().Nodes().List(context.TODO(), metav1.ListOptions{})
o.Expect(err).NotTo(o.HaveOccurred(), "Error listing nodes")

// OKD SCOS clusters use CentOS Stream CoreOS 10 even in pre-OS Image Stream
// releases (4.22 and earlier). OCP clusters use RHEL CoreOS 9.
expectedSubstring := "CoreOS 9."
expectedDesc := "RHEL 9"
if isOKD {
expectedSubstring = "CentOS Stream CoreOS 10"
expectedDesc = "CentOS Stream CoreOS 10"
}

for _, node := range nodes.Items {
osImage := node.Status.NodeInfo.OSImage
o.Expect(osImage).To(o.ContainSubstring("CoreOS 9."), "Pre OS Image Stream cluster should use RHEL 9 nodes")
o.Expect(osImage).To(o.ContainSubstring(expectedSubstring),
"Pre OS Image Stream cluster should use %s nodes", expectedDesc)
}
}

Expand Down Expand Up @@ -307,8 +316,8 @@ func validateStandaloneNodeOS(oc *exutil.CLI, jobName, rawJobName string) {
clusterSemver, err := utilversion.ParseGeneric(clusterVersion.Status.Desired.Version)
o.Expect(err).NotTo(o.HaveOccurred(), "Error parsing ClusterVersion desired version %v", err)
if clusterSemver.LessThan(utilversion.MustParseSemantic("4.23.0")) {
// Pre-OS Image Streams GA. OS was always RHEL 9
validatePreOSImageStreamsNodeOS(oc.AdminKubeClient())
// Pre-OS Image Streams GA. OS was always RHEL 9 for OCP, CentOS Stream CoreOS 10 for OKD
validatePreOSImageStreamsNodeOS(oc.AdminKubeClient(), isOKD)
// Return now, the rest of the test is based on the presence of OSImageStream
return
}
Expand Down