Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions api/v1/clusterextensionrevision_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions manifests/experimental-e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions manifests/experimental.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading