diff --git a/values/headscale/values/values.yaml b/values/headscale/values/values.yaml index 1a7dad87..6abf58ad 100644 --- a/values/headscale/values/values.yaml +++ b/values/headscale/values/values.yaml @@ -114,8 +114,6 @@ configMaps: "helge.avlesen@oceanbox.io", "isa.rosso@oceanbox.io", "jonathan.lilly@oceanbox.io", - "erlend.mundal@oceanbox.io", - "elianne.ersdal@oceanbox.io", ], "group:manager": [ "svenn.hanssen@oceanbox.io", @@ -123,7 +121,6 @@ configMaps: "group:marketing": [ "hilde.iversen@oceanbox.io", "pal.herstad@oceanbox.io", - "martin.davidsen@oceanbox.io", ], "group:dev": [], "group:intern": [], @@ -176,6 +173,17 @@ configMaps: "100.64.0.0/10:*", ] }, + { + "action": "accept", + "src": [ + "tag:hpc", + ], + "dst": [ + "tag:hpc:22", + "tag:mumindalen:22", + "100.64.0.0/10:22", + ] + }, { "action": "accept", "src": [ "group:devops" ], @@ -198,7 +206,6 @@ configMaps: "tag:mumindalen:0", "tag:hpc:22,80,443", "dc.tos.net:22,80,443", - "autogroup:internet:*", ] }, { @@ -206,6 +213,22 @@ configMaps: "src": [ "*" ], "dst": [ "autogroup:internet:*", ] }, + { "action": "accept", "src": [ "*" ], "dst": [ "autogroup:internet:*", ] }, + { "action": "accept", "src": [ "radovan.bast@oceanbox.io", ], "dst": [ "radovan.bast@oceanbox.io:*", ] }, + { "action": "accept", "src": [ "ole.tytlandsvik@oceanbox.io" ], "dst": [ "ole.tytlandsvik@oceanbox.io:*" ] }, + { "action": "accept", "src": [ "frank.gaardsted@oceanbox.io" ], "dst": [ "frank.gaardsted@oceanbox.io:*" ] }, + { "action": "accept", "src": [ "ole.anders.nost@oceanbox.io" ], "dst": [ "ole.anders.nost@oceanbox.io:*" ] }, + { "action": "accept", "src": [ "helge.avlesen@oceanbox.io" ], "dst": [ "helge.avlesen@oceanbox.io:*" ] }, + { "action": "accept", "src": [ "isa.rosso@oceanbox.io" ], "dst": [ "isa.rosso@oceanbox.io:*" ] }, + { "action": "accept", "src": [ "jonathan.lilly@oceanbox.io" ], "dst": [ "jonathan.lilly@oceanbox.io:*" ] }, + { "action": "accept", "src": [ "jonas.juselius@oceanbox.io" ], "dst": [ "jonas.juselius@oceanbox.io:*" ] }, + { "action": "accept", "src": [ "Moritz.Jorg@oceanbox.io" ], "dst": [ "Moritz.Jorg@oceanbox.io:*" ] }, + { "action": "accept", "src": [ "simen.kirkvik@oceanbox.io" ], "dst": [ "simen.kirkvik@oceanbox.io:*" ] }, + { "action": "accept", "src": [ "stig.r.jensen@oceanbox.io" ], "dst": [ "stig.r.jensen@oceanbox.io:*" ] }, + { "action": "accept", "src": [ "svenn.hanssen@oceanbox.io" ], "dst": [ "svenn.hanssen@oceanbox.io:*" ] }, + { "action": "accept", "src": [ "hilde.iversen@oceanbox.io" ], "dst": [ "hilde.iversen@oceanbox.io:*" ] }, + { "action": "accept", "src": [ "pal.herstad@oceanbox.io" ], "dst": [ "pal.herstad@oceanbox.io:*" ] }, + // s/"\([^"]*\)"/{ "action": "accept", "src": [ "\1" ], "dst": [ "\1:*" ] }, ] } dns: @@ -260,18 +283,18 @@ configMaps: { "name": "alertmanager.ob-ceph.local", "type": "A", "value": "10.255.241.10" }, { "name": "hubble.ob-ceph.local", "type": "A", "value": "10.255.241.10" }, - { "name": "dashboard.ceph.tos.local", "type": "A", "value": "10.255.241.10" }, - { "name": "grafana.ceph.tos.local", "type": "A", "value": "10.255.241.10" }, - { "name": "s3.ceph.tos.local", "type": "A", "value": "10.255.241.10" }, - { "name": "prometheus.ceph.tos.local", "type": "A", "value": "10.255.241.10" }, - { "name": "alertmanager.ceph.tos.local", "type": "A", "value": "10.255.241.10" }, - { "name": "hubble.ceph.tos.local", "type": "A", "value": "10.255.241.10" }, + { "name": "dashboard.ceph.tos.obx", "type": "A", "value": "10.255.241.10" }, + { "name": "grafana.ceph.tos.obx", "type": "A", "value": "10.255.241.10" }, + { "name": "s3.ceph.tos.obx", "type": "A", "value": "10.255.241.10" }, + { "name": "prometheus.ceph.tos.obx", "type": "A", "value": "10.255.241.10" }, + { "name": "alertmanager.ceph.tos.obx", "type": "A", "value": "10.255.241.10" }, + { "name": "hubble.ceph.tos.obx", "type": "A", "value": "10.255.241.10" }, - { "name": "dashboard.ceph.vtn.local", "type": "A", "value": "172.16.239.50" }, - { "name": "grafana.ceph.vtn.local", "type": "A", "value": "172.16.239.50" }, - { "name": "prometheus.ceph.vtn.local", "type": "A", "value": "172.16.239.50" }, - { "name": "alertmanager.ceph.vtn.local", "type": "A", "value": "172.16.239.50" }, - { "name": "hubble.ceph.vtn.local", "type": "A", "value": "172.16.239.50" }, + { "name": "dashboard.ceph.vtn.obx", "type": "A", "value": "172.16.239.50" }, + { "name": "grafana.ceph.vtn.obx", "type": "A", "value": "172.16.239.50" }, + { "name": "prometheus.ceph.vtn.obx", "type": "A", "value": "172.16.239.50" }, + { "name": "alertmanager.ceph.vtn.obx", "type": "A", "value": "172.16.239.50" }, + { "name": "hubble.ceph.vtn.obx", "type": "A", "value": "172.16.239.50" }, { "name": "jonas-atlantis.dev.oceanbox.io", "type": "A", "value": "10.255.241.11" }, { "name": "jonas-sorcerer.ekman.oceanbox.io", "type": "A", "value": "10.255.241.99" },