From 41f77abfc7dc315bb2fc6bb15c1154bf8c8b08a9 Mon Sep 17 00:00:00 2001
From: Qiu Jian <qiujian@yunionyun.com>
Date: Fri, 8 Dec 2023 00:37:20 +0800
Subject: [PATCH] fix: no default fallback dns server

---
 pkg/apis/compute/network_const.go | 4 ----
 pkg/compute/models/networks.go    | 4 +---
 pkg/compute/options/options.go    | 8 ++++----
 pkg/vpcagent/ovn/keeper.go        | 8 ++++----
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/pkg/apis/compute/network_const.go b/pkg/apis/compute/network_const.go
index 88737f1731..ea615c11c9 100644
--- a/pkg/apis/compute/network_const.go
+++ b/pkg/apis/compute/network_const.go
@@ -20,10 +20,6 @@ import (
 	"yunion.io/x/cloudmux/pkg/apis/compute"
 )
 
-const (
-	DefaultDNSServers = "223.5.5.5,223.6.6.6"
-)
-
 const (
 	// # DEFAULT_BANDWIDTH = options.default_bandwidth
 	MAX_BANDWIDTH = 100000
diff --git a/pkg/compute/models/networks.go b/pkg/compute/models/networks.go
index a0e81c376e..3dd0aaf45e 100644
--- a/pkg/compute/models/networks.go
+++ b/pkg/compute/models/networks.go
@@ -408,9 +408,7 @@ func (self *SNetwork) GetDNS(zoneName string) string {
 	if len(options.Options.DNSServer) > 0 {
 		return options.Options.DNSServer
 	}
-	if options.Options.EnableDefaultDNS {
-		return api.DefaultDNSServers
-	}
+
 	return ""
 }
 
diff --git a/pkg/compute/options/options.go b/pkg/compute/options/options.go
index fd00b6bbee..203255f287 100644
--- a/pkg/compute/options/options.go
+++ b/pkg/compute/options/options.go
@@ -25,10 +25,10 @@ import (
 type ComputeOptions struct {
 	PortV2 int `help:"Listening port for region V2"`
 
-	DNSServer        string   `help:"Address of DNS server"`
-	DNSDomain        string   `help:"Domain suffix for virtual servers"`
-	DNSResolvers     []string `help:"Upstream DNS resolvers"`
-	EnableDefaultDNS bool     `help:"Enable default DNS if dns server not specific" default:"true"`
+	DNSServer    string   `help:"Address of DNS server"`
+	DNSDomain    string   `help:"Domain suffix for virtual servers"`
+	DNSResolvers []string `help:"Upstream DNS resolvers"`
+	// EnableDefaultDNS bool     `help:"Enable default DNS if dns server not specific" default:"true"`
 
 	DefaultCPUOvercommitBound     float32 `default:"8.0" help:"Default cpu overcommit bound for host, default to 8"`
 	DefaultMemoryOvercommitBound  float32 `default:"1.0" help:"Default memory overcommit bound for host, default to 1"`
diff --git a/pkg/vpcagent/ovn/keeper.go b/pkg/vpcagent/ovn/keeper.go
index 83a5c9ec96..ea615df057 100644
--- a/pkg/vpcagent/ovn/keeper.go
+++ b/pkg/vpcagent/ovn/keeper.go
@@ -341,10 +341,9 @@ func (keeper *OVNNorthboundKeeper) ClaimNetwork(ctx context.Context, network *ag
 				dnsSrvs = strings.Join(dns, ",")
 			}
 		}
-		if len(dnsSrvs) == 0 {
-			dnsSrvs = apis.DefaultDNSServers
+		if len(dnsSrvs) > 0 {
+			dhcpopts.Options["dns_server"] = "{" + dnsSrvs + "}"
 		}
-		dhcpopts.Options["dns_server"] = "{" + dnsSrvs + "}"
 	}
 	{
 		ntpSrvs := ""
@@ -360,7 +359,8 @@ func (keeper *OVNNorthboundKeeper) ClaimNetwork(ctx context.Context, network *ag
 			}
 		}
 		if len(ntpSrvs) > 0 {
-			dhcpopts.Options["ntp_server"] = "{" + ntpSrvs + "}"
+			// bug on OVN, should not use ntp server
+			// dhcpopts.Options["ntp_server"] = "{" + ntpSrvs + "}"
 		}
 	}