diff --git a/pkg/controller/podautoscaler/horizontal.go b/pkg/controller/podautoscaler/horizontal.go index 85019a4dea7..4181a1a2641 100644 --- a/pkg/controller/podautoscaler/horizontal.go +++ b/pkg/controller/podautoscaler/horizontal.go @@ -936,7 +936,6 @@ 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). @@ -944,7 +943,6 @@ func convertDesiredReplicasWithRules(currentReplicas, desiredReplicas, hpaMinRep if hpaMaxReplicas > scaleUpLimit { maximumAllowedReplicas = scaleUpLimit - possibleLimitingCondition = "ScaleUpLimit" possibleLimitingReason = "the desired replica count is increasing faster than the maximum scale rate" } else { diff --git a/pkg/kubelet/cm/container_manager_windows.go b/pkg/kubelet/cm/container_manager_windows.go index e4a88b86b9b..b80586b89e2 100644 --- a/pkg/kubelet/cm/container_manager_windows.go +++ b/pkg/kubelet/cm/container_manager_windows.go @@ -76,7 +76,6 @@ 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 @@ -84,7 +83,7 @@ func NewContainerManager(mountUtil mount.Interface, cadvisorInterface cadvisor.I if err != nil { return nil, err } - capacity = cadvisor.CapacityFromMachineInfo(machineInfo) + capacity := cadvisor.CapacityFromMachineInfo(machineInfo) return &containerManagerImpl{ capacity: capacity,