fix: gatewaynode might be null (#1896)

(cherry picked from commit 7fae28a)
kubeovn · Sep 8, 2022 · c39d51a · c39d51a
1 parent 08331ba
commit c39d51a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/pkg/apis/kubeovn/v1/types.go b/pkg/apis/kubeovn/v1/types.go
@@ -109,7 +109,7 @@ type SubnetSpec struct {
 	Provider   string   `json:"provider,omitempty"`
 
 	GatewayType string `json:"gatewayType,omitempty"`
-	GatewayNode string `json:"gatewayNode,omitempty"`
+	GatewayNode string `json:"gatewayNode"`
 	NatOutgoing bool   `json:"natOutgoing"`
 
 	ExternalEgressGateway string `json:"externalEgressGateway,omitempty"`

diff --git a/pkg/controller/init.go b/pkg/controller/init.go
@@ -115,6 +115,7 @@ func (c *Controller) initDefaultLogicalSwitch() error {
 			Provider:    util.OvnProvider,
 			CIDRBlock:   c.config.DefaultCIDR,
 			Gateway:     c.config.DefaultGateway,
+			GatewayNode: "",
 			ExcludeIps:  strings.Split(c.config.DefaultExcludeIps, ","),
 			NatOutgoing: true,
 			GatewayType: kubeovnv1.GWDistributedType,
@@ -160,6 +161,7 @@ func (c *Controller) initNodeSwitch() error {
 			Provider:               util.OvnProvider,
 			CIDRBlock:              c.config.NodeSwitchCIDR,
 			Gateway:                c.config.NodeSwitchGateway,
+			GatewayNode:            "",
 			ExcludeIps:             strings.Split(c.config.NodeSwitchGateway, ","),
 			Protocol:               util.CheckProtocol(c.config.NodeSwitchCIDR),
 			DisableInterConnection: true,