Make KDD IPAM controller reactive to node deletions

projectcalico · Feb 13, 2019 · a12aec3 · a12aec3
1 parent 90a94e3
commit a12aec3
Show file tree

Hide file tree

Showing 7 changed files with 357 additions and 375 deletions.
diff --git a/cmd/kube-controllers/main.go b/cmd/kube-controllers/main.go
@@ -36,7 +36,6 @@ import (
 
 	"github.com/projectcalico/kube-controllers/pkg/config"
 	"github.com/projectcalico/kube-controllers/pkg/controllers/controller"
-	kddipam "github.com/projectcalico/kube-controllers/pkg/controllers/kdd-ipam"
 	"github.com/projectcalico/kube-controllers/pkg/controllers/namespace"
 	"github.com/projectcalico/kube-controllers/pkg/controllers/networkpolicy"
 	"github.com/projectcalico/kube-controllers/pkg/controllers/node"
@@ -144,12 +143,6 @@ func main() {
 				controller:  serviceAccountController,
 				threadiness: config.ProfileWorkers,
 			}
-		case "ipam":
-			ipamController := kddipam.NewController(ctx, k8sClientset, calicoClient, config)
-			controllerCtrl.controllerStates["IPAM"] = &controllerState{
-				controller:  ipamController,
-				threadiness: 1,
-			}
 		default:
 			log.Fatalf("Invalid controller '%s' provided.", controllerType)
 		}

diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -14,8 +14,7 @@ import:
   subpackages:
   - fv/containers
 - package: github.com/projectcalico/libcalico-go
-  repo: https://github.com/caseydavenport/libcalico-go
-  version: 8a9bd599901759ede38b0eab26e4604bcc572fa5
+  version: 61a81ef2608e8744731f00d878b8c76a3ab95486
   subpackages:
   - lib/apiconfig
   - lib/apis/v3

diff --git a/pkg/controllers/kdd-ipam/controller.go b/pkg/controllers/kdd-ipam/controller.go