Replace tectonic-network-operator with cluster-network-operator

Gopkg.toml

@@ -75,3 +75,7 @@ ignored = ["github.com/openshift/installer/tests*"]
 [[constraint]]
   name = "k8s.io/utils"
   revision = "4c3feeb576b06ef8fea769809bd3db5e5e78dc23"
+
+[[constraint]]
+  name = "github.com/openshift/cluster-network-operator"
+  revision = "fb8b55a1072436a51b153de9acf5bf5525efcf83"

data/data/bootstrap/files/usr/local/bin/bootkube.sh.template

@@ -97,10 +97,6 @@ then
 	cp kube-scheduler-bootstrap/manifests/* manifests/
 fi
 
-# TODO: Remove this when manifest-overrides is empty.
-echo "Installing temporary bootstrap manifests..."
-cp manifest-overrides/* manifests/
-
 if [ ! -d mco-bootstrap ]
 then
 	echo "Rendering MCO manifests..."

pkg/asset/installconfig/installconfig.go

@@ -8,6 +8,7 @@ import (
 	"github.com/pkg/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
+	netopv1 "github.com/openshift/cluster-network-operator/pkg/apis/networkoperator/v1"
 	"github.com/openshift/installer/pkg/asset"
 	"github.com/openshift/installer/pkg/ipnet"
 	"github.com/openshift/installer/pkg/types"
@@ -18,8 +19,9 @@ const (
 )
 
 var (
-	defaultServiceCIDR = parseCIDR("10.3.0.0/16")
-	defaultPodCIDR     = parseCIDR("10.2.0.0/16")
+	defaultServiceCIDR      = parseCIDR("10.3.0.0/16")
+	defaultClusterCIDR      = "10.2.0.0/16"
+	defaultHostSubnetLength = 9 // equivalent to a /23 per node
 )
 
 // InstallConfig generates the install-config.yml file.
@@ -78,15 +80,16 @@ func (a *InstallConfig) Generate(parents asset.Parents) error {
 		},
 		BaseDomain: baseDomain.BaseDomain,
 		Networking: types.Networking{
-			// TODO(yifan): Flannel is the temporal default network type for now,
-			// Need to update it to the new types.
-			Type: "flannel",
+			Type: "OpenshiftSDN",
 
 			ServiceCIDR: ipnet.IPNet{
 				IPNet: defaultServiceCIDR,
 			},
-			PodCIDR: ipnet.IPNet{
-				IPNet: defaultPodCIDR,
+			ClusterNetworks: []netopv1.ClusterNetwork{
+				{
+					CIDR:             defaultClusterCIDR,
+					HostSubnetLength: uint32(defaultHostSubnetLength),
+				},
 			},
 		},
 		PullSecret: pullSecret.PullSecret,