Merge pull request #76 from Charliekenney23/feat/nodebal-id-annotation

add nodebalancer-id annotation

Author: 0xch4z

README.md

@@ -52,7 +52,8 @@ Annotation (Suffix) | Values | Default | Description
 `check-timeout` | int (1-30) | | Duration, in seconds, to wait for a health check to succeed before considering it a failure
 `check-attempts` | int (1-30) | | Number of health check failures necessary to remove a back-end from the service
 `check-passive` | [bool](#annotation-bool-values) | `false` | When `true`, `5xx` status codes will cause the health check to fail
-`preserve` | [bool](#annotation-bool-values) | `false` | When `true`, deleting a `LoadBalancer` service does not delete the underlying NodeBalancer
+`preserve` | [bool](#annotation-bool-values) | `false` | When `true`, deleting a `LoadBalancer` service does not delete the underlying NodeBalancer. This will also prevent deletion of the former LoadBalancer when another one is specified with the `nodebalancer-id` annotation.
+`nodebalancer-id` | string | | The ID of the NodeBalancer to front the service. When not specified, a new NodeBalancer will be created. This can be configured on service creation or patching
 
 #### Deprecated Annotations
 
@@ -251,7 +252,7 @@ dep ensure
 
 #### Building Docker images
 
-To build and push a Docker image, use the following make targets. 
+To build and push a Docker image, use the following make targets.
 
 ```bash
 # Set the repo/image:tag with the TAG environment variable

cloud/linode/cloud.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/linode/linodego"
 	"github.com/spf13/pflag"
+	"k8s.io/client-go/informers"
 	"k8s.io/kubernetes/pkg/cloudprovider"
 	"k8s.io/kubernetes/pkg/controller"
 )
@@ -70,6 +71,16 @@ func newCloud() (cloudprovider.Interface, error) {
 }
 
 func (c *linodeCloud) Initialize(clientBuilder controller.ControllerClientBuilder) {
+	kubeclient := clientBuilder.ClientOrDie("linode-shared-informers")
+	sharedInformer := informers.NewSharedInformerFactory(kubeclient, 0)
+	serviceInformer := sharedInformer.Core().V1().Services()
+
+	serviceController := newServiceController(c.loadbalancers.(*loadbalancers), serviceInformer)
+
+	// in future version of the cloudprovider package, we should use the stopCh provided to
+	// (cloudprovider.Interface).Initialize instead
+	forever := make(chan struct{})
+	go serviceController.Run(forever)
 }
 
 func (c *linodeCloud) LoadBalancer() (cloudprovider.LoadBalancer, bool) {

cloud/linode/fake_linode_test.go

@@ -341,14 +341,17 @@ func (f *fakeAPI) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 			ip := net.IPv4(byte(rand.Intn(100)), byte(rand.Intn(100)), byte(rand.Intn(100)), byte(rand.Intn(100))).String()
 			hostname := fmt.Sprintf("nb-%s.%s.linode.com", strings.Replace(ip, ".", "-", 4), strings.ToLower(nbco.Region))
 			nb := linodego.NodeBalancer{
-				ID:                 rand.Intn(9999),
-				Label:              nbco.Label,
-				Region:             nbco.Region,
-				ClientConnThrottle: *nbco.ClientConnThrottle,
-				IPv4:               &ip,
-				Hostname:           &hostname,
-				CreatedStr:         time.Now().Format("2006-01-02T15:04:05"),
-				UpdatedStr:         time.Now().Format("2006-01-02T15:04:05"),
+				ID:         rand.Intn(9999),
+				Label:      nbco.Label,
+				Region:     nbco.Region,
+				IPv4:       &ip,
+				Hostname:   &hostname,
+				CreatedStr: time.Now().Format("2006-01-02T15:04:05"),
+				UpdatedStr: time.Now().Format("2006-01-02T15:04:05"),
+			}
+
+			if nbco.ClientConnThrottle != nil {
+				nb.ClientConnThrottle = *nbco.ClientConnThrottle
 			}
 			f.nb[strconv.Itoa(nb.ID)] = &nb