pkg/cvo: Add scenario test for major version filtering

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>

Author: 2 people

pkg/cvo/cvo_scenarios_test.go

@@ -4389,6 +4389,90 @@ func TestCVO_FeatureGateManifestInclusion(t *testing.T) {
 	}
 }
 
+// TestCVO_MajorVersionManifestFiltering tests that manifest inclusion is filtered
+// based on the major version of the release payload.
+func TestCVO_MajorVersionManifestFiltering(t *testing.T) {
+	o, cvs, _, client, shutdownFn := setupCVOTest("testdata/majorversiontest-v5")
+
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
+	defer shutdownFn()
+	worker := o.configSync.(*SyncWorker)
+	go worker.Start(ctx, 1)
+
+	o.release.Image = "image/image:v5"
+	o.release.Version = "5.0.0-xyz"
+	uid, _ := uuid.NewRandom()
+	clusterUID := configv1.ClusterID(uid.String())
+	cvs["version"] = &configv1.ClusterVersion{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "version",
+		},
+		Spec: configv1.ClusterVersionSpec{
+			ClusterID: clusterUID,
+			Channel:   "fast",
+		},
+	}
+
+	// Execute: Sync the payload
+	err := o.sync(ctx, o.queueKey())
+	if err != nil {
+		t.Fatal(err)
+	}
+	waitForStatusCompleted(t, worker)
+
+	// Step 1: Payload contains expected number of filtered manifests
+	if worker.payload == nil {
+		t.Fatal("Expected payload to be loaded")
+	}
+	if len(worker.payload.Manifests) != 4 {
+		t.Fatalf("Expected 4 manifests in payload, got %d", len(worker.payload.Manifests))
+	}
+
+	manifestNames := make(map[string]bool)
+	for _, m := range worker.payload.Manifests {
+		manifestNames[m.Obj.GetName()] = true
+	}
+
+	// Step 2: Expected manifests are included
+	expectedManifests := []string{"noversion", "version5only", "version4or5", "excludeversion3"}
+	for _, expected := range expectedManifests {
+		if !manifestNames[expected] {
+			t.Errorf("Expected manifest %s to be included in version 5 payload, but it was not", expected)
+		}
+	}
+
+	// Step 3: Expected manifests are not included
+	if manifestNames["version4only"] {
+		t.Error("Expected manifest version4only to be excluded from version 5 payload, but it was included")
+	}
+
+	// Step 4: Major version is parsed from release metadata
+	if worker.payload.ParsedVersion.Major != 5 {
+		t.Errorf("Expected MajorVersion to be 5, got %d", worker.payload.ParsedVersion.Major)
+	}
+
+	// Step 5: Filtered manifests were applied to cluster
+	appliedCRDs := make(map[string]bool)
+	for _, action := range client.Actions() {
+		if createAction, ok := action.(clientgotesting.CreateAction); ok {
+			obj := createAction.GetObject().(*unstructured.Unstructured)
+			appliedCRDs[obj.GetName()] = true
+		}
+	}
+
+	for _, expected := range expectedManifests {
+		if !appliedCRDs[expected] {
+			t.Errorf("Expected CRD %s to be applied, but it was not", expected)
+		}
+	}
+
+	if appliedCRDs["version4only"] {
+		t.Error("Expected CRD version4only NOT to be applied, but it was")
+	}
+}
+
 // verifyCVSingleUpdate ensures that the only object to be updated is a ClusterVersion type and it is updated only once
 func verifyCVSingleUpdate(t *testing.T, actions []clientgotesting.Action) {
 	var count int

pkg/cvo/testdata/majorversiontest-v5/manifests/.gitkeep

@@ -0,0 +1,19 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: noversion
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
+spec:
+  group: test.io
+  names:
+    kind: NoVersion
+    plural: noversions
+  scope: Cluster
+  versions:
+  - name: v1
+    served: true
+    storage: true
+    schema:
+      openAPIV3Schema:
+        type: object

pkg/cvo/testdata/majorversiontest-v5/release-manifests/0000_10_no-version.yaml

@@ -0,0 +1,20 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: version4only
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
+    release.openshift.io/major-version: "4"
+spec:
+  group: test.io
+  names:
+    kind: Version4Only
+    plural: version4onlies
+  scope: Cluster
+  versions:
+  - name: v1
+    served: true
+    storage: true
+    schema:
+      openAPIV3Schema:
+        type: object

pkg/cvo/testdata/majorversiontest-v5/release-manifests/0000_20_version-4-only.yaml

@@ -0,0 +1,20 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: version5only
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
+    release.openshift.io/major-version: "5"
+spec:
+  group: test.io
+  names:
+    kind: Version5Only
+    plural: version5onlies
+  scope: Cluster
+  versions:
+  - name: v1
+    served: true
+    storage: true
+    schema:
+      openAPIV3Schema:
+        type: object

pkg/cvo/testdata/majorversiontest-v5/release-manifests/0000_30_version-5-only.yaml

@@ -0,0 +1,20 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: version4or5
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
+    release.openshift.io/major-version: "4,5"
+spec:
+  group: test.io
+  names:
+    kind: Version4Or5
+    plural: version4or5s
+  scope: Cluster
+  versions:
+  - name: v1
+    served: true
+    storage: true
+    schema:
+      openAPIV3Schema:
+        type: object

pkg/cvo/testdata/majorversiontest-v5/release-manifests/0000_40_version-4-or-5.yaml

@@ -0,0 +1,20 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: excludeversion3
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
+    release.openshift.io/major-version: "-3"
+spec:
+  group: test.io
+  names:
+    kind: ExcludeVersion3
+    plural: excludeversion3s
+  scope: Cluster
+  versions:
+  - name: v1
+    served: true
+    storage: true
+    schema:
+      openAPIV3Schema:
+        type: object

pkg/cvo/testdata/majorversiontest-v5/release-manifests/0000_50_exclude-version-3.yaml

@@ -0,0 +1,4 @@
+kind: ImageStream
+apiVersion: image.openshift.io/v1
+metadata:
+  name: 5.0.0-xyz

pkg/cvo/testdata/majorversiontest-v5/release-manifests/image-references

@@ -0,0 +1,9 @@
+{
+  "kind": "cincinnati-metadata-v0",
+  "version": "5.0.0-xyz",
+  "previous": [],
+  "metadata": {
+    "description": "",
+    "url": "https://example.com/v5.0.0-xyz"
+  }
+}