Merge pull request #446 from jessicaochen/clean_scaling

Fix missing returns in node watcher
kubernetes-retired · Nov 30, 2017 · a02bba6 · a02bba6
2 parents 55107cd + ef93308
commit a02bba6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/cluster-api/cloud/google/pods.go b/cluster-api/cloud/google/pods.go
@@ -27,7 +27,7 @@ import (
 	"github.com/golang/glog"
 )
 
-var machineControllerImage = "gcr.io/k8s-cluster-api/machine-controller:0.13"
+var machineControllerImage = "gcr.io/k8s-cluster-api/machine-controller:0.14"
 
 func init() {
 	if img, ok := os.LookupEnv("MACHINE_CONTROLLER_IMAGE"); ok {

diff --git a/cluster-api/machine-controller/Makefile b/cluster-api/machine-controller/Makefile
@@ -1,6 +1,6 @@
 PROJECT=k8s-cluster-api
 NAME=machine-controller
-VERSION=0.13
+VERSION=0.14
 
 staticbuild:
 	CGO_ENABLED=0 GOOS=linux go build -a -ldflags '-extldflags "-static"' .

diff --git a/cluster-api/machine-controller/controller/nodewatcher.go b/cluster-api/machine-controller/controller/nodewatcher.go
@@ -116,6 +116,7 @@ func (c *NodeWatcher) link(node *corev1.Node) {
 		machine, err := c.machineClient.Get(val, metav1.GetOptions{})
 		if err != nil {
 			glog.Errorf("Error getting machine %v: %v\n", val, err)
+			return
 		}
 
 		machine.Status.NodeRef = objectRef(node)
@@ -135,6 +136,7 @@ func (c *NodeWatcher) unlink(node *corev1.Node) {
 		machine, err := c.machineClient.Get(val, metav1.GetOptions{})
 		if err != nil {
 			glog.Errorf("Error getting machine %v: %v\n", val, err)
+			return
 		}
 
 		// This machine has no link to remove