feat: add vlan option to network

Signed-off-by: Frank Yang <[email protected]>
harvester · Dec 1, 2021 · 8f0b55c · 8f0b55c
1 parent 4de332b
commit 8f0b55c
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 4 deletions.
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -35,6 +35,7 @@ type Network struct {
 	Gateway      string             `json:"gateway,omitempty"`
 	DefaultRoute bool               `json:"-"`
 	BondOptions  map[string]string  `json:"bondOptions,omitempty"`
+	VlanID       int                `json:"vlanId,omitempty"`
 }
 
 type HTTPBasicAuth struct {

diff --git a/pkg/config/cos.go b/pkg/config/cos.go
@@ -341,6 +341,9 @@ func UpdateNetworkConfig(stage *yipSchema.Stage, networks map[string]Network, ru
 		} else {
 			err = updateNIC(stage, name, &network)
 		}
+		if network.VlanID != 0 {
+			err = updateVLAN(stage, name, &network)
+		}
 		if err != nil {
 			return err
 		}
@@ -361,7 +364,7 @@ func UpdateNetworkConfig(stage *yipSchema.Stage, networks map[string]Network, ru
 	}
 
 	if run {
-		stage.Commands = append(stage.Commands, fmt.Sprintf("wicked ifreload all"))
+		stage.Commands = append(stage.Commands, "wicked ifreload all")
 
 		// in case wicked config is not changed and netconfig is not called
 		stage.Commands = append(stage.Commands, "netconfig update")
@@ -434,6 +437,29 @@ func updateBond(stage *yipSchema.Stage, name string, network *Network) error {
 	return nil
 }
 
+func updateVLAN(stage *yipSchema.Stage, name string, network *Network) error {
+	n := struct {
+		Name string
+		Network
+	}{
+		Name:    name,
+		Network: *network,
+	}
+	ifcfg, err := render("wicked-ifcfg-vlan", n)
+	if err != nil {
+		return err
+	}
+
+	stage.Files = append(stage.Files, yipSchema.File{
+		Path:        fmt.Sprintf("/etc/sysconfig/network/ifcfg-vlan%d", network.VlanID),
+		Content:     ifcfg,
+		Permissions: 0600,
+		Owner:       0,
+		Group:       0,
+	})
+	return nil
+}
+
 func UpdateWifiConfig(stage *yipSchema.Stage, wifis []Wifi, run bool) error {
 	if len(wifis) == 0 {
 		return nil

diff --git a/pkg/config/templates/rancherd-10-harvester.yaml b/pkg/config/templates/rancherd-10-harvester.yaml
@@ -122,7 +122,13 @@ bootstrapResources:
         enabled: true
         {{- if .Vip }}
         config:
-          vip_interface: harvester-mgmt
+          {{- $vipInterface := "harvester-mgmt" }}
+          {{- $mgmtNetwork := (index .Networks "harvester-mgmt") }}
+          {{- if ne $mgmtNetwork.VlanID 0 }}
+            {{- $vlanStr := print "vlan" $mgmtNetwork.VlanID }}
+            {{- $vipInterface = (print $vlanStr "@harvester-mgmt") }}
+          {{- end }}
+          vip_interface: {{ $vipInterface }}
         {{- end }}
       kube-vip-cloud-provider:
         enabled: true
diff --git a/pkg/config/templates/wicked-ifcfg-bond-master b/pkg/config/templates/wicked-ifcfg-bond-master
@@ -1,7 +1,12 @@
 STARTMODE='onboot'
 BONDING_MASTER='yes'
+{{ if and (eq .Method "dhcp") (ne .VlanID 0) -}}
+BOOTPROTO='none'
+{{ else -}}
 BOOTPROTO='{{ .Method }}'
-{{ if eq .Method "static" -}}
+{{- end }}
+
+{{ if and (eq .Method "static") (eq .VlanID 0) -}}
 IPADDR={{ .IP }}
 NETMASK={{ .SubnetMask }}
 {{- end }}

diff --git a/pkg/config/templates/wicked-ifcfg-eth b/pkg/config/templates/wicked-ifcfg-eth
@@ -1,6 +1,6 @@
 STARTMODE='onboot'
 BOOTPROTO='{{ .Method }}'
-{{ if eq .Method "static" -}}
+{{ if and (eq .Method "static") (eq .VlanID 0) -}}
 IPADDR={{ .IP }}
 NETMASK={{ .SubnetMask }}
 {{- end }}
diff --git a/pkg/config/templates/wicked-ifcfg-vlan b/pkg/config/templates/wicked-ifcfg-vlan
@@ -0,0 +1,13 @@
+STARTMODE='onboot'
+BOOTPROTO='{{ .Method }}'
+ETHERDEVICE='{{ .Name }}'
+{{ if and (eq .Method "static") (ne .VlanID 0) -}}
+IPADDR={{ .IP }}
+NETMASK={{ .SubnetMask }}
+{{- end }}
+VLAN_ID='{{ .VlanID }}'
+{{ $defaultRoute := "no" -}}
+{{- if .DefaultRoute -}}
+  {{- $defaultRoute = "yes" -}}
+{{- end }}
+DHCLIENT_SET_DEFAULT_ROUTE='{{ $defaultRoute }}'
diff --git a/pkg/console/validator.go b/pkg/console/validator.go
@@ -35,6 +35,7 @@ var (
 	ErrMsgForceMBROnUEFI               = "cannot force MBR on UEFI system"
 
 	ErrMsgNetworkMethodUnknown = "unknown network method"
+	ErrMsgNetworkVLANID        = "vlan id should be 0 to 4094"
 )
 
 type ValidatorInterface interface {
@@ -201,6 +202,11 @@ func checkNetworks(networks map[string]config.Network) error {
 		default:
 			return prettyError(ErrMsgNetworkMethodUnknown, network.Method)
 		}
+
+		// vlan id 0 means no vlan setting, so it is valid.
+		if network.VlanID < 0 || network.VlanID > 4094 {
+			return errors.New(ErrMsgNetworkVLANID)
+		}
 	}
 
 	return nil