Merge pull request #30 from cloudscale-ch/denis/rename-fix

Fix LB name changes not being applied

Author: href

pkg/cloudscale_ccm/reconcile.go

@@ -464,7 +464,7 @@ func nextLbActions(
 
 	// If the name of the lb is wrong, change it
 	if desired.lb.Name != actual.lb.Name {
-		next = append(next, actions.RenameLb(actual.lb.UUID, actual.lb.Name))
+		next = append(next, actions.RenameLb(actual.lb.UUID, desired.lb.Name))
 	}
 
 	// All other changes are applied aggressively, as the customer would have

pkg/cloudscale_ccm/reconcile_test.go

@@ -397,16 +397,16 @@ func TestNextLbActions(t *testing.T) {
 	// Rename lb if name changed. This is safe because the lbs have either
 	// been acquired by name (in which case both will have the same name),
 	// or by UUID through the service annotation.
-	one := &cloudscale.LoadBalancer{
+	want := &cloudscale.LoadBalancer{
 		Name: "foo",
 	}
-	two := &cloudscale.LoadBalancer{
+	have := &cloudscale.LoadBalancer{
 		UUID: "2",
 		Name: "bar",
 	}
-	assertActions(&lbState{lb: one}, &lbState{lb: two}, []actions.Action{
-		actions.AwaitLb(two),
-		actions.RenameLb("2", "bar"),
+	assertActions(&lbState{lb: want}, &lbState{lb: have}, []actions.Action{
+		actions.AwaitLb(have),
+		actions.RenameLb("2", "foo"),
 	})
 }