From eb20c579bd1a52d02cf2afb9d5e4ba7ec2174144 Mon Sep 17 00:00:00 2001 From: Simon Marsh Date: Sun, 26 Jan 2025 09:25:59 +0000 Subject: [PATCH] na cluster changes --- domains/030-burble.dn42.js | 32 ++++++++++++++++---------------- dynamic/virtual.js | 16 +++++++++++++--- 2 files changed, 29 insertions(+), 19 deletions(-) diff --git a/domains/030-burble.dn42.js b/domains/030-burble.dn42.js index ffb2734..3960077 100644 --- a/domains/030-burble.dn42.js +++ b/domains/030-burble.dn42.js @@ -44,11 +44,9 @@ host('shell.us-ash1', 'fd42:4242:2601:1017:72ef:f1ff:febb:d521', '172.20.129. host('shell.fr-rbx1', 'fd42:4242:2601:1006:72ef:f1ff:febb:d521', '172.20.129.23') host('shell.de-fra2', 'fd42:4242:2601:100b:72ef:f1ff:febb:d521', '172.20.129.24') host('shell.uk-lon1', 'fd42:4242:2601:1015:72ef:f1ff:febb:d521', '172.20.129.25') -host('shell.fr-par1', 'fd42:4242:2601:1016:216:3eff:fe01:2f1f', '172.20.129.28') host('shell.us-nyc2', 'fd42:4242:2601:101d:72ef:f1ff:febb:d521', '172.20.129.26') host('shell.us-lax2', 'fd42:4242:2601:1018:72ef:f1ff:febb:d521', '172.20.129.27') - // shell aliases D_EXTEND( domain, @@ -89,31 +87,33 @@ D_EXTEND( domain, // global anycast - CNAME('wiki', 'traefik.burble.dn42.'), CNAME('explorer', 'traefik.burble.dn42.'), - CNAME('clicker', 'traefik.burble.dn42.'), CNAME('anycast', 'traefik.burble.dn42.'), - CNAME('invidious', 'traefik.burble.dn42.'), - CNAME('grafana', 'traefik.burble.dn42.'), + CNAME('clicker', 'traefik.burble.dn42.'), CNAME('glass', 'traefik.burble.dn42.'), CNAME('lg', 'traefik.burble.dn42.'), - CNAME('lounge', 'traefik.burble.dn42.'), - CNAME('paste', 'traefik.burble.dn42.'), - CNAME('whoami', 'traefik.burble.dn42.'), - CNAME('minio', 'traefik-eu.burble.dn42.'), - CNAME('s3', 'traefik.burble.dn42.'), CNAME('acme', 'traefik.burble.dn42.'), - CNAME('svc', 'traefik.burble.dn42.'), CNAME('speedtest', 'traefik.burble.dn42.'), - // eu services + // eu specific services + CNAME('wiki', 'traefik-eu.burble.dn42.'), + CNAME('invidious', 'traefik-eu.burble.dn42.'), + CNAME('grafana', 'traefik-eu.burble.dn42.'), + CNAME('lounge', 'traefik-eu.burble.dn42.'), + CNAME('paste', 'traefik-eu.burble.dn42.'), + CNAME('whoami', 'traefik-eu.burble.dn42.'), + CNAME('minio', 'traefik-eu.burble.dn42.'), + CNAME('s3', 'traefik-eu.burble.dn42.'), + CNAME('svc', 'traefik-eu.burble.dn42.'), + CNAME('wiki-sync-uk-lon1', 'traefik-eu.burble.dn42.'), CNAME('wiki-sync-de-fra1', 'traefik-eu.burble.dn42.'), + CNAME('wiki-sync-fr-rbx1', 'traefik-eu.burble.dn42.'), CNAME('wiki-test', 'traefik-eu.burble.dn42.'), - // na services - CNAME('wiki-sync-us-lax1', 'traefik-na.burble.dn42.'), - CNAME('wiki-sync-us-nyc1', 'traefik-na.burble.dn42.'), + // na specific services + CNAME('wiki-sync-ca-bhs1', 'traefik-na.burble.dn42.'), + CNAME('wiki-sync-us-ash1', 'traefik-na.burble.dn42.'), // internal services CNAME('ci', 'traefik-tier2.burble.dn42.'), diff --git a/dynamic/virtual.js b/dynamic/virtual.js index 7965271..2da1143 100644 --- a/dynamic/virtual.js +++ b/dynamic/virtual.js @@ -82,7 +82,16 @@ virtual.push( // traefik // public tier1 -var traefik_v2 = [ 'fr-rbx1', 'uk-lon1', 'de-fra1', 'se-sto1' ] +var traefik_v2 = [ + 'fr-rbx1', + 'uk-lon1', + 'de-fra1', + 'se-sto1', + 'ca-bhs1', + 'us-ash1', + 'us-nyc1', + 'us-lax1' +] vgroup('traefik-v2', 1, '72e5:84ff:fee8:897c', traefik_v2) vgroup('traefik-v2', 2, '4290:5fff:fecd:eeb8', traefik_v2) @@ -99,7 +108,9 @@ vgroup('containerd', 2, 'e227:c2ff:fe6e:1548', [ 'se-sto1', 'uk-lon1', 'de-fra1', - 'de-fra2' + 'de-fra2', + 'ca-bhs1', + 'us-ash1' ]) virtual.push( @@ -146,7 +157,6 @@ vgroup('dns-edge', 0, 'd2f4:8ff:fec6:c157', [ vgroup('dns-dns64', 0, '42ef:47ff:feb6:6c44', [ 'uk-lon1', 'de-fra1', - 'de-fra2', 'fr-par1', 'fr-rbx1', 'no-trd1',