remove extension-specific type checks

Signed-off-by: Ankita Thomas <ankithom@redhat.com>
operator-framework · Jun 3, 2024 · 27ad230 · 27ad230
1 parent b3f7127
commit 27ad230
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 16 deletions.
diff --git a/api/v1alpha1/clusterextension_types_test.go b/api/v1alpha1/clusterextension_types_test.go
@@ -22,7 +22,7 @@ func TestClusterExtensionTypeRegistration(t *testing.T) {
 	}
 
 	for _, tt := range types {
-		if !slices.Contains(conditionsets.ConditionTypes, tt) && !slices.Contains(conditionsets.ExtensionConditionTypes, tt) {
+		if !slices.Contains(conditionsets.ConditionTypes, tt) {
 			t.Errorf("append Type%s to conditionsets.ConditionTypes in this package's init function", tt)
 		}
 	}
@@ -32,11 +32,6 @@ func TestClusterExtensionTypeRegistration(t *testing.T) {
 			t.Errorf("there must be a Type%[1]s string literal constant for type %[1]q (i.e. 'const Type%[1]s = %[1]q')", tt)
 		}
 	}
-	for _, tt := range conditionsets.ExtensionConditionTypes {
-		if !slices.Contains(types, tt) {
-			t.Errorf("there must be a Type%[1]s string literal constant for type %[1]q (i.e. 'const Type%[1]s = %[1]q')", tt)
-		}
-	}
 }
 
 func TestClusterExtensionReasonRegistration(t *testing.T) {
@@ -46,7 +41,7 @@ func TestClusterExtensionReasonRegistration(t *testing.T) {
 	}
 
 	for _, r := range reasons {
-		if !slices.Contains(conditionsets.ConditionReasons, r) && !slices.Contains(conditionsets.ExtensionConditionReasons, r) {
+		if !slices.Contains(conditionsets.ConditionReasons, r) {
 			t.Errorf("append Reason%s to conditionsets.ConditionReasons in this package's init function.", r)
 		}
 	}
@@ -55,11 +50,6 @@ func TestClusterExtensionReasonRegistration(t *testing.T) {
 			t.Errorf("there must be a Reason%[1]s string literal constant for reason %[1]q (i.e. 'const Reason%[1]s = %[1]q')", r)
 		}
 	}
-	for _, r := range conditionsets.ExtensionConditionReasons {
-		if !slices.Contains(reasons, r) {
-			t.Errorf("there must be a Reason%[1]s string literal constant for reason %[1]q (i.e. 'const Reason%[1]s = %[1]q')", r)
-		}
-	}
 }
 
 // parseConstants parses the values of the top-level constants in the current

diff --git a/internal/conditionsets/conditionsets.go b/internal/conditionsets/conditionsets.go
@@ -22,7 +22,3 @@ package conditionsets
 // NOTE: These are populated by init() in api/v1alpha1/clusterextension_types.go
 var ConditionTypes []string
 var ConditionReasons []string
-
-// ExtensionConditionTypes is the set of Extension exclusive condition Types.
-var ExtensionConditionTypes []string
-var ExtensionConditionReasons []string