Add enum validation annotation to CollisionProtection (#2334)

perdasilva · Per Goncalves da Silva · web-flow · commit bf7e39f4e85c · 2025-11-17T14:22:52.000Z
Signed-off-by: Per Goncalves da Silva &lt;pegoncal@redhat.com&gt;
Co-authored-by: Per Goncalves da Silva &lt;pegoncal@redhat.com&gt;
diff --git a/api/v1/clusterextensionrevision_types.go b/api/v1/clusterextensionrevision_types.go
@@ -108,6 +108,7 @@ type ClusterExtensionRevisionObject struct {
 	// already existing on the cluster or even owned by another controller.
 	//
 	// +kubebuilder:default="Prevent"
+	// +kubebuilder:validation:Enum=Prevent;IfNoController;None
 	// +optional
 	CollisionProtection CollisionProtection `json:"collisionProtection,omitempty"`
 }
diff --git a/helm/olmv1/base/operator-controller/crd/experimental/olm.operatorframework.io_clusterextensionrevisions.yaml b/helm/olmv1/base/operator-controller/crd/experimental/olm.operatorframework.io_clusterextensionrevisions.yaml
@@ -87,6 +87,10 @@ spec:
                             description: |-
                               CollisionProtection controls whether OLM can adopt and modify objects
                               already existing on the cluster or even owned by another controller.
+                            enum:
+                            - Prevent
+                            - IfNoController
+                            - None
                             type: string
                           object:
                             type: object
diff --git a/manifests/experimental-e2e.yaml b/manifests/experimental-e2e.yaml
@@ -678,6 +678,10 @@ spec:
                             description: |-
                               CollisionProtection controls whether OLM can adopt and modify objects
                               already existing on the cluster or even owned by another controller.
+                            enum:
+                            - Prevent
+                            - IfNoController
+                            - None
                             type: string
                           object:
                             type: object
diff --git a/manifests/experimental.yaml b/manifests/experimental.yaml
@@ -643,6 +643,10 @@ spec:
                             description: |-
                               CollisionProtection controls whether OLM can adopt and modify objects
                               already existing on the cluster or even owned by another controller.
+                            enum:
+                            - Prevent
+                            - IfNoController
+                            - None
                             type: string
                           object:
                             type: object

Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,7 @@ type ClusterExtensionRevisionObject struct {`
`108`	`108`	`// already existing on the cluster or even owned by another controller.`
`109`	`109`	`//`
`110`	`110`	`// +kubebuilder:default="Prevent"`
	`111`	`+ // +kubebuilder:validation:Enum=Prevent;IfNoController;None`
`111`	`112`	`// +optional`
`112`	`113`	CollisionProtection CollisionProtection `json:"collisionProtection,omitempty"`
`113`	`114`	`}`