support for r:

RunOnFlux · Nov 23, 2023 · 1c7c210 · 1c7c210
1 parent 21c77e2
commit 1c7c210
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 1 deletion.
diff --git a/src/services/domainService.js b/src/services/domainService.js
@@ -219,7 +219,7 @@ async function generateAndReplaceMainApplicationHaproxyConfig() {
       }
     }
     // continue with appsOK
-    const configuredApps = []; // object of domain, port, ips for backend
+    const configuredApps = []; // object of domain, port, ips for backend and isRdata
     for (const app of appsOK) {
       log.info(`Configuring ${app.name}`);
       // eslint-disable-next-line no-await-in-loop
@@ -248,6 +248,9 @@ async function generateAndReplaceMainApplicationHaproxyConfig() {
               ips: appIps,
               ...customConfigs[i],
             };
+            if (app.containerData.includes('r:')) {
+              configuredApp.isRdata = true;
+            }
             configuredApps.push(configuredApp);
             if (app.domains[i]) {
               const portDomains = app.domains[i].split(',');
@@ -277,6 +280,9 @@ async function generateAndReplaceMainApplicationHaproxyConfig() {
                       ips: appIps,
                       ...customConfigs[i],
                     };
+                    if (app.containerData.includes('r:')) {
+                      configuredAppCustom.isRdata = true;
+                    }
                     configuredApps.push(configuredAppCustom);
                   }
                   const wwwAdjustedDomain = `www.${portDomain.toLowerCase()}`;
@@ -291,6 +297,9 @@ async function generateAndReplaceMainApplicationHaproxyConfig() {
                         ips: appIps,
                         ...customConfigs[i],
                       };
+                      if (app.containerData.includes('r:')) {
+                        configuredAppCustom.isRdata = true;
+                      }
                       configuredApps.push(configuredAppCustom);
                     }
                   }
@@ -307,6 +316,9 @@ async function generateAndReplaceMainApplicationHaproxyConfig() {
                         ips: appIps,
                         ...customConfigs[i],
                       };
+                      if (app.containerData.includes('r:')) {
+                        configuredAppCustom.isRdata = true;
+                      }
                       configuredApps.push(configuredAppCustom);
                     }
                   }
@@ -322,6 +334,9 @@ async function generateAndReplaceMainApplicationHaproxyConfig() {
             ips: appIps,
             ...customConfigs[customConfigs.length - 1],
           };
+          if (app.containerData.includes('r:')) {
+            mainApp.isRdata = true;
+          }
           configuredApps.push(mainApp);
         } else {
           let j = 0;
@@ -335,6 +350,9 @@ async function generateAndReplaceMainApplicationHaproxyConfig() {
                 ips: appIps,
                 ...customConfigs[j],
               };
+              if (component.containerData.includes('r:')) {
+                configuredApp.isRdata = true;
+              }
               configuredApps.push(configuredApp);
               const portDomains = component.domains[i].split(',');
               // eslint-disable-next-line no-loop-func
@@ -364,6 +382,9 @@ async function generateAndReplaceMainApplicationHaproxyConfig() {
                         ips: appIps,
                         ...customConfigs[j],
                       };
+                      if (component.containerData.includes('r:')) {
+                        configuredAppCustom.isRdata = true;
+                      }
                       configuredApps.push(configuredAppCustom);
                     }
 
@@ -379,6 +400,9 @@ async function generateAndReplaceMainApplicationHaproxyConfig() {
                           ips: appIps,
                           ...customConfigs[j],
                         };
+                        if (component.containerData.includes('r:')) {
+                          configuredAppCustom.isRdata = true;
+                        }
                         configuredApps.push(configuredAppCustom);
                       }
                     }
@@ -395,6 +419,9 @@ async function generateAndReplaceMainApplicationHaproxyConfig() {
                           ips: appIps,
                           ...customConfigs[j],
                         };
+                        if (component.containerData.includes('r:')) {
+                          configuredAppCustom.isRdata = true;
+                        }
                         configuredApps.push(configuredAppCustom);
                       }
                     }
@@ -417,6 +444,9 @@ async function generateAndReplaceMainApplicationHaproxyConfig() {
                   ips: appIps,
                   ...customConfigs[customConfigs.length - 1],
                 };
+                if (app.compose[q].containerData.includes('r:')) {
+                  mainApp.isRdata = true;
+                }
                 configuredApps.push(mainApp);
               }
             }

diff --git a/src/services/haproxyTemplate.js b/src/services/haproxyTemplate.js
@@ -6,6 +6,8 @@ const log = require('../lib/log');
 const { cmdAsync, TEMP_HAPROXY_CONFIG, HAPROXY_CONFIG } = require('./constants');
 const { matchRule } = require('./serviceHelper');
 
+const mapOfNamesIps = {};
+
 const haproxyPrefix = `
 global
   maxconn 50000
@@ -219,6 +221,20 @@ backend ${domainUsed}backend
     } else {
       domainBackend += `\n  server ${ip.split(':')[0]}:${apiPort} ${ip.split(':')[0]}:${app.port} check ${app.serverConfig}${cookieConfig}`;
     }
+    if (app.isRdata) {
+      if (mapOfNamesIps[app.name] && app.ips.includse(mapOfNamesIps[app.name])) { // use this ip as a main
+        if (mapOfNamesIps[app.name] === ip) {
+          // for the main IP use
+          domainBackend += ' inter 10s fall 3 rise 99999999';
+        } else {
+          // for other IP configure them as backup
+          domainBackend += ' backup';
+        }
+      } else { // set new IP as main
+        mapOfNamesIps[app.name] = ip;
+        domainBackend += ' inter 10s fall 3 rise 99999999';
+      }
+    }
     if (app.timeout) {
       domainBackend += `\n  timeout server ${app.timeout}`;
     }