Merge branch 'master' of https://github.com/gardener/machine-controll…

…er-manager
gardener · May 18, 2021 · 9fe5556 · 9fe5556
2 parents 90a5d58 + 8b6b626
commit 9fe5556
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/controller/machine_util.go b/pkg/controller/machine_util.go
@@ -556,12 +556,12 @@ func (c *controller) getSecretData(machineClassName string, secretRefs ...*v1.Se
 			continue
 		}
 
-		secretRef, err := c.getSecret(secretRef, machineClassName)
+		secret, err := c.getSecret(secretRef, machineClassName)
 		if err != nil {
 			klog.V(2).Infof("Secret reference %s/%s not found", secretRef.Namespace, secretRef.Name)
 			return nil, err
 		}
-		secretData = mergeDataMaps(secretData, secretRef.Data)
+		secretData = mergeDataMaps(secretData, secret.Data)
 	}
 
 	return secretData, nil

diff --git a/pkg/util/provider/machinecontroller/machine_safety.go b/pkg/util/provider/machinecontroller/machine_safety.go
@@ -104,7 +104,7 @@ func (c *controller) reconcileClusterMachineSafetyAPIServer(key string) error {
 						return err
 					}
 
-					klog.V(2).Info("SafetyController: Reinitializing machine health check for machine: %q with backing node: %q and providerID: %q", machine.Name, getNodeName(machine), getProviderID(machine))
+					klog.V(2).Infof("SafetyController: Reinitializing machine health check for machine: %q with backing node: %q and providerID: %q", machine.Name, getNodeName(machine), getProviderID(machine))
 				}
 
 				// En-queue after 30 seconds, to ensure all machine states are reconciled