Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
uriel-guzman merged 2 commits into from
May 29, 2026
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b354623
Revert "test: fix informer watch race in TestInjectMetadataPrefetchSi…
chrisThePattyEater May 29, 2026
126baab
Revert "test: use maps.Clone in TestPrepareMountArgs to prevent mutat…
chrisThePattyEater May 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions pkg/sidecar_mounter/sidecar_mounter_config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ limitations under the License.
package sidecarmounter

import (
"maps"
"os"
"path/filepath"
"reflect"
Expand Down Expand Up @@ -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)
}
Comment on lines 529 to 539

@gemini-code-assist gemini-code-assist Bot May 29, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

Reverting the use of maps.Clone re-introduces a test pollution bug. tc.expectedArgs points to the shared global map defaultFlagMap for multiple test cases. Mutating tc.expectedArgs directly via tc.expectedArgs["prometheus-port"] = ... mutates defaultFlagMap for all subsequent test cases that reference it.

To prevent this test pollution without relying on the maps package (if that was the reason for the revert), we can manually copy the map for each test run.

Suggested change
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)
}
expectedArgs := make(map[string]string, len(tc.expectedArgs))
for k, v := range tc.expectedArgs {
expectedArgs[k] = v
}
found := slices.Contains(tc.mc.Options, util.DisableMetricsForGKE+":true")
if !found {
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.ConfigFileFlagMap, tc.expectedConfigMapArgs) {
Expand Down
17 changes: 10 additions & 7 deletions pkg/webhook/injection_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Loading