add build tags to legacy provider code and make it possible to build kube-controller-manager without any legacyproviders or without particular legacy providers

pkg/controller/nodeipam/ipam/adapter.go

@@ -1,3 +1,5 @@
+// +build !nolegacyproviders
+
 /*
 Copyright 2017 The Kubernetes Authors.
 
@@ -23,7 +25,7 @@ import (
 
 	"k8s.io/klog"
 
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	clientset "k8s.io/client-go/kubernetes"

pkg/controller/nodeipam/ipam/cloud_cidr_allocator.go

@@ -1,3 +1,5 @@
+// +build !nolegacyproviders
+
 /*
 Copyright 2016 The Kubernetes Authors.
 
@@ -25,7 +27,7 @@ import (
 
 	"k8s.io/klog"
 
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"

pkg/controller/nodeipam/ipam/cloud_cidr_allocator_nolegacyproviders.go

@@ -0,0 +1,32 @@
+// +build nolegacyproviders
+
+/*
+Copyright 2019 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package ipam
+
+import (
+	"errors"
+
+	informers "k8s.io/client-go/informers/core/v1"
+	clientset "k8s.io/client-go/kubernetes"
+	cloudprovider "k8s.io/cloud-provider"
+)
+
+// NewCloudCIDRAllocator creates a new cloud CIDR allocator.
+func NewCloudCIDRAllocator(client clientset.Interface, cloud cloudprovider.Interface, nodeInformer informers.NodeInformer) (CIDRAllocator, error) {
+	return nil, errors.New("legacy cloud provider support not built")
+}

pkg/controller/nodeipam/ipam/cloud_cidr_allocator_test.go

@@ -1,3 +1,5 @@
+// +build !nolegacyproviders
+
 /*
 Copyright 2018 The Kubernetes Authors.
 
@@ -21,7 +23,7 @@ import (
 	"testing"
 	"time"
 
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/informers"
 	"k8s.io/client-go/kubernetes/fake"

pkg/controller/nodeipam/ipam/controller_legacyprovider.go

@@ -1,3 +1,5 @@
+// +build !nolegacyproviders
+
 /*
 Copyright 2017 The Kubernetes Authors.
 

pkg/controller/nodeipam/legacyprovider.go

@@ -0,0 +1,69 @@
+// +build !nolegacyproviders
+
+/*
+Copyright 2019 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package nodeipam
+
+import (
+	"net"
+
+	coreinformers "k8s.io/client-go/informers/core/v1"
+	clientset "k8s.io/client-go/kubernetes"
+	cloudprovider "k8s.io/cloud-provider"
+	"k8s.io/klog"
+
+	"k8s.io/kubernetes/pkg/controller/nodeipam/ipam"
+	nodesync "k8s.io/kubernetes/pkg/controller/nodeipam/ipam/sync"
+)
+
+func startLegacyIPAM(
+	ic *Controller,
+	nodeInformer coreinformers.NodeInformer,
+	cloud cloudprovider.Interface,
+	kubeClient clientset.Interface,
+	clusterCIDRs []*net.IPNet,
+	serviceCIDR *net.IPNet,
+	nodeCIDRMaskSize int,
+) {
+	cfg := &ipam.Config{
+		Resync:       ipamResyncInterval,
+		MaxBackoff:   ipamMaxBackoff,
+		InitialRetry: ipamInitialBackoff,
+	}
+	switch ic.allocatorType {
+	case ipam.IPAMFromClusterAllocatorType:
+		cfg.Mode = nodesync.SyncFromCluster
+	case ipam.IPAMFromCloudAllocatorType:
+		cfg.Mode = nodesync.SyncFromCloud
+	}
+
+	// we may end up here with no cidr at all in case of FromCloud/FromCluster
+	var cidr *net.IPNet
+	if len(clusterCIDRs) > 0 {
+		cidr = clusterCIDRs[0]
+	}
+	if len(clusterCIDRs) > 1 {
+		klog.Warningf("Multiple cidrs were configured with FromCluster or FromCloud. cidrs except first one were discarded")
+	}
+	ipamc, err := ipam.NewController(cfg, kubeClient, cloud, cidr, serviceCIDR, nodeCIDRMaskSize)
+	if err != nil {
+		klog.Fatalf("Error creating ipam controller: %v", err)
+	}
+	if err := ipamc.Start(nodeInformer); err != nil {
+		klog.Fatalf("Error trying to Init(): %v", err)
+	}
+}

pkg/controller/nodeipam/node_ipam_controller.go

@@ -28,14 +28,13 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/tools/record"
 
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	coreinformers "k8s.io/client-go/informers/core/v1"
 	clientset "k8s.io/client-go/kubernetes"
 	corelisters "k8s.io/client-go/listers/core/v1"
 	cloudprovider "k8s.io/cloud-provider"
 	"k8s.io/kubernetes/pkg/controller"
 	"k8s.io/kubernetes/pkg/controller/nodeipam/ipam"
-	nodesync "k8s.io/kubernetes/pkg/controller/nodeipam/ipam/sync"
 	"k8s.io/kubernetes/pkg/util/metrics"
 )
 
@@ -131,33 +130,7 @@ func NewNodeIpamController(
 
 	// TODO: Abstract this check into a generic controller manager should run method.
 	if ic.allocatorType == ipam.IPAMFromClusterAllocatorType || ic.allocatorType == ipam.IPAMFromCloudAllocatorType {
-		cfg := &ipam.Config{
-			Resync:       ipamResyncInterval,
-			MaxBackoff:   ipamMaxBackoff,
-			InitialRetry: ipamInitialBackoff,
-		}
-		switch ic.allocatorType {
-		case ipam.IPAMFromClusterAllocatorType:
-			cfg.Mode = nodesync.SyncFromCluster
-		case ipam.IPAMFromCloudAllocatorType:
-			cfg.Mode = nodesync.SyncFromCloud
-		}
-
-		// we may end up here with no cidr at all in case of FromCloud/FromCluster
-		var cidr *net.IPNet
-		if len(clusterCIDRs) > 0 {
-			cidr = clusterCIDRs[0]
-		}
-		if len(clusterCIDRs) > 1 {
-			klog.Warningf("Multiple cidrs were configured with FromCluster or FromCloud. cidrs except first one were discarded")
-		}
-		ipamc, err := ipam.NewController(cfg, kubeClient, cloud, cidr, serviceCIDR, nodeCIDRMaskSize)
-		if err != nil {
-			klog.Fatalf("Error creating ipam controller: %v", err)
-		}
-		if err := ipamc.Start(nodeInformer); err != nil {
-			klog.Fatalf("Error trying to Init(): %v", err)
-		}
+		startLegacyIPAM(ic, nodeInformer, cloud, kubeClient, clusterCIDRs, serviceCIDR, nodeCIDRMaskSize)
 	} else {
 		var err error
 		ic.cidrAllocator, err = ipam.New(kubeClient, cloud, nodeInformer, ic.allocatorType, clusterCIDRs, ic.serviceCIDR, nodeCIDRMaskSize)

pkg/controller/nodeipam/nolegacyprovider.go

@@ -0,0 +1,40 @@
+// +build nolegacyproviders
+
+/*
+Copyright 2019 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package nodeipam
+
+import (
+	"net"
+
+	coreinformers "k8s.io/client-go/informers/core/v1"
+	clientset "k8s.io/client-go/kubernetes"
+	cloudprovider "k8s.io/cloud-provider"
+	"k8s.io/klog"
+)
+
+func startLegacyIPAM(
+	ic *Controller,
+	nodeInformer coreinformers.NodeInformer,
+	cloud cloudprovider.Interface,
+	kubeClient clientset.Interface,
+	clusterCIDRs []*net.IPNet,
+	serviceCIDR *net.IPNet,
+	nodeCIDRMaskSize int,
+) {
+	klog.Fatal("Error trying to Init(): legacy cloud provider support disabled at build time")
+}