controllers: remove reconcile-time validators, refactor related tests (…

…#642) Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
operator-framework · Feb 21, 2024 · 6206def · 6206def
1 parent 6fa2685
commit 6206def
Show file tree

Hide file tree

Showing 12 changed files with 551 additions and 685 deletions.
diff --git a/api/v1alpha1/extension_types.go b/api/v1alpha1/extension_types.go
@@ -63,7 +63,8 @@ type ExtensionSourcePackage struct {
 // ExtensionSource defines the source for this Extension, right now, only a package is supported.
 type ExtensionSource struct {
 	// A source package defined by a name, version and/or channel
-	Package *ExtensionSourcePackage `json:"package,omitempty"`
+	//+kubebuilder:validation:Required
+	Package *ExtensionSourcePackage `json:"package"`
 }
 
 // ExtensionSpec defines the desired state of Extension

diff --git a/config/crd/bases/olm.operatorframework.io_extensions.yaml b/config/crd/bases/olm.operatorframework.io_extensions.yaml
@@ -95,6 +95,8 @@ spec:
                     required:
                     - name
                     type: object
+                required:
+                - package
                 type: object
             required:
             - serviceAccountName

diff --git a/internal/controllers/admission_test.go b/internal/controllers/admission_test.go