Multi cluster support #2

tusharmndr · 2024-11-25T04:14:59Z

Migrate all Data access to data manager
Support to read multi drove cluster under a namespace
Reload all cluster config

santanusinha · 2024-11-25T06:05:27Z

src/datamanager.go

+
+	for _, data := range dm.namespaces {
+		for appId, appData := range data.Apps {
+			allApps[appId] = appData


If multiple namespaces contain same app (possible if multiple clusters have same deployment), this will overwrite

santanusinha · 2024-11-25T06:06:27Z

src/datamanager.go

+		"namespace": namespace,
+		"apps":      dm.namespaces[namespace].Apps,
+		"time":      dm.namespaces[namespace].Timestamp,
+	}).Info("UpdateApps successfully")


finished successfully

santanusinha · 2024-11-25T06:08:10Z

src/datamanager.go

+	logger.WithFields(logrus.Fields{
+		"operation":       operation,
+		"LastKnownVhosts": dm.LastKnownVhosts,
+	}).Info("UpdateLastKnownVhosts successfully")


fix log messages everywhere

santanusinha · 2024-11-25T06:13:01Z

src/drove.go

@@ -642,12 +750,13 @@ func reloadNginx() error {
 }

 func reload() error {
-	return reloadAllApps(false)
+	return reloadAllApps(config.DroveNamespaces[0].Name, false) //TODO: for for all namespace


finish this

santanusinha · 2024-11-25T06:14:25Z

src/nginx-header.tmpl

-    upstream {{.LeaderVHost}} {
-        server {{.Leader.Host}}:{{.Leader.Port}};
+
+    {{if and .Namespaces.stage1.LeaderVHost .Namespaces.stage1.Leader.Endpoint}}


This will lead to very large breaking change. Put in defaults for namespace if possible

santanusinha

Address comments and backwards compatibility

santanusinha · 2024-11-27T05:25:25Z

docker/docker-nixy.toml.subst

@@ -22,5 +16,10 @@ maxfailsupstream = 0
 failtimeoutupstream = "1s"
 slowstartupstream = "0s"

+# Drove API
+[[namespaces]]


santanusinha · 2024-11-27T05:37:39Z

src/drove.go

-		// a ticker channel to limit reloads to drove, 1s is enough for now.
-		ticker := time.NewTicker(1 * time.Second)
+		droveClient := newDroveClient(name)
+		ticker := time.NewTicker(time.Duration(droveClient.eventRefreshInterval) * time.Second)


Use a default value if not provided in config

santanusinha · 2024-11-27T05:40:39Z

src/drove.go

-			}()
-		}
-	}()
+	}


The eventqueue is removed? what if reload takes more than 5 secs?

santanusinha · 2024-11-27T05:41:56Z

src/nixy.go

@@ -51,43 +50,44 @@ type Vhosts struct {
 	Vhosts map[string]bool
 }

+type DroveNamespace struct {
+	Name        string   `json:"-" toml:"name"`


This needs to be mandatory

santanusinha · 2024-11-27T05:43:46Z

src/nixy.go

-	select {
-	case eventqueue <- true: // Add reload to our queue channel, unless it is full of course.
+	}).Info("Reload triggered")
+	queued := forceReload()


The event queue was present to ensure that reload always happens only from one thread.

Done, just renamed

santanusinha · 2024-11-27T05:44:43Z

src/nixy.toml

+drove = ["https://localhost:8080"] # add all HA cluster nodes in priority order.
+user = "" # leave empty if no auth is required.
+pass = ""
+access_token = "O-Bearer "


santanusinha · 2024-11-27T05:44:51Z

src/nixy.toml

+drove = ["https://localhost:8080"] # add all HA cluster nodes in priority order.
+user = "" # leave empty if no auth is required.
+pass = ""
+access_token = "O-Bearer "


santanusinha · 2024-11-27T05:47:16Z

