Add de-nue1 and remove a bunch of dead services following nomad migration
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Simon Marsh 2023-11-23 11:45:01 +00:00
parent b3c66070dd
commit 139c07d7d2
Signed by: burble
GPG Key ID: E9B4156C1659C079
3 changed files with 14 additions and 78 deletions

View File

@ -45,16 +45,6 @@ service('traefik-tier2', 'fd42:4242:2601:acf0::70:1');
service('traefik-eu-tier2', 'fd42:4242:2601:acf0::75:1');
service('traefik-na-tier2', 'fd42:4242:2601:acf0::76:1');
// proxied services
//proxied('tasks');
//proxied('svc');
// docker services
D_EXTEND(
domain,
CNAME('drone.tier2.fr-par1', 'docker.tier2.fr-par1.burble.dn42.')
);
// nomad container services
D_EXTEND(
domain,

View File

@ -1,4 +1,8 @@
var nodes = [
// 1 has no IPv4 address
// 2 has no IPv4 address
// [ '', '', '', 'true', 3, '172.20.129.179' ],
// [ '', '', '', 'true', 4, '172.20.129.178' ],
[ 'uk-lon4', '150.107.201.44', '2a0e:dc0:5:821f::1', 'true', 5, '172.20.129.177' ],
[ 'fr-par3', '163.172.63.58', '2001:bc8:32d7:2e1::1', 'true', 6, '172.20.129.189' ],
[ 'ch-zur2', '188.244.117.218', '2a0e:dc0:6:b2de::1', 'true', 7, '172.20.129.173' ],
@ -16,7 +20,13 @@ var nodes = [
[ 'nl-ams2', '31.41.249.236', '2a07:e042:1:56::1', 'true', 20, '172.20.129.168' ],
[ 'uk-lon1', '45.91.93.104', '2a0e:dc0:5:5::1', 'true', 21, '172.20.129.187' ],
[ 'fr-par1', '51.159.194.131', '2001:bc8:1201:50d:d6ae:52ff:fecc:c97', 'true', 22, '172.20.129.188' ],
[ 'fr-par2', '51.159.97.157', '2001:bc8:1201:6:9eb6:54ff:febb:4608', 'true', 24, '172.20.129.180' ],
[ 'de-nue1', '146.19.215.249', '262:fb54:143::a0', 'true', 23, '172.20.129.181' ],
// [ '', '', '', 'true', 24, '172.20.129.180' ],
[ 'no-trd1', '217.168.87.226', '2001:678:dd0:ffff::25', 'true', 25, '172.20.129.185' ],
// 26 has no IPv4 address
// 27 has no IPv4 address
// [ '', '', '', 'true', 28, '172.20.129.183' ],
[ 'us-nyc2', '109.205.61.64', '2605:4840:2:5abe::1', 'true', 29, '172.20.129.176' ]
// [ '', '', '', 'true', 30, '172.20.129.182' ],
// [ '', '', '', 'true', 31, '172.20.129.164' ]
];

View File

@ -1,5 +1,7 @@
var virtual = [
// insert here
[ 'containerd.tier2.de-nue1', 'fd42:4242:2601:3702:9279:c8ff:fe7d:dbdd' ],
[ 'dns-edge.de-nue1', 'fd42:4242:2601:37:d2f4:8ff:fec6:c157' ],
[ 'containerd.tier2.nl-ams2', 'fd42:4242:2601:3402:9279:c8ff:fe7d:dbdd' ],
[ 'dns-edge.nl-ams2', 'fd42:4242:2601:34:d2f4:8ff:fec6:c157' ],
[ 'mail.tier2.uk-lon4', 'fd42:4242:2601:2502:216:3eff:fe68:6f6a' ],
@ -28,7 +30,6 @@ var virtual = [
[ 'traefik-t2.tier2.de-fra1', 'fd42:4242:2601:3102:8215:bff:fe36:bf00' ],
[ 'traefik-t1.tier2.us-nyc1', 'fd42:4242:2601:2902:3220:e6ff:fed9:81d9' ],
[ 'traefik-t1.tier2.us-lax1', 'fd42:4242:2601:2a02:3220:e6ff:fed9:81d9' ],
[ 'nomad.tier2.us-nyc1', 'fd42:4242:2601:2902:12cd:cfff:fece:ba47' ],
[ 'containerd.tier2.us-nyc2', 'fd42:4242:2601:3d02:9279:c8ff:fe7d:dbdd' ],
[ 'containerd.tier2.us-nyc1', 'fd42:4242:2601:2902:9279:c8ff:fe7d:dbdd' ],
[ 'containerd.tier2.us-lax1', 'fd42:4242:2601:2a02:9279:c8ff:fe7d:dbdd' ],
@ -45,17 +46,6 @@ var virtual = [
[ 'nomad.tier2.fr-par1', 'fd42:4242:2601:3602:12cd:cfff:fece:ba47' ],
[ 'nomad.tier2.ch-zur2', 'fd42:4242:2601:2702:12cd:cfff:fece:ba47' ],
[ 'nomad.tier2.de-fra1', 'fd42:4242:2601:3102:12cd:cfff:fece:ba47' ],
[ 'registry.tier2.de-fra2', 'fd42:4242:2601:2b02:216:3eff:fe36:d502' ],
[ 'envoy.de-fra1', 'fd42:4242:2601:31:c203:beff:fe96:81a2' ],
[ 'envoy.us-nyc1', 'fd42:4242:2601:29:c203:beff:fe96:81a2' ],
[ 'envoy.us-lax1', 'fd42:4242:2601:2a:c203:beff:fe96:81a2' ],
[ 'envoy.tier2.de-fra1', 'fd42:4242:2601:3102:c203:beff:fe96:81a2' ],
[ 'envoy.tier2.us-nyc1', 'fd42:4242:2601:2902:c203:beff:fe96:81a2' ],
[ 'envoy.tier2.us-lax1', 'fd42:4242:2601:2a02:c203:beff:fe96:81a2' ],
[ 'docker.tier1.us-nyc1', 'fd42:4242:2601:29:216:3eff:febc:32dd' ],
[ 'docker.tier1.us-lax1', 'fd42:4242:2601:2a:216:3eff:fef5:662b' ],
[ 'docker.tier2.us-nyc1', 'fd42:4242:2601:2902:926f:e2ff:fe66:b75e' ],
[ 'docker.tier2.us-lax1', 'fd42:4242:2601:2a02:926f:e2ff:fe66:b75e' ],
[ 'ldap-slave.us-nyc2', 'fd42:4242:2601:3d:7222:61ff:fec9:5bd0' ],
[ 'dns-edge.nl-ams1', 'fd42:4242:2601:32:d2f4:8ff:fec6:c157' ],
[ 'nats.us-nyc1', 'fd42:4242:2601:29:e2b8:99ff:febf:5a84' ],
@ -67,8 +57,6 @@ var virtual = [
[ 'collector.fr-par1', 'fd42:4242:2601:36:62e4:b9ff:fe9a:33d1' ],
[ 'nats.uk-lon1', 'fd42:4242:2601:35:e2b8:99ff:febf:5a84' ],
[ 'nats.ch-zur2', 'fd42:4242:2601:27:e2b8:99ff:febf:5a84' ],
[ 'docker.tier1.uk-lon1', 'fd42:4242:2601:35:216:3eff:fe29:1c01' ],
[ 'docker.tier2.uk-lon1', 'fd42:4242:2601:3502:926f:e2ff:fe66:b75e' ],
[ 'vault.tier2.ch-zur2', 'fd42:4242:2601:2702:b267:51ff:feed:503f' ],
[ 'dns-burble.tier2.ch-zur2', 'fd42:4242:2601:2702:d2d7:2cff:fe85:3bcc' ],
[ 'mysql.tier2.uk-lon3', 'fd42:4242:2601:3002:6291:1fff:fe63:f812' ],
@ -80,11 +68,6 @@ var virtual = [
[ 'git.tier2.uk-lon3', 'fd42:4242:2601:3002:216:3eff:fe71:dd0e' ],
[ 'borg.tier2.fr-par1', 'fd42:4242:2601:3602:216:3eff:fefb:2143' ],
[ 'borg.tier2.uk-lon2', 'fd42:4242:2601:2e02:216:3eff:fef0:fb9e' ],
[ 'gortr.us-nyc1', 'fd42:4242:2601:29:824f:ecff:fe48:36fc' ],
[ 'whois42d.us-nyc1', 'fd42:4242:2601:29:6ef1:85ff:fe3b:8aba' ],
[ 'nginx.us-nyc1', 'fd42:4242:2601:29:225f:faff:fe4e:f64c' ],
[ 'dn42regsrv.tier2.us-nyc1', 'fd42:4242:2601:2902:d227:83ff:fe59:c446' ],
[ 'rsync.tier2.us-nyc1', 'fd42:4242:2601:2902:d2df:d7ff:fe86:283c' ],
[ 'peerfinder.us-nyc1', 'fd42:4242:2601:29:7283:bfff:fe29:d7e4' ],
[ 'dns-edge.us-nyc1', 'fd42:4242:2601:29:d2f4:8ff:fec6:c157' ],
[ 'deploy.tier2.uk-lon3', 'fd42:4242:2601:3002:216:3eff:feb2:4a6b' ],
@ -92,38 +75,18 @@ var virtual = [
[ 'registry.tier2.uk-lon3', 'fd42:4242:2601:3002:216:3eff:fe40:b5f1' ],
[ 'minio.tier2.uk-lon2', 'fd42:4242:2601:2e02:4290:d7ff:feac:fd83' ],
[ 'dns-edge.uk-lon3', 'fd42:4242:2601:30:d2f4:8ff:fec6:c157' ],
[ 'cfprox.tier2.fr-par1', 'fd42:4242:2601:3602:c250:85ff:fea4:47fe' ],
[ 'borg.tier2.fr-par3', 'fd42:4242:2601:2602:216:3eff:fef1:4f77' ],
[ 'dns-edge.fr-par3', 'fd42:4242:2601:26:d2f4:8ff:fec6:c157' ],
[ 'dialup.tier2.fr-par1', 'fd42:4242:2601:3602:216:3eff:fe0b:d2b1' ],
[ 'voip-svcs.fr-par1', 'fd42:4242:2601:36:216:3eff:fe1b:9ad5' ],
[ 'ldap-admin.tier2.de-fra1', 'fd42:4242:2601:3102:216:3eff:fedc:3b7a' ],
[ 'ldap-master.tier2.de-fra1', 'fd42:4242:2601:3102:2203:43ff:feae:28bb' ],
[ 'cfprox.tier2.fr-par2', 'fd42:4242:2601:3802:216:3eff:fe34:2e2b' ],
[ 'php-apps.tier2.fr-par2', 'fd42:4242:2601:3802:72f0:dfff:fe5a:9569' ],
[ 'docker.tier2.fr-par2', 'fd42:4242:2601:3802:926f:e2ff:fe66:b75e' ],
[ 'vault.tier2.fr-par2', 'fd42:4242:2601:3802:b267:51ff:feed:503f' ],
[ 'mysql.tier2.fr-par2', 'fd42:4242:2601:3802:6291:1fff:fe63:f812' ],
[ 'deploy.tier2.fr-par2', 'fd42:4242:2601:3802:216:3eff:fe34:2e2b' ],
[ 'shell.tier2.fr-par2', 'fd42:4242:2601:3802:216:3eff:fe57:5e4b' ],
[ 'registry.tier2.fr-par2', 'fd42:4242:2601:3802:216:3eff:fedb:8011' ],
[ 'dns-edge.fr-par2', 'fd42:4242:2601:38:d2f4:8ff:fec6:c157' ],
[ 'dns-slave.tier2.us-lax1', 'fd42:4242:2601:2a02:a25e:b7ff:feea:64ed' ],
[ 'mysql.tier2.us-lax1', 'fd42:4242:2601:2a02:6291:1fff:fe63:f812' ],
[ 'mysql.tier2.fr-par1', 'fd42:4242:2601:3602:6291:1fff:fe63:f812' ],
[ 'nginx.fr-par1', 'fd42:4242:2601:36:225f:faff:fe4e:f64c' ],
[ 'vault.tier2.fr-par1', 'fd42:4242:2601:3602:b267:51ff:feed:503f' ],
[ 'docker.tier2.fr-par1', 'fd42:4242:2601:3602:926f:e2ff:fe66:b75e' ],
[ 'ldap-slave.fr-par1', 'fd42:4242:2601:36:7222:61ff:fec9:5bd0' ],
[ 'ldap-slave.us-lax1', 'fd42:4242:2601:2a:7222:61ff:fec9:5bd0' ],
[ 'shell.tier2.us-lax1', 'fd42:4242:2601:2a02:216:3eff:fec7:b8ac' ],
[ 'dn42regsrv.tier2.us-lax1', 'fd42:4242:2601:2a02:d227:83ff:fe59:c446' ],
[ 'dn42regsrv.tier2.de-fra1', 'fd42:4242:2601:3102:d227:83ff:fe59:c446' ],
[ 'dn42regsrv.tier2.ca-bhs2', 'fd42:4242:2601:2d02:d227:83ff:fe59:c446' ],
[ 'whois42d.us-lax1', 'fd42:4242:2601:2a:6ef1:85ff:fe3b:8aba' ],
[ 'rsync.tier2.us-lax1', 'fd42:4242:2601:2a02:d2df:d7ff:fe86:283c' ],
[ 'nginx.us-lax1', 'fd42:4242:2601:2a:225f:faff:fe4e:f64c' ],
[ 'gortr.us-lax1', 'fd42:4242:2601:2a:824f:ecff:fe48:36fc' ],
[ 'peerfinder.us-lax1', 'fd42:4242:2601:2a:7283:bfff:fe29:d7e4' ],
[ 'peerfinder.no-trd1', 'fd42:4242:2601:39:7283:bfff:fe29:d7e4' ],
[ 'peerfinder.ch-zur1', 'fd42:4242:2601:28:7283:bfff:fe29:d7e4' ],
@ -133,49 +96,22 @@ var virtual = [
[ 'peerfinder.uk-lon1', 'fd42:4242:2601:35:7283:bfff:fe29:d7e4' ],
[ 'dns-edge.us-lax1', 'fd42:4242:2601:2a:d2f4:8ff:fec6:c157' ],
[ 'dns-edge.fr-par1', 'fd42:4242:2601:36:d2f4:8ff:fec6:c157' ],
[ 'docker.tier1.ch-zur1', 'fd42:4242:2601:28:216:3eff:fe29:1c01' ],
[ 'docker.tier2.ch-zur1', 'fd42:4242:2601:2802:926f:e2ff:fe66:b75e' ],
[ 'docker.tier2.ca-bhs2', 'fd42:4242:2601:2d02:926f:e2ff:fe66:b75e' ],
[ 'docker.tier2.de-fra1', 'fd42:4242:2601:3102:926f:e2ff:fe66:b75e' ],
[ 'docker.tier1.fr-par1', 'fd42:4242:2601:36:216:3eff:fe29:1c01' ],
[ 'docker.tier1.ca-bhs2', 'fd42:4242:2601:2d:216:3eff:fe29:1c01' ],
[ 'docker.tier1.de-fra1', 'fd42:4242:2601:31:216:3eff:fe29:1c01' ],
[ 'dns-edge.de-fra2', 'fd42:4242:2601:2c:d2f4:8ff:fec6:c157' ],
[ 'pingotron.tier1.de-fra1', 'fd42:4242:2601:31:721d:15ff:feb3:cab6' ],
[ 'lounge.tier2.de-fra1', 'fd42:4242:2601:3102:6242:b7ff:feb9:161c' ],
[ 'dn42svcsd.tier2.de-fra1', 'fd42:4242:2601:3102:52bd:35ff:feb6:b93e' ],
[ 'dns-master.ca-bhs2', 'fd42:4242:2601:2d:2234:1aff:feed:6755' ],
[ 'cfprox.tier2.de-fra1', 'fd42:4242:2601:3102:216:3eff:fe32:d663' ],
[ 'cfprox-dn42dev.tier2.de-fra1', 'fd42:4242:2601:3102:216:3eff:fece:6542' ],
[ 'ldap-slave.ca-bhs2', 'fd42:4242:2601:2d:7222:61ff:fec9:5bd0' ],
[ 'vrenew.tier2.de-fra1', 'fd42:4242:2601:3102:f204:e6ff:fe33:89ee' ],
[ 'rsync.tier2.ca-bhs2', 'fd42:4242:2601:2d02:d2df:d7ff:fe86:283c' ],
[ 'whois42d.ca-bhs2', 'fd42:4242:2601:2d:6ef1:85ff:fe3b:8aba' ],
[ 'whois42d.de-fra1', 'fd42:4242:2601:31:6ef1:85ff:fe3b:8aba' ],
[ 'nginx.de-fra1', 'fd42:4242:2601:31:225f:faff:fe4e:f64c' ],
[ 'nginx.ca-bhs2', 'fd42:4242:2601:2d:225f:faff:fe4e:f64c' ],
[ 'vrenew.tier2.ca-bhs2', 'fd42:4242:2601:2d02:f204:e6ff:fe33:89ee' ],
[ 'dns-slave.tier2.ca-bhs2', 'fd42:4242:2601:2d02:a25e:b7ff:feea:64ed' ],
[ 'wiki.tier2.ca-bhs2', 'fd42:4242:2601:2d02:d295:9aff:fe31:914f' ],
[ 'mysql.tier2.ca-bhs2', 'fd42:4242:2601:2d02:6291:1fff:fe63:f812' ],
[ 'repo.tier2.fr-par2', 'fd42:4242:2601:3802:216:3eff:fe0d:9a9d' ],
[ 'dns-edge.ca-bhs2', 'fd42:4242:2601:2d:d2f4:8ff:fec6:c157' ],
[ 'dns-edge.ch-zur1', 'fd42:4242:2601:28:d2f4:8ff:fec6:c157' ],
[ 'dns-edge.de-fra1', 'fd42:4242:2601:31:d2f4:8ff:fec6:c157' ],
[ 'dns-edge.us-phx1', 'fd42:4242:2601:2b:d2f4:8ff:fec6:c157' ],
[ 'dns-edge.no-trd1', 'fd42:4242:2601:39:d2f4:8ff:fec6:c157' ],
[ 'php-apps.tier2.de-fra1', 'fd42:4242:2601:3102:72f0:dfff:fe5a:9569' ],
[ 'git.de-fra1', 'fd42:4242:2601:31:3246:4eff:fe04:fd8b' ],
[ 'mail-dn42dev.tier2.ca-bhs2', 'fd42:4242:2601:2d02:820c:f8ff:fe15:3ce0' ],
[ 'mail-dn42dev.tier2.de-fra1', 'fd42:4242:2601:3102:820c:f8ff:fe15:3ce0' ],
[ 'wiki.tier2.de-fra1', 'fd42:4242:2601:3102:d295:9aff:fe31:914f' ],
[ 'rsync.tier2.de-fra1', 'fd42:4242:2601:3102:d2df:d7ff:fe86:283c' ],
[ 'glass.tier2.de-fra1', 'fd42:4242:2601:3102:82a9:33ff:fec3:d33d' ],
[ 'dns-slave.tier2.de-fra1', 'fd42:4242:2601:3102:a25e:b7ff:feea:64ed' ],
[ 'mysql.tier2.de-fra1', 'fd42:4242:2601:3102:6291:1fff:fe63:f812' ],
[ 'gortr.ca-bhs2', 'fd42:4242:2601:2d:1abb:1cc2:5442:5172' ],
[ 'gortr.de-fra1', 'fd42:4242:2601:31:156c:c76c:9e76:f8ff' ],
[ 'vault.tier2.de-fra1', 'fd42:4242:2601:3102:b267:51ff:feed:503f' ],
[ 'dns-edge.uk-lon1', 'fd42:4242:2601:35:d2f4:8ff:fec6:c157' ],
[ 'borg.tier2.fr-par2', 'fd42:4242:2601:3802:216:3eff:fe45:9a99' ],
[ 'dns-edge.uk-lon1', 'fd42:4242:2601:35:d2f4:8ff:fec6:c157' ]
];