fix closure variable in filtered factory (#2885)

Co-authored-by: Reto Lehmann <retocode@icloud.com>
knative · Nov 3, 2023 · e287426 · e287426
1 parent 29775d7
commit e287426
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 12 deletions.
diff --git a/client/injection/apiextensions/informers/factory/filtered/fake/fake_filtered_factory.go b/client/injection/apiextensions/informers/factory/filtered/fake/fake_filtered_factory.go
diff --git a/client/injection/apiextensions/informers/factory/filtered/filtered_factory.go b/client/injection/apiextensions/informers/factory/filtered/filtered_factory.go
diff --git a/client/injection/kube/informers/factory/filtered/fake/fake_filtered_factory.go b/client/injection/kube/informers/factory/filtered/fake/fake_filtered_factory.go
diff --git a/client/injection/kube/informers/factory/filtered/filtered_factory.go b/client/injection/kube/informers/factory/filtered/filtered_factory.go
diff --git a/codegen/cmd/injection-gen/generators/fake_filtered_factory.go b/codegen/cmd/injection-gen/generators/fake_filtered_factory.go
@@ -116,14 +116,15 @@ func withInformerFactory(ctx {{.contextContext|raw}}) {{.contextContext|raw}} {
 	}
 	labelSelectors := untyped.([]string)
 	for _, selector := range labelSelectors {
+        selectorVal := selector
 		opts := []{{.informersSharedInformerOption|raw}}{}
 		if {{.injectionHasNamespace|raw}}(ctx) {
 			opts = append(opts, {{.informersWithNamespace|raw}}({{.injectionGetNamespace|raw}}(ctx)))
 		}		
 		opts = append(opts, {{.informersWithTweakListOptions|raw}}(func(l *{{.metav1ListOptions|raw}}) {
-			l.LabelSelector = selector
+			l.LabelSelector = selectorVal
 		}))
-		ctx = context.WithValue(ctx, {{.factoryKey|raw}}{Selector: selector},
+		ctx = context.WithValue(ctx, {{.factoryKey|raw}}{Selector: selectorVal},
 			{{.informersNewSharedInformerFactoryWithOptions|raw}}(c, {{.controllerGetResyncPeriod|raw}}(ctx), opts...))
 	}
 	return ctx

diff --git a/codegen/cmd/injection-gen/generators/filtered_factory.go b/codegen/cmd/injection-gen/generators/filtered_factory.go
@@ -117,14 +117,15 @@ func withInformerFactory(ctx {{.contextContext|raw}}) {{.contextContext|raw}} {
 	}
 	labelSelectors := untyped.([]string)
 	for _, selector := range labelSelectors {
+        selectorVal := selector
 		opts := []{{.informersSharedInformerOption|raw}}{}
 		if {{.injectionHasNamespace|raw}}(ctx) {
 			opts = append(opts, {{.informersWithNamespace|raw}}({{.injectionGetNamespace|raw}}(ctx)))
 		}	
 		opts = append(opts, {{.informersWithTweakListOptions|raw}}(func(l *{{.metav1ListOptions|raw}}) {
-			l.LabelSelector = selector
+			l.LabelSelector = selectorVal
 		}))
-		ctx = context.WithValue(ctx, Key{Selector: selector},
+		ctx = context.WithValue(ctx, Key{Selector: selectorVal},
 			{{.informersNewSharedInformerFactoryWithOptions|raw}}(c, {{.controllerGetResyncPeriod|raw}}(ctx), opts...))
 	}
 	return ctx