Merge pull request #1759 from wking/restore-CustomNoUpgrade-manifest-handling

NO-ISSUE: pkg/manifest: Restore CustomNoUpgrade handling

Author: openshift-merge-bot[bot]

pkg/manifest/manifest.go

@@ -40,6 +40,7 @@ func init() {
 			knownFeatureSets.Insert(string(featureSet))
 		}
 	}
+	knownFeatureSets.Insert(string(configv1.CustomNoUpgrade))
 }
 
 // resourceId uniquely identifies a Kubernetes resource.

pkg/manifest/manifest_test.go

@@ -688,7 +688,7 @@ func Test_include(t *testing.T) {
 				"include.release.openshift.io/self-managed-high-availability": "true",
 				"release.openshift.io/feature-set":                            "Other",
 			},
-			expected: fmt.Errorf("unrecognized value \"Other\" in release.openshift.io/feature-set=Other; known values are: Default,DevPreviewNoUpgrade,TechPreviewNoUpgrade"),
+			expected: fmt.Errorf("unrecognized value \"Other\" in release.openshift.io/feature-set=Other; known values are: CustomNoUpgrade,Default,DevPreviewNoUpgrade,TechPreviewNoUpgrade"),
 		},
 		{
 			name:               "incorrect techpreview value is not excluded if techpreview on using feature-set",
@@ -698,7 +698,7 @@ func Test_include(t *testing.T) {
 				"include.release.openshift.io/self-managed-high-availability": "true",
 				"release.openshift.io/feature-set":                            "Other",
 			},
-			expected: fmt.Errorf("unrecognized value \"Other\" in release.openshift.io/feature-set=Other; known values are: Default,DevPreviewNoUpgrade,TechPreviewNoUpgrade"),
+			expected: fmt.Errorf("unrecognized value \"Other\" in release.openshift.io/feature-set=Other; known values are: CustomNoUpgrade,Default,DevPreviewNoUpgrade,TechPreviewNoUpgrade"),
 		},
 		{
 			name:        "default profile selection excludes without annotation",