Merge pull request #1401 from GoogleCloudPlatform/revert-1398-fix-test-flakiness-main

Revert "test: use maps.Clone in TestPrepareMountArgs to prevent mutating shar…"

Author: uriel-guzman

pkg/sidecar_mounter/sidecar_mounter_config_test.go

@@ -18,7 +18,6 @@ limitations under the License.
 package sidecarmounter
 
 import (
-	"maps"
 	"os"
 	"path/filepath"
 	"reflect"
@@ -527,17 +526,16 @@ func TestPrepareMountArgs(t *testing.T) {
 	testPrometheusPort := prometheusPort
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			expectedArgs := maps.Clone(tc.expectedArgs)
 			found := slices.Contains(tc.mc.Options, util.DisableMetricsForGKE+":true")
 			if !found {
-				expectedArgs["prometheus-port"] = strconv.Itoa(testPrometheusPort)
+				tc.expectedArgs["prometheus-port"] = strconv.Itoa(testPrometheusPort)
 			}
 			// Increase port value to match behavior of prepareMountArgs()
 			testPrometheusPort++
 
 			tc.mc.prepareMountArgs()
-			if !reflect.DeepEqual(tc.mc.FlagMap, expectedArgs) {
-				t.Errorf("Got args %v, but expected %v", tc.mc.FlagMap, expectedArgs)
+			if !reflect.DeepEqual(tc.mc.FlagMap, tc.expectedArgs) {
+				t.Errorf("Got args %v, but expected %v", tc.mc.FlagMap, tc.expectedArgs)
 			}
 
 			if !reflect.DeepEqual(tc.mc.ConfigFileFlagMap, tc.expectedConfigMapArgs) {

pkg/webhook/injection_test.go

@@ -1940,36 +1940,39 @@ func TestInjectMetadataPrefetchSidecarWithSC(t *testing.T) {
 			si.PvLister = informer.Core().V1().PersistentVolumes().Lister()
 			si.PvcLister = informer.Core().V1().PersistentVolumeClaims().Lister()
 			informer.Start(ctx.Done())
-			err := informer.Storage().V1().StorageClasses().Informer().GetStore().Add(tc.sc)
+			_, err := fakeClient.StorageV1().StorageClasses().Create(context.TODO(), tc.sc, metav1.CreateOptions{})
+
 			if err != nil {
 				t.Fatalf("failed to setup test SC: %v", err)
 			}
-			err = informer.Core().V1().PersistentVolumes().Informer().GetStore().Add(tc.pv)
+			_, err = fakeClient.CoreV1().PersistentVolumes().Create(context.TODO(), tc.pv, metav1.CreateOptions{})
 			if err != nil {
 				t.Fatalf("failed to setup test PV: %v", err)
 			}
-			err = informer.Core().V1().PersistentVolumes().Informer().GetStore().Add(&corev1.PersistentVolume{
+			_, err = fakeClient.CoreV1().PersistentVolumes().Create(context.TODO(), &corev1.PersistentVolume{
 				ObjectMeta: metav1.ObjectMeta{
 					Name: "pv-mention-prefetch",
-				}})
+				}}, metav1.CreateOptions{})
 			if err != nil {
 				t.Fatalf("failed to setup test PV: %v", err)
 			}
 
-			err = informer.Core().V1().PersistentVolumeClaims().Informer().GetStore().Add(tc.pvc)
+			_, err = fakeClient.CoreV1().PersistentVolumeClaims("").Create(context.TODO(), tc.pvc, metav1.CreateOptions{})
 			if err != nil {
 				t.Fatalf("failed to setup test PVC: %v", err)
 			}
-			err = informer.Core().V1().PersistentVolumeClaims().Informer().GetStore().Add(&corev1.PersistentVolumeClaim{
+			_, err = fakeClient.CoreV1().PersistentVolumeClaims("").Create(context.TODO(), &corev1.PersistentVolumeClaim{
 				ObjectMeta: metav1.ObjectMeta{
 					Name: "pvc-mention-prefetch",
 				}, Spec: corev1.PersistentVolumeClaimSpec{
 					VolumeName: "pv-mention-prefetch",
-				}})
+				}}, metav1.CreateOptions{})
 			if err != nil {
 				t.Fatalf("failed to setup test PVC: %v", err)
 			}
 
+			informer.WaitForCacheSync(ctx.Done())
+
 			err = si.injectSidecarContainer(MetadataPrefetchSidecarName, tc.pod, *tc.nativeSidecar, nil)
 			t.Logf("%s resulted in %v and error: %v", tc.testName, err == nil, err)
 			if !reflect.DeepEqual(tc.pod, tc.expectedPod) {