Просмотр исходного кода

Reset reserved status each call.

Matt Bolt 6 лет назад
Родитель
Сommit
b99c0ff6b7
1 измененных файлов с 3 добавлено и 3 удалено
  1. 3 3
      cloud/gcpprovider.go

+ 3 - 3
cloud/gcpprovider.go

@@ -841,6 +841,9 @@ func (gcp *GCP) ApplyReservedInstancePricing(nodes map[string]*Node) {
 
 
 	// go through all provider nodes using k8s nodes for region
 	// go through all provider nodes using k8s nodes for region
 	for nodeName, node := range nodes {
 	for nodeName, node := range nodes {
+		// Reset reserved allocation to prevent double allocation
+		node.Reserved = nil
+
 		kNode, ok := gcpNodes[nodeName]
 		kNode, ok := gcpNodes[nodeName]
 		if !ok {
 		if !ok {
 			klog.V(1).Infof("[Reserved] Could not find K8s Node with name: %s", nodeName)
 			klog.V(1).Infof("[Reserved] Could not find K8s Node with name: %s", nodeName)
@@ -858,9 +861,6 @@ func (gcp *GCP) ApplyReservedInstancePricing(nodes map[string]*Node) {
 			klog.V(1).Infof("[Reserved] Could not find counters for region: %s", nodeRegion)
 			klog.V(1).Infof("[Reserved] Could not find counters for region: %s", nodeRegion)
 			continue
 			continue
 		}
 		}
-		if node.Reserved != nil {
-			continue
-		}
 
 
 		node.Reserved = &ReservedInstanceData{
 		node.Reserved = &ReservedInstanceData{
 			ReservedCPU: 0,
 			ReservedCPU: 0,