Merge pull request #9916 from k8s-infra-cherrypick-robot/cherry-pick-…

…9914-to-release-1.5

[release-1.5] 🐛 ssa: fix flaky test TestPatch/Test patch with Machine

internal/util/ssa/patch_test.go

@@ -21,6 +21,7 @@ import (
 	"time"
 
 	. "github.com/onsi/gomega"
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/utils/pointer"
@@ -111,6 +112,11 @@ func TestPatch(t *testing.T) {
 				Bootstrap: clusterv1.Bootstrap{
 					DataSecretName: pointer.String("data-secret"),
 				},
+				InfrastructureRef: corev1.ObjectReference{
+					// The namespace needs to get set here. Otherwise the defaulting webhook always sets this field again
+					// which would lead to an resourceVersion bump at the 3rd step and to a flaky test.
+					Namespace: ns.Name,
+				},
 			},
 		}
 		fieldManager := "test-manager"