pkg/types: Add cross-platform Networking.MachineCIDR

The concept was not platform-specific, and it's simpler to track the
cross-platform value in a single, generic location.

Author: wking

data/data/aws/main.tf

@@ -70,7 +70,7 @@ module "vpc" {
   source = "./vpc"
 
   base_domain  = "${var.base_domain}"
-  cidr_block   = "${var.aws_vpc_cidr_block}"
+  cidr_block   = "${var.machine_cidr}"
   cluster_id   = "${var.cluster_id}"
   cluster_name = "${var.cluster_name}"
   region       = "${var.aws_region}"

data/data/aws/variables-aws.tf

@@ -21,15 +21,6 @@ variable "aws_ec2_ami_override" {
   default     = ""
 }
 
-variable "aws_vpc_cidr_block" {
-  type = "string"
-
-  description = <<EOF
-Block of IP addresses used by the VPC.
-This should not overlap with any other networks, such as a private datacenter connected via Direct Connect.
-EOF
-}
-
 variable "aws_extra_tags" {
   type = "map"
 

data/data/config.tf

@@ -2,6 +2,14 @@ terraform {
   required_version = ">= 0.10.7"
 }
 
+variable "machine_cidr" {
+  type = "string"
+
+  description = <<EOF
+The IP address space from which to assign machine IPs.
+EOF
+}
+
 variable "master_count" {
   type    = "string"
   default = "1"

data/data/libvirt/main.tf

@@ -39,7 +39,7 @@ resource "libvirt_network" "net" {
   domain = "${var.base_domain}"
 
   addresses = [
-    "${var.libvirt_ip_range}",
+    "${var.machine_cidr}",
   ]
 
   dns = [{

data/data/libvirt/variables-libvirt.tf

@@ -13,11 +13,6 @@ variable "libvirt_network_if" {
   description = "The name of the bridge to use"
 }
 
-variable "libvirt_ip_range" {
-  type        = "string"
-  description = "IP range for the libvirt machines"
-}
-
 variable "os_image" {
   type        = "string"
   description = "The URL of the OS disk image"

data/data/openstack/main.tf

@@ -70,7 +70,7 @@ module "masters" {
 module "topology" {
   source = "./topology"
 
-  cidr_block                 = "${var.openstack_network_cidr_block}"
+  cidr_block                 = "${var.machine_cidr}"
   cluster_id                 = "${var.cluster_id}"
   cluster_name               = "${var.cluster_name}"
   external_master_subnet_ids = "${compact(var.openstack_external_master_subnet_ids)}"

data/data/openstack/variables-openstack.tf

@@ -243,12 +243,3 @@ variable "openstack_region" {
   type        = "string"
   description = "The target OpenStack region for the cluster."
 }
-
-variable "openstack_network_cidr_block" {
-  type = "string"
-
-  description = <<EOF
-Block of IP addresses used by the VPC.
-This should not overlap with any other networks, such as a private datacenter connected via Direct Connect.
-EOF
-}

pkg/asset/installconfig/aws/aws.go

@@ -16,15 +16,10 @@ import (
 	"github.com/sirupsen/logrus"
 	survey "gopkg.in/AlecAivazis/survey.v1"
 
-	"github.com/openshift/installer/pkg/ipnet"
 	"github.com/openshift/installer/pkg/types/aws"
 	"github.com/openshift/installer/pkg/types/aws/validation"
 )
 
-var (
-	defaultVPCCIDR = ipnet.MustParseCIDR("10.0.0.0/16")
-)
-
 // Platform collects AWS-specific configuration.
 func Platform() (*aws.Platform, error) {
 	longRegions := make([]string, 0, len(validation.Regions))
@@ -86,8 +81,7 @@ func Platform() (*aws.Platform, error) {
 	}
 
 	return &aws.Platform{
-		VPCCIDRBlock: defaultVPCCIDR,
-		Region:       region,
+		Region: region,
 	}, nil
 }
 

pkg/asset/installconfig/installconfig.go

@@ -1,7 +1,6 @@
 package installconfig
 
 import (
-	"net"
 	"os"
 
 	"github.com/ghodss/yaml"
@@ -11,6 +10,7 @@ import (
 
 	netopv1 "github.com/openshift/cluster-network-operator/pkg/apis/networkoperator/v1"
 	"github.com/openshift/installer/pkg/asset"
+	"github.com/openshift/installer/pkg/asset/installconfig/libvirt"
 	"github.com/openshift/installer/pkg/ipnet"
 	"github.com/openshift/installer/pkg/types"
 	openstackvalidation "github.com/openshift/installer/pkg/types/openstack/validation"
@@ -23,7 +23,8 @@ const (
 )
 
 var (
-	defaultServiceCIDR      = parseCIDR("172.30.0.0/16")
+	defaultMachineCIDR      = ipnet.MustParseCIDR("10.0.0.0/16")
+	defaultServiceCIDR      = ipnet.MustParseCIDR("172.30.0.0/16")
 	defaultClusterCIDR      = "10.128.0.0/14"
 	defaultHostSubnetLength = 9 // equivalent to a /23 per node
 )
@@ -74,11 +75,9 @@ func (a *InstallConfig) Generate(parents asset.Parents) error {
 		SSHKey:     sshPublicKey.Key,
 		BaseDomain: baseDomain.BaseDomain,
 		Networking: types.Networking{
-			Type: "OpenshiftSDN",
-
-			ServiceCIDR: ipnet.IPNet{
-				IPNet: defaultServiceCIDR,
-			},
+			Type:        "OpenshiftSDN",
+			MachineCIDR: *defaultMachineCIDR,
+			ServiceCIDR: *defaultServiceCIDR,
 			ClusterNetworks: []netopv1.ClusterNetwork{
 				{
 					CIDR:             defaultClusterCIDR,
@@ -96,6 +95,7 @@ func (a *InstallConfig) Generate(parents asset.Parents) error {
 		a.Config.AWS = platform.AWS
 	case platform.Libvirt != nil:
 		a.Config.Libvirt = platform.Libvirt
+		a.Config.Networking.MachineCIDR = *libvirt.DefaultMachineCIDR
 		numberOfMasters = 1
 		numberOfWorkers = 1
 	case platform.None != nil:
@@ -142,11 +142,6 @@ func (a *InstallConfig) Files() []*asset.File {
 	return []*asset.File{}
 }
 
-func parseCIDR(s string) net.IPNet {
-	_, cidr, _ := net.ParseCIDR(s)
-	return *cidr
-}
-
 // Load returns the installconfig from disk.
 func (a *InstallConfig) Load(f asset.FileFetcher) (found bool, err error) {
 	file, err := fetchInstallConfigFile(f)

pkg/asset/installconfig/installconfig_test.go

@@ -13,7 +13,6 @@ import (
 
 	"github.com/openshift/installer/pkg/asset"
 	"github.com/openshift/installer/pkg/asset/mock"
-	"github.com/openshift/installer/pkg/ipnet"
 	"github.com/openshift/installer/pkg/types"
 	"github.com/openshift/installer/pkg/types/aws"
 )
@@ -27,7 +26,8 @@ func validInstallConfig() *types.InstallConfig {
 		BaseDomain: "test-domain",
 		Networking: types.Networking{
 			Type:        "OpenshiftSDN",
-			ServiceCIDR: *ipnet.MustParseCIDR("10.0.0.0/16"),
+			MachineCIDR: *defaultMachineCIDR,
+			ServiceCIDR: *defaultServiceCIDR,
 			ClusterNetworks: []netopv1.ClusterNetwork{
 				{
 					CIDR:             "192.168.1.0/24",