Merge pull request #13344 from k8s-infra-cherrypick-robot/cherry-pick-13336-to-release-1.12

k8s-ci-robot · web-flow · commit 1a1852c74072 · 2026-02-17T16:13:04.000+05:30
[release-1.12] 🐛 Fix bug while setting status for deprecated fields
diff --git a/util/deprecated/v1beta1/patch/utils.go b/util/deprecated/v1beta1/patch/utils.go
@@ -182,7 +182,7 @@ func identifyConditionsFieldsPath(obj runtime.Object) ([]string, []string, error
 			// We assume the type is implemented according to transition guidelines
 			clusterv1ConditionsFields = []string{"status", "deprecated", "v1beta1", "conditions"}
 		} else {
-			if v1Beta1Field := deprecatedElem.FieldByName("V1Beta1"); deprecatedField != (reflect.Value{}) {
+			if v1Beta1Field := deprecatedElem.FieldByName("V1Beta1"); v1Beta1Field != (reflect.Value{}) {
 				if v1Beta1Field.Kind() != reflect.Pointer {
 					return nil, nil, errors.New("obj.status.deprecated.v1beta1 must be a pointer")
 				}
diff --git a/util/patch/utils.go b/util/patch/utils.go
@@ -182,7 +182,7 @@ func identifyConditionsFieldsPath(obj runtime.Object) ([]string, []string, error
 			// We assume the type is implemented according to transition guidelines
 			clusterv1ConditionsFields = []string{"status", "deprecated", "v1beta1", "conditions"}
 		} else {
-			if v1Beta1Field := deprecatedElem.FieldByName("V1Beta1"); deprecatedField != (reflect.Value{}) {
+			if v1Beta1Field := deprecatedElem.FieldByName("V1Beta1"); v1Beta1Field != (reflect.Value{}) {
 				if v1Beta1Field.Kind() != reflect.Pointer {
 					return nil, nil, errors.New("obj.status.deprecated.v1beta1 must be a pointer")
 				}

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ func identifyConditionsFieldsPath(obj runtime.Object) ([]string, []string, error`
`182`	`182`	`// We assume the type is implemented according to transition guidelines`
`183`	`183`	`clusterv1ConditionsFields = []string{"status", "deprecated", "v1beta1", "conditions"}`
`184`	`184`	`} else {`
`185`		`- if v1Beta1Field := deprecatedElem.FieldByName("V1Beta1"); deprecatedField != (reflect.Value{}) {`
	`185`	`+ if v1Beta1Field := deprecatedElem.FieldByName("V1Beta1"); v1Beta1Field != (reflect.Value{}) {`
`186`	`186`	`if v1Beta1Field.Kind() != reflect.Pointer {`
`187`	`187`	`return nil, nil, errors.New("obj.status.deprecated.v1beta1 must be a pointer")`
`188`	`188`	`}`