Merge branch 'kubernetes-sigs:master' into master

barney-s · web-flow · commit 95ead15068bb · 2024-06-05T19:01:25.000-07:00
diff --git a/OWNERS b/OWNERS
@@ -4,3 +4,6 @@ approvers:
   - justinsb
   - johnsonj
   - atoato88
+
+reviewers:
+  - tomasaschan
diff --git a/pkg/patterns/addon/pkg/apis/v1alpha1/common_types.go b/pkg/patterns/addon/pkg/apis/v1alpha1/common_types.go
@@ -57,5 +57,6 @@ type Patchable interface {
 
 // +k8s:deepcopy-gen=true
 type PatchSpec struct {
+	// +kubebuilder:pruning:PreserveUnknownFields
 	Patches []*runtime.RawExtension `json:"patches,omitempty"`
 }

Original file line number	Diff line number	Diff line change
`@@ -57,5 +57,6 @@ type Patchable interface {`
`57`	`57`
`58`	`58`	`// +k8s:deepcopy-gen=true`
`59`	`59`	`type PatchSpec struct {`
	`60`	`+ // +kubebuilder:pruning:PreserveUnknownFields`
`60`	`61`	Patches []*runtime.RawExtension `json:"patches,omitempty"`
`61`	`62`	`}`