Merge pull request #4893 from camilamacedo86/fix-confitions

k8s-ci-robot · web-flow · commit 6d79463ce291 · 2025-06-30T01:38:30.000-07:00
🐛 (deploy-image/v1alpha1): drop patchStrategy/protobuf tags from Conditions
diff --git a/docs/book/src/getting-started/testdata/project/api/v1alpha1/memcached_types.go b/docs/book/src/getting-started/testdata/project/api/v1alpha1/memcached_types.go
@@ -51,7 +51,7 @@ type MemcachedStatus struct {
 	// Memcached.status.conditions.Message is a human readable message indicating details about the transition.
 	// For further information see: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#typical-status-properties
 
-	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
diff --git a/hack/docs/internal/getting-started/generate_getting_started.go b/hack/docs/internal/getting-started/generate_getting_started.go
@@ -265,7 +265,7 @@ const newStatusAPI = `// Represents the observations of a Memcached's current st
 	// Memcached.status.conditions.Message is a human readable message indicating details about the transition.
 	// For further information see: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#typical-status-properties
 
-	Conditions []metav1.Condition ` + "`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`"
+	Conditions []metav1.Condition ` + "`json:\"conditions,omitempty\"`"
 
 const sampleSizeFragment = `# TODO(user): edit the following value to ensure the number
   # of Pods/Instances your Operand must have on cluster
diff --git a/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/api/types.go b/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/api/types.go
@@ -101,7 +101,7 @@ type {{ .Resource.Kind }}Status struct {
 	// {{ .Resource.Kind }}.status.conditions.Message is a human readable message indicating details about the transition.
 	// For further information see: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#typical-status-properties
 
-	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
diff --git a/testdata/project-v4-multigroup/api/example.com/v1alpha1/busybox_types.go b/testdata/project-v4-multigroup/api/example.com/v1alpha1/busybox_types.go
@@ -48,7 +48,7 @@ type BusyboxStatus struct {
 	// Busybox.status.conditions.Message is a human readable message indicating details about the transition.
 	// For further information see: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#typical-status-properties
 
-	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
diff --git a/testdata/project-v4-multigroup/api/example.com/v1alpha1/memcached_types.go b/testdata/project-v4-multigroup/api/example.com/v1alpha1/memcached_types.go
@@ -51,7 +51,7 @@ type MemcachedStatus struct {
 	// Memcached.status.conditions.Message is a human readable message indicating details about the transition.
 	// For further information see: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#typical-status-properties
 
-	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
diff --git a/testdata/project-v4-with-plugins/api/v1alpha1/busybox_types.go b/testdata/project-v4-with-plugins/api/v1alpha1/busybox_types.go
@@ -48,7 +48,7 @@ type BusyboxStatus struct {
 	// Busybox.status.conditions.Message is a human readable message indicating details about the transition.
 	// For further information see: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#typical-status-properties
 
-	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
diff --git a/testdata/project-v4-with-plugins/api/v1alpha1/memcached_types.go b/testdata/project-v4-with-plugins/api/v1alpha1/memcached_types.go
@@ -51,7 +51,7 @@ type MemcachedStatus struct {
 	// Memcached.status.conditions.Message is a human readable message indicating details about the transition.
 	// For further information see: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#typical-status-properties
 
-	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

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ type MemcachedStatus struct {`
`51`	`51`	`// Memcached.status.conditions.Message is a human readable message indicating details about the transition.`
`52`	`52`	`// For further information see: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#typical-status-properties`
`53`	`53`
`54`		- Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"`
	`54`	+ Conditions []metav1.Condition `json:"conditions,omitempty"`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`// +kubebuilder:object:root=true`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ type {{ .Resource.Kind }}Status struct {`
`101`	`101`	`// {{ .Resource.Kind }}.status.conditions.Message is a human readable message indicating details about the transition.`
`102`	`102`	`// For further information see: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#typical-status-properties`
`103`	`103`
`104`		- Conditions []metav1.Condition ` + "`" + `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"` + "`" + `
	`104`	+ Conditions []metav1.Condition ` + "`" + `json:"conditions,omitempty"` + "`" + `
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`// +kubebuilder:object:root=true`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ type BusyboxStatus struct {`
`48`	`48`	`// Busybox.status.conditions.Message is a human readable message indicating details about the transition.`
`49`	`49`	`// For further information see: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#typical-status-properties`
`50`	`50`
`51`		- Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"`
	`51`	+ Conditions []metav1.Condition `json:"conditions,omitempty"`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`// +kubebuilder:object:root=true`