Merge pull request #6232 from inteon/fix_log_reassignment

[BUGFIX] Incorrect re-assignment of cross-invocation variable
cert-manager · Jul 26, 2023 · 0b9366c · 0b9366c
2 parents ab2a8c5 + c7d0e0a
commit 0b9366c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/pkg/controller/cainjector/indexers.go b/pkg/controller/cainjector/indexers.go
@@ -52,7 +52,7 @@ func certFromSecretToInjectableMapFuncBuilder(cl client.Reader, log logr.Logger,
 		if certName == nil {
 			return nil
 		}
-		log = log.WithValues("type", config.resourceName, "secret", secretName, "certificate", *certName)
+		log := log.WithValues("type", config.resourceName, "secret", secretName, "certificate", *certName)
 
 		// confirm that a service owns this cert
 		var cert cmapi.Certificate
@@ -97,7 +97,7 @@ func certFromSecretToInjectableMapFuncBuilder(cl client.Reader, log logr.Logger,
 func certToInjectableMapFuncBuilder(cl client.Reader, log logr.Logger, config setup) handler.MapFunc {
 	return func(ctx context.Context, obj client.Object) []ctrl.Request {
 		certName := types.NamespacedName{Namespace: obj.GetNamespace(), Name: obj.GetName()}
-		log = log.WithValues("type", config.resourceName, "certificate", certName)
+		log := log.WithValues("type", config.resourceName, "certificate", certName)
 		objs := config.listType.DeepCopyObject().(client.ObjectList)
 		if err := cl.List(ctx, objs, client.MatchingFields{injectFromPath: certName.String()}); err != nil {
 			log.Error(err, "unable to fetch injectables associated with certificate")
@@ -134,7 +134,7 @@ func certToInjectableMapFuncBuilder(cl client.Reader, log logr.Logger, config se
 func secretForInjectableMapFuncBuilder(cl client.Reader, log logr.Logger, config setup) handler.MapFunc {
 	return func(ctx context.Context, obj client.Object) []ctrl.Request {
 		secretName := types.NamespacedName{Namespace: obj.GetNamespace(), Name: obj.GetName()}
-		log = log.WithValues("type", config.resourceName, "secret", secretName)
+		log := log.WithValues("type", config.resourceName, "secret", secretName)
 		objs := config.listType.DeepCopyObject().(client.ObjectList)
 		// TODO: ensure that this is cache lister, not a direct client
 		if err := cl.List(ctx, objs, client.MatchingFields{injectFromSecretPath: secretName.String()}); err != nil {