Merge pull request #1966 from pixiake/master

Fix hybridnet configuration bug
kubesphere · Aug 25, 2023 · ebfde7c · ebfde7c
2 parents 38b4af8 + 74b6b72
commit ebfde7c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/cmd/kk/apis/kubekey/v1alpha2/network_types.go b/cmd/kk/apis/kubekey/v1alpha2/network_types.go
@@ -170,7 +170,7 @@ func (n *NetworkConfig) EnableMultusCNI() bool {
 // EnableIPV4POOL_NAT_OUTGOING is used to determine whether to enable CALICO_IPV4POOL_NAT_OUTGOING.
 func (c *CalicoCfg) EnableIPV4POOL_NAT_OUTGOING() bool {
 	if c.Ipv4NatOutgoing == nil {
-		return false
+		return true
 	}
 	return *c.Ipv4NatOutgoing
 }

diff --git a/cmd/kk/pkg/plugins/network/tasks.go b/cmd/kk/pkg/plugins/network/tasks.go
@@ -375,6 +375,10 @@ func (d *DeployHybridnet) Execute(runtime connector.Runtime) error {
 		cmd = fmt.Sprintf("%s --set daemon.enableNetworkPolicy=false", cmd)
 	}
 
+	if d.KubeConf.Cluster.Network.Hybridnet.DefaultNetworkType != "" {
+		cmd = fmt.Sprintf("%s --set defaultNetworkType=%s", cmd, d.KubeConf.Cluster.Network.Hybridnet.DefaultNetworkType)
+	}
+
 	if d.KubeConf.Cluster.Network.Hybridnet.PreferBGPInterfaces != "" {
 		cmd = fmt.Sprintf("%s --set daemon.preferBGPInterfaces=%s", cmd, d.KubeConf.Cluster.Network.Hybridnet.PreferBGPInterfaces)
 	}

diff --git a/cmd/kk/pkg/plugins/network/templates/hybridnet.go b/cmd/kk/pkg/plugins/network/templates/hybridnet.go
@@ -72,7 +72,7 @@ spec:
 {{- end }}
 {{- if .ExcludeIPs }}
     excludeIPs:
-{{ toYaml .ReservedIPs | indent 4 }}
+{{ toYaml .ExcludeIPs | indent 4 }}
 {{- end }}
 {{- end }}
 {{- end }}