Restrict major version annotation to FeatureGate and CustomResourceDefinition

Author: JoelSpeed

pkg/manifest/manifest.go

@@ -451,6 +451,10 @@ func (m *Manifest) IncludeAllowUnknownCapabilities(excludeIdentifier *string, re
 
 	// Major version filtering
 	if majorVersion != nil {
+		if !isFeatureGate(m.GVK) && !isCustomResource(m.GVK) {
+			return fmt.Errorf("major version filtering is only supported for feature gates and custom resources")
+		}
+
 		err := checkMajorVersion(*majorVersion, annotations)
 		if err != nil {
 			return err
@@ -656,3 +660,11 @@ func addIfNotDuplicateResource(manifest Manifest, resourceIds map[resourceId]boo
 	}
 	return fmt.Errorf("duplicate resource: (%s)", manifest.id)
 }
+
+func isFeatureGate(gvk schema.GroupVersionKind) bool {
+	return gvk.Group == "config.openshift.io" && gvk.Kind == "FeatureGate"
+}
+
+func isCustomResource(gvk schema.GroupVersionKind) bool {
+	return gvk.Group == "apiextensions.k8s.io/" && gvk.Kind == "CustomResourceDefinition"
+}

pkg/manifest/manifest_test.go

@@ -1562,6 +1562,7 @@ func TestMajorVersionFiltering(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			manifest := createTestManifest(tt.annotations)
+			manifest.GVK = schema.GroupVersionKind{Group: "config.openshift.io", Kind: "FeatureGate"}
 
 			// Test through the Include method which calls checkMajorVersion
 			err := manifest.Include(nil, nil, nil, nil, nil, nil, tt.clusterMajorVersion)
@@ -1631,6 +1632,7 @@ func TestMajorVersionFilteringInteractionWithOtherFilters(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			manifest := createTestManifest(tt.annotations)
+			manifest.GVK = schema.GroupVersionKind{Group: "config.openshift.io", Kind: "FeatureGate"}
 
 			err := manifest.Include(nil, tt.requiredFeatureSet, nil, nil, nil, tt.enabledFeatureGates, tt.clusterMajorVersion)