Bug 2084331: pkg/manifest/manifest.go: Fix checkResourceEnablement

openshift · May 11, 2022 · 73c6930 · 73c6930
1 parent f2c20ff
commit 73c6930
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 2 deletions.
diff --git a/pkg/manifest/manifest.go b/pkg/manifest/manifest.go
@@ -171,10 +171,13 @@ func checkResourceEnablement(annotations map[string]string, capabilities *config
 	unknownCaps := make([]string, 0, numCaps)
 	disabledCaps := make([]string, 0, numCaps)
 
-	var isKnownCap bool = false
-	var isEnabledCap bool = false
+	var isKnownCap bool
+	var isEnabledCap bool
 
 	for _, c := range caps {
+		isKnownCap = false
+		isEnabledCap = false
+
 		for _, knownCapability := range capabilities.KnownCapabilities {
 			if c == knownCapability {
 				isKnownCap = true

diff --git a/pkg/manifest/manifest_test.go b/pkg/manifest/manifest_test.go
@@ -720,6 +720,41 @@ func Test_include(t *testing.T) {
 				EnabledCapabilities: []configv1.ClusterVersionCapability{"cap1"},
 			},
 		},
+		{
+			name:    "multiple capabilities, 1 unknown, works",
+			profile: &defaultClusterProfile,
+			annotations: map[string]interface{}{
+				"include.release.openshift.io/self-managed-high-availability": "true",
+				CapabilityAnnotation: "cap1+cap2"},
+			caps: &configv1.ClusterVersionCapabilitiesStatus{
+				KnownCapabilities:   []configv1.ClusterVersionCapability{"cap1", "cap3"},
+				EnabledCapabilities: []configv1.ClusterVersionCapability{"cap1", "cap3"},
+			},
+			expected: fmt.Errorf("unrecognized capability names: cap2"),
+		},
+		{
+			name:    "multiple capabilities, 1 disabled, works",
+			profile: &defaultClusterProfile,
+			annotations: map[string]interface{}{
+				"include.release.openshift.io/self-managed-high-availability": "true",
+				CapabilityAnnotation: "cap1+cap2"},
+			caps: &configv1.ClusterVersionCapabilitiesStatus{
+				KnownCapabilities:   []configv1.ClusterVersionCapability{"cap1", "cap2", "cap3"},
+				EnabledCapabilities: []configv1.ClusterVersionCapability{"cap1", "cap3"},
+			},
+			expected: fmt.Errorf("disabled capabilities: cap2"),
+		},
+		{
+			name:    "multiple capabilities, all enabled, works",
+			profile: &defaultClusterProfile,
+			annotations: map[string]interface{}{
+				"include.release.openshift.io/self-managed-high-availability": "true",
+				CapabilityAnnotation: "cap1+cap2+cap3"},
+			caps: &configv1.ClusterVersionCapabilitiesStatus{
+				KnownCapabilities:   []configv1.ClusterVersionCapability{"cap1", "cap2", "cap3"},
+				EnabledCapabilities: []configv1.ClusterVersionCapability{"cap1", "cap2", "cap3"},
+			},
+		},
 		{
 			name:        "all nil",
 			profile:     nil,