Skip to content

🌱 OPRUN-4138 Remove no-op patch strategy tags and markers #2225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 17, 2025
Merged

🌱 OPRUN-4138 Remove no-op patch strategy tags and markers #2225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion api/v1/clustercatalog_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ type ClusterCatalogStatus struct {
// +listType=map
// +listMapKey=type
// +optional
Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"`
Conditions []metav1.Condition `json:"conditions,omitempty"`
// resolvedSource contains information about the resolved source based on the source type.
// +optional
ResolvedSource *ResolvedCatalogSource `json:"resolvedSource,omitempty"`
Expand Down
4 changes: 1 addition & 3 deletions api/v1/clusterextension_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,12 +485,10 @@ type ClusterExtensionStatus struct {
// PackageDeprecated is set if the requested package is marked deprecated in the catalog.
// Deprecated is a rollup condition that is present when any of the deprecated conditions are present.
//
// +patchMergeKey=type
// +patchStrategy=merge
// +listType=map
// +listMapKey=type
// +optional
Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"`
Conditions []metav1.Condition `json:"conditions,omitempty"`

// install is a representation of the current installation status for this ClusterExtension.
//
Expand Down
6 changes: 1 addition & 5 deletions api/v1/clusterextensionrevision_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@ type ClusterExtensionRevisionSpec struct {
//
// +kubebuilder:validation:Required
// +kubebuilder:validation:XValidation:rule="self == oldSelf || oldSelf.size() == 0", message="phases is immutable"
// +patchMergeKey=name
// +patchStrategy=merge
// +listType=map
// +listMapKey=name
Phases []ClusterExtensionRevisionPhase `json:"phases"`
Expand Down Expand Up @@ -135,12 +133,10 @@ type ClusterExtensionRevisionPrevious struct {

// ClusterExtensionRevisionStatus defines the observed state of a ClusterExtensionRevision.
type ClusterExtensionRevisionStatus struct {
// +patchMergeKey=type
// +patchStrategy=merge
// +listType=map
// +listMapKey=type
// +optional
Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"`
Conditions []metav1.Condition `json:"conditions,omitempty"`
}

// +kubebuilder:object:root=true
Expand Down
4 changes: 1 addition & 3 deletions hack/tools/crd-generator/testdata/api/v1/clusterextension_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,12 +457,10 @@ type ClusterExtensionStatus struct {
// PackageDeprecated is set if the requested package is marked deprecated in the catalog.
// Deprecated is a rollup condition that is present when any of the deprecated conditions are present.
//
// +patchMergeKey=type
// +patchStrategy=merge
// +listType=map
// +listMapKey=type
// +optional
Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"`
Conditions []metav1.Condition `json:"conditions,omitempty"`

// install is a representation of the current installation status for this ClusterExtension.
//
Expand Down
Loading