From f00e45251fbcd1f3142f8e882f6e51d1246ee572 Mon Sep 17 00:00:00 2001
From: abhishek9686 <abhi281342@gmail.com>
Date: Tue, 23 Jan 2024 18:02:15 +0530
Subject: [PATCH 1/2] don't bind coredns to publicip

---
 compose/docker-compose.yml |  1 +
 functions/local.go         | 15 ++++-----------
 logic/dns.go               | 10 ++--------
 3 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml
index b7cc16e1..3111f1f5 100644
--- a/compose/docker-compose.yml
+++ b/compose/docker-compose.yml
@@ -61,6 +61,7 @@ services:
     image: coredns/coredns:1.10.1
     command: -conf /root/dnsconfig/Corefile
     env_file: ./netmaker.env
+    restart: always
     depends_on:
       - netmaker
     volumes:
diff --git a/functions/local.go b/functions/local.go
index 0436a25b..a65bcd34 100644
--- a/functions/local.go
+++ b/functions/local.go
@@ -26,23 +26,16 @@ func SetDNSDir() error {
 		return err
 	}
 
-	_, err = os.Stat(dir + "/config/dnsconfig")
-	if os.IsNotExist(err) {
-		err = os.MkdirAll(dir+"/config/dnsconfig", 0744)
-	}
+	err = os.MkdirAll(dir+"/config/dnsconfig", 0744)
 	if err != nil {
 		logger.Log(0, "couldnt find or create /config/dnsconfig")
 		return err
 	}
 
-	_, err = os.Stat(dir + "/config/dnsconfig/Corefile")
-	if os.IsNotExist(err) {
-		err = logic.SetCorefile(".")
-		if err != nil {
-			logger.Log(0, err.Error())
-		}
+	err = logic.SetCorefile(".")
+	if err != nil {
+		logger.Log(0, err.Error())
 	}
-
 	_, err = os.Stat(dir + "/config/dnsconfig/netmaker.hosts")
 	if os.IsNotExist(err) {
 		_, err = os.Create(dir + "/config/dnsconfig/netmaker.hosts")
diff --git a/logic/dns.go b/logic/dns.go
index 314cf770..dd3450a2 100644
--- a/logic/dns.go
+++ b/logic/dns.go
@@ -11,7 +11,6 @@ import (
 	"github.com/gravitl/netmaker/database"
 	"github.com/gravitl/netmaker/logger"
 	"github.com/gravitl/netmaker/models"
-	"github.com/gravitl/netmaker/servercfg"
 	"github.com/txn2/txeh"
 )
 
@@ -159,17 +158,13 @@ func SetCorefile(domains string) error {
 		return err
 	}
 
-	_, err = os.Stat(dir + "/config/dnsconfig")
-	if os.IsNotExist(err) {
-		err = os.MkdirAll(dir+"/config/dnsconfig", 0744)
-	}
+	err = os.MkdirAll(dir+"/config/dnsconfig", 0744)
 	if err != nil {
 		logger.Log(0, "couldnt find or create /config/dnsconfig")
 		return err
 	}
 
 	corefile := domains + ` {
-	bind %s
     reload 15s
     hosts /root/dnsconfig/netmaker.hosts {
 	fallthrough	
@@ -178,8 +173,7 @@ func SetCorefile(domains string) error {
     log
 }
 `
-	corebytes := []byte(fmt.Sprintf(corefile, servercfg.GetCoreDNSAddr()))
-	err = os.WriteFile(dir+"/config/dnsconfig/Corefile", corebytes, 0644)
+	err = os.WriteFile(dir+"/config/dnsconfig/Corefile", []byte(corefile), 0644)
 	if err != nil {
 		return err
 	}

From 70f3cbc98fab34dba16ae7e37af41e7ccf303705 Mon Sep 17 00:00:00 2001
From: abhishek9686 <abhi281342@gmail.com>
Date: Tue, 23 Jan 2024 20:15:58 +0530
Subject: [PATCH 2/2] comment fallback metrics update

---
 controllers/hosts.go | 2 +-
 pro/logic/metrics.go | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/controllers/hosts.go b/controllers/hosts.go
index 6d10a6f1..dbdaac66 100644
--- a/controllers/hosts.go
+++ b/controllers/hosts.go
@@ -254,7 +254,7 @@ func hostUpdateFallback(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 	case models.UpdateMetrics:
-		mq.UpdateMetricsFallBack(hostUpdate.Node.ID.String(), hostUpdate.NewMetrics)
+		// mq.UpdateMetricsFallBack(hostUpdate.Node.ID.String(), hostUpdate.NewMetrics)
 	}
 	logic.ReturnSuccessResponse(w, r, "updated host data")
 
diff --git a/pro/logic/metrics.go b/pro/logic/metrics.go
index 77abdc87..9783d994 100644
--- a/pro/logic/metrics.go
+++ b/pro/logic/metrics.go
@@ -118,6 +118,9 @@ func updateNodeMetrics(currentNode *models.Node, newMetrics *models.Metrics) {
 			attachedClients = clients
 		}
 	}
+	if newMetrics.Connectivity == nil {
+		newMetrics.Connectivity = make(map[string]models.Metric)
+	}
 	if len(attachedClients) > 0 {
 		// associate ext clients with IDs
 		for i := range attachedClients {