src/reload.go

+	Namespaces          map[string]NamespaceRenderingData `json:"namespaces"`
+}
+
+func reload() error {


Maybe we expose a channel / queue here to receive a signal for reload.

nginx-plus: merge fix with master for changes related to new upstreams

fix earlier merge error

added fix for ngnix plus

initial commit to move data to datamanager

7c3c736

tusharmndr marked this pull request as draft November 25, 2024 04:15

tusharmndr added 2 commits November 25, 2024 11:33

bug fix in lastKnowHosts

278b937

bug fix in lastKnowHosts

15a0d5f

santanusinha approved these changes Nov 25, 2024

View reviewed changes

santanusinha requested changes Nov 25, 2024

View reviewed changes

tusharmndr added 8 commits November 25, 2024 14:05

added drove client

7842cab

added refersh elaspe time

627044f

fixed template for 2 drove controller read

ef17979

added stats per namespace

36b374d

fixed http client

c424351

code review fix: log fix

4453f92

fixed reload logic

f648fd2

change templates for docker

0d86623

santanusinha requested changes Nov 27, 2024

View reviewed changes

tusharmndr added 4 commits November 27, 2024 17:15

added name in enviornment variable for docekr

0dfeca8

fixed logging

5ed4a16

code review fixes

dbabd3a

merging app if vhostname matches across differetn drove cluster

8e43c8f

tusharmndr force-pushed the multi_cluster branch from 4bdd515 to 8e43c8f Compare December 6, 2024 04:46

tusharmndr added 2 commits December 6, 2024 10:17

nil check in merging apps

2679c76

code review fix

2894a4e

tusharmndr marked this pull request as ready for review December 6, 2024 04:50

vishnunaini added the test_pending label Dec 24, 2024

vishnunaini and others added 6 commits December 25, 2024 04:41

nginx-plus: use upstream client as-is and add version check

7d58fb1

Merge branch 'master' into multi_cluster

5785966

merge fix

61782ab

fix merge comment

427773e

Merge pull request #1 from vishnunaini/multi_cluster

f4f8ecc

nginx-plus: merge fix with master for changes related to new upstreams

fix merge comment

afa0080

tusharmndr and others added 4 commits December 27, 2024 13:51

Merge pull request #2 from vishnunaini/multi_cluster

6a51036

fix earlier merge error

added fix for nixy plus

a65fc96

Merge pull request #3 from tusharmndr/multi_cluster_v2

f9ee13c

added fix for ngnix plus

bug fix

1715cfa

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Multi cluster support #2

Multi cluster support #2

tusharmndr commented Nov 25, 2024 •

edited

Loading

santanusinha Nov 25, 2024

tusharmndr Dec 5, 2024

santanusinha Nov 25, 2024

tusharmndr Nov 25, 2024

santanusinha Nov 25, 2024

tusharmndr Nov 25, 2024

santanusinha Nov 25, 2024

tusharmndr Nov 25, 2024

santanusinha Nov 25, 2024

tusharmndr Dec 5, 2024

santanusinha left a comment

santanusinha Nov 27, 2024

tusharmndr Nov 27, 2024

santanusinha Nov 27, 2024

tusharmndr Dec 5, 2024

santanusinha Nov 27, 2024

tusharmndr Dec 5, 2024

santanusinha Nov 27, 2024

tusharmndr Dec 5, 2024

santanusinha Nov 27, 2024

tusharmndr Dec 5, 2024

santanusinha Nov 27, 2024

tusharmndr Dec 5, 2024

santanusinha Nov 27, 2024

tusharmndr Dec 5, 2024

santanusinha Nov 27, 2024

tusharmndr Dec 5, 2024

Multi cluster support #2

Are you sure you want to change the base?

Multi cluster support #2

Conversation

tusharmndr commented Nov 25, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

santanusinha left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tusharmndr commented Nov 25, 2024 •

edited

Loading