From 74deaf991b94f4317bec7bdefc8770fd6a3eef88 Mon Sep 17 00:00:00 2001 From: yearski <39842469+yearski@users.noreply.github.com> Date: Mon, 20 Feb 2023 02:10:08 -0700 Subject: [PATCH 01/18] serverconf: remove GetPodIP orphaned by 8f72ecbaa0d72e3417e96de65bc008c7bad542e1 --- servercfg/serverconf.go | 9 --------- 1 file changed, 9 deletions(-) diff --git a/servercfg/serverconf.go b/servercfg/serverconf.go index 22126063..7c42e49a 100644 --- a/servercfg/serverconf.go +++ b/servercfg/serverconf.go @@ -167,15 +167,6 @@ func GetAPIHost() string { return serverhost } -// GetPodIP - get the pod's ip -func GetPodIP() string { - podip := "127.0.0.1" - if os.Getenv("POD_IP") != "" { - podip = os.Getenv("POD_IP") - } - return podip -} - // GetAPIPort - gets the api port func GetAPIPort() string { apiport := "8081" From ac16492b2289dca30202a50c74886fa59a33e04b Mon Sep 17 00:00:00 2001 From: yearski <39842469+yearski@users.noreply.github.com> Date: Mon, 20 Feb 2023 02:16:12 -0700 Subject: [PATCH 02/18] servercfg: remove AgentBackend --- servercfg/serverconf.go | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/servercfg/serverconf.go b/servercfg/serverconf.go index 7c42e49a..e53cf691 100644 --- a/servercfg/serverconf.go +++ b/servercfg/serverconf.go @@ -46,10 +46,6 @@ func GetServerConfig() config.ServerConfig { if IsRestBackend() { cfg.RestBackend = "on" } - cfg.AgentBackend = "off" - if IsAgentBackend() { - cfg.AgentBackend = "on" - } cfg.DNSMode = "off" if IsDNSMode() { cfg.DNSMode = "on" @@ -304,21 +300,6 @@ func IsMetricsExporter() bool { return export } -// IsAgentBackend - checks if agent backed is on or off -func IsAgentBackend() bool { - isagent := true - if os.Getenv("AGENT_BACKEND") != "" { - if os.Getenv("AGENT_BACKEND") == "off" { - isagent = false - } - } else if config.Config.Server.AgentBackend != "" { - if config.Config.Server.AgentBackend == "off" { - isagent = false - } - } - return isagent -} - // IsMessageQueueBackend - checks if message queue is on or off func IsMessageQueueBackend() bool { ismessagequeue := true From caa832c22c5e623e5b98655e183ab6ecaf2b008c Mon Sep 17 00:00:00 2001 From: yearski <39842469+yearski@users.noreply.github.com> Date: Mon, 20 Feb 2023 02:19:10 -0700 Subject: [PATCH 03/18] remove agentbackend --- config/environments/dev.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/config/environments/dev.yaml b/config/environments/dev.yaml index 4107c468..8f2ce667 100644 --- a/config/environments/dev.yaml +++ b/config/environments/dev.yaml @@ -4,7 +4,6 @@ server: masterkey: "" # defaults to 'secretkey' or MASTER_KEY (if set) allowedorigin: "" # defaults to '*' or CORS_ALLOWED_ORIGIN (if set) restbackend: "" # defaults to "on" or REST_BACKEND (if set) - agentbackend: "" # defaults to "on" or AGENT_BACKEND (if set) dnsmode: "" # defaults to "on" or DNS_MODE (if set) sqlconn: "" # defaults to "http://" or SQL_CONN (if set) disableremoteipcheck: "" # defaults to "false" or DISABLE_REMOTE_IP_CHECK (if set) From 67f5eff1818aa0d0e3211bbf74d721b54476527d Mon Sep 17 00:00:00 2001 From: yearski <39842469+yearski@users.noreply.github.com> Date: Mon, 20 Feb 2023 02:20:37 -0700 Subject: [PATCH 04/18] config: remove AgentBackend deprecated by 7152f6ccd4f048eefa106ce9927bc609b37e4429 --- config/config.go | 1 - 1 file changed, 1 deletion(-) diff --git a/config/config.go b/config/config.go index ec80aba9..30b954ba 100644 --- a/config/config.go +++ b/config/config.go @@ -42,7 +42,6 @@ type ServerConfig struct { AllowedOrigin string `yaml:"allowedorigin"` NodeID string `yaml:"nodeid"` RestBackend string `yaml:"restbackend"` - AgentBackend string `yaml:"agentbackend"` MessageQueueBackend string `yaml:"messagequeuebackend"` DNSMode string `yaml:"dnsmode"` DisableRemoteIPCheck string `yaml:"disableremoteipcheck"` From 672bb2a2931bb04b41982e9a62e0fabd0cb67f77 Mon Sep 17 00:00:00 2001 From: yearski <39842469+yearski@users.noreply.github.com> Date: Mon, 20 Feb 2023 02:22:00 -0700 Subject: [PATCH 05/18] remove agentbackend --- controllers/config/environments/dev.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/controllers/config/environments/dev.yaml b/controllers/config/environments/dev.yaml index de1101ab..2d8bb998 100644 --- a/controllers/config/environments/dev.yaml +++ b/controllers/config/environments/dev.yaml @@ -4,7 +4,6 @@ server: masterkey: "" allowedorigin: "*" restbackend: true - agentbackend: true defaultnetname: "default" defaultnetrange: "10.10.10.0/24" - createdefault: true \ No newline at end of file + createdefault: true From b7009ea14e78fbabc2ec65e102399e6e29d76114 Mon Sep 17 00:00:00 2001 From: yearski <39842469+yearski@users.noreply.github.com> Date: Mon, 20 Feb 2023 02:22:48 -0700 Subject: [PATCH 06/18] remove agentbackend --- test/config/environments/dev.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/test/config/environments/dev.yaml b/test/config/environments/dev.yaml index 079e31f9..bf4f6762 100644 --- a/test/config/environments/dev.yaml +++ b/test/config/environments/dev.yaml @@ -4,7 +4,6 @@ server: masterkey: "secretkey" allowedorigin: "*" restbackend: true - agentbackend: true mongoconn: user: "mongoadmin" pass: "mongopass" From ba87d1fae73c13fa0e42bdd91ef3d1a043b1c70f Mon Sep 17 00:00:00 2001 From: yearski <39842469+yearski@users.noreply.github.com> Date: Mon, 20 Feb 2023 02:23:56 -0700 Subject: [PATCH 07/18] remove agentbackend --- dev.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/dev.yaml b/dev.yaml index 86c14f9f..4b537148 100644 --- a/dev.yaml +++ b/dev.yaml @@ -13,7 +13,6 @@ server: allowedorigin: "*" nodeid: "netmaker" restbackend: "on" - agentbackend: "on" messagequeuebackend: "on" dnsmode: "on" disableremoteipcheck: "" From 84efe5f6437f39cce8e04ed40f268aaaaa274eff Mon Sep 17 00:00:00 2001 From: yearski <39842469+yearski@users.noreply.github.com> Date: Mon, 20 Feb 2023 02:25:37 -0700 Subject: [PATCH 08/18] remove AgentBackground deprecated by 7152f6ccd4f048eefa106ce9927bc609b37e4429 --- main.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.go b/main.go index d73188d8..2a86bb29 100644 --- a/main.go +++ b/main.go @@ -136,8 +136,8 @@ func startControllers() { go runMessageQueue(&waitnetwork) } - if !servercfg.IsAgentBackend() && !servercfg.IsRestBackend() && !servercfg.IsMessageQueueBackend() { - logger.Log(0, "No Server Mode selected, so nothing is being served! Set Agent mode (AGENT_BACKEND) or Rest mode (REST_BACKEND) or MessageQueue (MESSAGEQUEUE_BACKEND) to 'true'.") + if !servercfg.IsRestBackend() && !servercfg.IsMessageQueueBackend() { + logger.Log(0, "No Server Mode selected, so nothing is being served! Set Rest mode (REST_BACKEND) or MessageQueue (MESSAGEQUEUE_BACKEND) to 'true'.") } // starts the stun server From 4748cca4c1efca4805850b0dc5e9f0625ab2db47 Mon Sep 17 00:00:00 2001 From: yearski <39842469+yearski@users.noreply.github.com> Date: Mon, 20 Feb 2023 02:26:47 -0700 Subject: [PATCH 09/18] remove AgentBackend --- swagger.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/swagger.yaml b/swagger.yaml index 3b03b1bf..ab0f8c50 100644 --- a/swagger.yaml +++ b/swagger.yaml @@ -565,8 +565,6 @@ definitions: type: string APIPort: type: string - AgentBackend: - type: string AllowedOrigin: type: string AuthProvider: From ac0ff1fc2ae0e41dda810173ca0d070d9192dafe Mon Sep 17 00:00:00 2001 From: yearski <39842469+yearski@users.noreply.github.com> Date: Mon, 20 Feb 2023 02:29:43 -0700 Subject: [PATCH 10/18] remove ServerCheckinInterval orphaned by 2a5405982e470c76ab54ffaa587f7f3ff63827a9 --- config/config.go | 1 - 1 file changed, 1 deletion(-) diff --git a/config/config.go b/config/config.go index 30b954ba..a23614f4 100644 --- a/config/config.go +++ b/config/config.go @@ -51,7 +51,6 @@ type ServerConfig struct { Database string `yaml:"database"` DefaultNodeLimit int32 `yaml:"defaultnodelimit"` Verbosity int32 `yaml:"verbosity"` - ServerCheckinInterval int64 `yaml:"servercheckininterval"` AuthProvider string `yaml:"authprovider"` OIDCIssuer string `yaml:"oidcissuer"` ClientID string `yaml:"clientid"` From cc46fe3a6436fc9a2f916c1a77fa7ed6b28da3f6 Mon Sep 17 00:00:00 2001 From: yearski <39842469+yearski@users.noreply.github.com> Date: Mon, 20 Feb 2023 02:31:11 -0700 Subject: [PATCH 11/18] remove ServerCheckinInterval orphaned by 2a5405982e470c76ab54ffaa587f7f3ff63827a9 --- servercfg/serverconf.go | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/servercfg/serverconf.go b/servercfg/serverconf.go index e53cf691..f7140024 100644 --- a/servercfg/serverconf.go +++ b/servercfg/serverconf.go @@ -497,18 +497,6 @@ func SetNodeID(id string) { config.Config.Server.NodeID = id } -// GetServerCheckinInterval - gets the server check-in time -func GetServerCheckinInterval() int64 { - var t = int64(5) - var envt, _ = strconv.Atoi(os.Getenv("SERVER_CHECKIN_INTERVAL")) - if envt > 0 { - t = int64(envt) - } else if config.Config.Server.ServerCheckinInterval > 0 { - t = config.Config.Server.ServerCheckinInterval - } - return t -} - // GetAuthProviderInfo = gets the oauth provider info func GetAuthProviderInfo() (pi []string) { var authProvider = "" From 854bd988910b8e4e358e06ab9915cc3cd070a88b Mon Sep 17 00:00:00 2001 From: yearski <39842469+yearski@users.noreply.github.com> Date: Mon, 20 Feb 2023 02:32:01 -0700 Subject: [PATCH 12/18] remove serverchininterval --- dev.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/dev.yaml b/dev.yaml index 4b537148..e370a0ba 100644 --- a/dev.yaml +++ b/dev.yaml @@ -23,7 +23,6 @@ server: database: "sqlite" defaultnodelimit: "" verbosity: 3 - servercheckininterval: "" authprovider: "" clientid: "" clientsecret: "" From eb552a5e0467da82daed105939fc15727f4a0592 Mon Sep 17 00:00:00 2001 From: yearski <39842469+yearski@users.noreply.github.com> Date: Mon, 20 Feb 2023 02:33:28 -0700 Subject: [PATCH 13/18] remove serverchininterval --- swagger.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/swagger.yaml b/swagger.yaml index ab0f8c50..4ffb917a 100644 --- a/swagger.yaml +++ b/swagger.yaml @@ -622,9 +622,6 @@ definitions: type: string Server: type: string - ServerCheckinInterval: - format: int64 - type: integer Telemetry: type: string Verbosity: From efa8b0e465f2f06ac138ab95b5f9032651560570 Mon Sep 17 00:00:00 2001 From: yearski <39842469+yearski@users.noreply.github.com> Date: Mon, 20 Feb 2023 02:36:29 -0700 Subject: [PATCH 14/18] remove DefaultNodeLimit originally added in c97bb95203d2e1f6b0c5b4e515d9fca7b54841bc --- config/config.go | 1 - 1 file changed, 1 deletion(-) diff --git a/config/config.go b/config/config.go index a23614f4..70868550 100644 --- a/config/config.go +++ b/config/config.go @@ -49,7 +49,6 @@ type ServerConfig struct { SQLConn string `yaml:"sqlconn"` Platform string `yaml:"platform"` Database string `yaml:"database"` - DefaultNodeLimit int32 `yaml:"defaultnodelimit"` Verbosity int32 `yaml:"verbosity"` AuthProvider string `yaml:"authprovider"` OIDCIssuer string `yaml:"oidcissuer"` From a2637b540c5df6baa78ed2b8548087bd8b3ff56e Mon Sep 17 00:00:00 2001 From: yearski <39842469+yearski@users.noreply.github.com> Date: Mon, 20 Feb 2023 02:37:45 -0700 Subject: [PATCH 15/18] remove DefaultNodeLimit originally added in c97bb95203d2e1f6b0c5b4e515d9fca7b54841bc --- servercfg/serverconf.go | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/servercfg/serverconf.go b/servercfg/serverconf.go index f7140024..3005f307 100644 --- a/servercfg/serverconf.go +++ b/servercfg/serverconf.go @@ -185,19 +185,6 @@ func GetStunAddr() string { return stunAddr } -// GetDefaultNodeLimit - get node limit if one is set -func GetDefaultNodeLimit() int32 { - var limit int32 - limit = 999999999 - envlimit, err := strconv.Atoi(os.Getenv("DEFAULT_NODE_LIMIT")) - if err == nil && envlimit != 0 { - limit = int32(envlimit) - } else if config.Config.Server.DefaultNodeLimit != 0 { - limit = config.Config.Server.DefaultNodeLimit - } - return limit -} - // GetCoreDNSAddr - gets the core dns address func GetCoreDNSAddr() string { addr, _ := GetPublicIP() From 774270e08dcd45e4cca3dfd6d3d5f9a86bd81ce2 Mon Sep 17 00:00:00 2001 From: yearski <39842469+yearski@users.noreply.github.com> Date: Mon, 20 Feb 2023 02:38:51 -0700 Subject: [PATCH 16/18] remove DefaultNodeLimit --- dev.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/dev.yaml b/dev.yaml index e370a0ba..f25513ba 100644 --- a/dev.yaml +++ b/dev.yaml @@ -21,7 +21,6 @@ server: sqlconn: "" platform: "" database: "sqlite" - defaultnodelimit: "" verbosity: 3 authprovider: "" clientid: "" From 2f5d68589e0b075dfa4b2f134ce5bdce01b9693c Mon Sep 17 00:00:00 2001 From: yearski <39842469+yearski@users.noreply.github.com> Date: Mon, 20 Feb 2023 02:39:31 -0700 Subject: [PATCH 17/18] remove DefaultNodeLimit --- swagger.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/swagger.yaml b/swagger.yaml index 4ffb917a..657e1d59 100644 --- a/swagger.yaml +++ b/swagger.yaml @@ -583,9 +583,6 @@ definitions: type: string Database: type: string - DefaultNodeLimit: - format: int32 - type: integer DisableRemoteIPCheck: type: string DisplayKeys: From f7ed4bba2b5183e00f3457703c2f1e6e7da910dd Mon Sep 17 00:00:00 2001 From: yearski <39842469+yearski@users.noreply.github.com> Date: Mon, 20 Feb 2023 09:09:26 -0700 Subject: [PATCH 18/18] remove grpc parameters --- dev.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dev.yaml b/dev.yaml index f25513ba..b1046a93 100644 --- a/dev.yaml +++ b/dev.yaml @@ -3,10 +3,6 @@ server: apiconn: "api.ping.clustercat.com:443" apihost: "" apiport: "8081" - grpcconn: "grpc.ping.clustercat.com:443" - grpchost: "" - grpcport: "50051" - grpcsecure: "on" mqhost: "localhost" masterkey: "secretkey" dnskey: ""