Merge pull request kubernetes#87712 from alena1108/jan30kubelet

Ineffassign fixes for pkg/controller and kubelet

Author: k8s-ci-robot

pkg/controller/podautoscaler/horizontal.go

@@ -937,15 +937,13 @@ func convertDesiredReplicasWithRules(currentReplicas, desiredReplicas, hpaMinRep
 	var possibleLimitingReason string
 
 	minimumAllowedReplicas = hpaMinReplicas
-	possibleLimitingReason = "the desired replica count is less than the minimum replica count"
 
 	// Do not upscale too much to prevent incorrect rapid increase of the number of master replicas caused by
 	// bogus CPU usage report from heapster/kubelet (like in issue #32304).
 	scaleUpLimit := calculateScaleUpLimit(currentReplicas)
 
 	if hpaMaxReplicas > scaleUpLimit {
 		maximumAllowedReplicas = scaleUpLimit
-
 		possibleLimitingCondition = "ScaleUpLimit"
 		possibleLimitingReason = "the desired replica count is increasing faster than the maximum scale rate"
 	} else {

pkg/kubelet/cm/container_manager_windows.go

@@ -76,15 +76,14 @@ func (cm *containerManagerImpl) Start(node *v1.Node,
 
 // NewContainerManager creates windows container manager.
 func NewContainerManager(mountUtil mount.Interface, cadvisorInterface cadvisor.Interface, nodeConfig NodeConfig, failSwapOn bool, devicePluginEnabled bool, recorder record.EventRecorder) (ContainerManager, error) {
-	var capacity = v1.ResourceList{}
 	// It is safe to invoke `MachineInfo` on cAdvisor before logically initializing cAdvisor here because
 	// machine info is computed and cached once as part of cAdvisor object creation.
 	// But `RootFsInfo` and `ImagesFsInfo` are not available at this moment so they will be called later during manager starts
 	machineInfo, err := cadvisorInterface.MachineInfo()
 	if err != nil {
 		return nil, err
 	}
-	capacity = cadvisor.CapacityFromMachineInfo(machineInfo)
+	capacity := cadvisor.CapacityFromMachineInfo(machineInfo)
 
 	return &containerManagerImpl{
 		capacity:          capacity,