kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update to 1.12.3 and fix merge conflicts

This commit is contained in:
Rodrigo Menezes 2018-12-04 18:48:58 -08:00
parent 2b9243ff8c
commit feb9da17a7
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vendor/k8s.io/kubernetes/pkg/scheduler/cache/node_tree.go generated vendored
View File

@ -21,7 +21,6 @@ import (
"sync" "sync"
"k8s.io/api/core/v1" "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/util/sets"
utilnode "k8s.io/kubernetes/pkg/util/node" utilnode "k8s.io/kubernetes/pkg/util/node"
"github.com/golang/glog" "github.com/golang/glog"
@ -33,7 +32,6 @@ type NodeTree struct {
tree map[string]*nodeArray // a map from zone (region-zone) to an array of nodes in the zone. tree map[string]*nodeArray // a map from zone (region-zone) to an array of nodes in the zone.
zones []string // a list of all the zones in the tree (keys) zones []string // a list of all the zones in the tree (keys)
zoneIndex int zoneIndex int
exhaustedZones sets.String // set of zones that all of their nodes are returned by next()
NumNodes int NumNodes int
mu sync.RWMutex mu sync.RWMutex
} }
@ -62,7 +60,6 @@ func (na *nodeArray) next() (nodeName string, exhausted bool) {
func newNodeTree(nodes []*v1.Node) *NodeTree { func newNodeTree(nodes []*v1.Node) *NodeTree {
nt := &NodeTree{ nt := &NodeTree{
tree: make(map[string]*nodeArray), tree: make(map[string]*nodeArray),
exhaustedZones: sets.NewString(),
} }
for _, n := range nodes { for _, n := range nodes {
nt.AddNode(n) nt.AddNode(n)
@ -155,7 +152,6 @@ func (nt *NodeTree) resetExhausted() {
for _, na := range nt.tree { for _, na := range nt.tree {
na.lastIndex = 0 na.lastIndex = 0
} }
nt.exhaustedZones = sets.NewString()
nt.zoneIndex = 0 nt.zoneIndex = 0
} }