Merge pull request #446 from jessicaochen/clean_scaling

jessicaochen · web-flow · commit a02bba68a517 · 2017-11-30T11:30:23.000-08:00
Fix missing returns in node watcher
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

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ import (`
`27`	`27`	`"github.com/golang/glog"`
`28`	`28`	`)`
`29`	`29`
`30`		`-var machineControllerImage = "gcr.io/k8s-cluster-api/machine-controller:0.13"`
	`30`	`+var machineControllerImage = "gcr.io/k8s-cluster-api/machine-controller:0.14"`
`31`	`31`
`32`	`32`	`func init() {`
`33`	`33`	`if img, ok := os.LookupEnv("MACHINE_CONTROLLER_IMAGE"); ok {`
Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,7 @@ func (c NodeWatcher) link(node corev1.Node) {`
`116`	`116`	`machine, err := c.machineClient.Get(val, metav1.GetOptions{})`
`117`	`117`	`if err != nil {`
`118`	`118`	`glog.Errorf("Error getting machine %v: %v\n", val, err)`
	`119`	`+ return`
`119`	`120`	`}`
`120`	`121`
`121`	`122`	`machine.Status.NodeRef = objectRef(node)`
`@@ -135,6 +136,7 @@ func (c NodeWatcher) unlink(node corev1.Node) {`
`135`	`136`	`machine, err := c.machineClient.Get(val, metav1.GetOptions{})`
`136`	`137`	`if err != nil {`
`137`	`138`	`glog.Errorf("Error getting machine %v: %v\n", val, err)`
	`139`	`+ return`
`138`	`140`	`}`
`139`	`141`
`140`	`142`	`// This machine has no link to remove`