Add ipv4/ipv6 subdomain ingress and bump to 1.2.0

Amp-Thread-ID: https://ampcode.com/threads/T-019c086d-c760-779d-b740-0f748094b62a
Co-authored-by: Amp <amp@ampcode.com>

4 files changed, 29 insertions, 3 deletions

diff --git a/f3s/ipv6test/helm-chart/templates/deployment.yaml b/f3s/ipv6test/helm-chart/templates/deployment.yaml
index d8aa36f..06ffde1 100644
--- a/f3s/ipv6test/helm-chart/templates/deployment.yaml
+++ b/f3s/ipv6test/helm-chart/templates/deployment.yaml
@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: ipv6test
-        image: registry.lan.buetow.org:30001/ipv6test:1.1.0
+        image: registry.lan.buetow.org:30001/ipv6test:1.2.0
         ports:
         - containerPort: 80
         resources:
diff --git a/f3s/ipv6test/helm-chart/templates/ingress.yaml b/f3s/ipv6test/helm-chart/templates/ingress.yaml
index bb0890a..7c3f0c1 100644
--- a/f3s/ipv6test/helm-chart/templates/ingress.yaml
+++ b/f3s/ipv6test/helm-chart/templates/ingress.yaml
@@ -18,3 +18,23 @@ spec:
                 name: ipv6test-service
                 port:
                   number: 80
+    - host: ipv4.ipv6test.f3s.buetow.org
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: ipv6test-service
+                port:
+                  number: 80
+    - host: ipv6.ipv6test.f3s.buetow.org
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: ipv6test-service
+                port:
+                  number: 80
diff --git a/frontends/Rexfile b/frontends/Rexfile
index d4e662a..b10df7e 100644
--- a/frontends/Rexfile
+++ b/frontends/Rexfile
@@ -74,7 +74,7 @@ our $secrets = sub { read_file './secrets/' . shift };
 
 # k3s cluster running on FreeBSD in my LAN
 our @f3s_hosts =
-  qw/f3s.buetow.org git.f3s.buetow.org cgit.f3s.buetow.org immich.f3s.buetow.org argocd.f3s.buetow.org keybr.f3s.buetow.org anki.f3s.buetow.org bag.f3s.buetow.org flux.f3s.buetow.org audiobookshelf.f3s.buetow.org grafana.f3s.buetow.org radicale.f3s.buetow.org vault.f3s.buetow.org syncthing.f3s.buetow.org uprecords.f3s.buetow.org koreader.f3s.buetow.org filebrowser.f3s.buetow.org webdav.f3s.buetow.org ipv6test.f3s.buetow.org/;
+  qw/f3s.buetow.org git.f3s.buetow.org cgit.f3s.buetow.org immich.f3s.buetow.org argocd.f3s.buetow.org keybr.f3s.buetow.org anki.f3s.buetow.org bag.f3s.buetow.org flux.f3s.buetow.org audiobookshelf.f3s.buetow.org grafana.f3s.buetow.org radicale.f3s.buetow.org vault.f3s.buetow.org syncthing.f3s.buetow.org uprecords.f3s.buetow.org koreader.f3s.buetow.org filebrowser.f3s.buetow.org webdav.f3s.buetow.org ipv6test.f3s.buetow.org ipv4.ipv6test.f3s.buetow.org ipv6.ipv6test.f3s.buetow.org/;
 
 # optionally, only enable manually for temp time, as no password protection yet
 # push @f3s_hosts, 'registry.f3s.buetow.org';
@@ -82,7 +82,7 @@ our @f3s_hosts =
 our @dns_zones        = qw/buetow.org dtail.dev foo.zone irregular.ninja snonux.foo/;
 our @dns_zones_remove = qw/paul.cyou/;
 our @acme_hosts =
-  qw/buetow.org git.buetow.org paul.buetow.org dory.buetow.org ecat.buetow.org fotos.buetow.org znc.buetow.org dtail.dev foo.zone stats.foo.zone irregular.ninja alt.irregular.ninja snonux.foo gogios.buetow.org blowfish.buetow.org fishfinger.buetow.org f3s.buetow.org git.f3s.buetow.org cgit.f3s.buetow.org immich.f3s.buetow.org argocd.f3s.buetow.org keybr.f3s.buetow.org anki.f3s.buetow.org bag.f3s.buetow.org flux.f3s.buetow.org audiobookshelf.f3s.buetow.org grafana.f3s.buetow.org radicale.f3s.buetow.org vault.f3s.buetow.org syncthing.f3s.buetow.org uprecords.f3s.buetow.org koreader.f3s.buetow.org filebrowser.f3s.buetow.org webdav.f3s.buetow.org ipv6test.f3s.buetow.org/;
+  qw/buetow.org git.buetow.org paul.buetow.org dory.buetow.org ecat.buetow.org fotos.buetow.org znc.buetow.org dtail.dev foo.zone stats.foo.zone irregular.ninja alt.irregular.ninja snonux.foo gogios.buetow.org blowfish.buetow.org fishfinger.buetow.org f3s.buetow.org git.f3s.buetow.org cgit.f3s.buetow.org immich.f3s.buetow.org argocd.f3s.buetow.org keybr.f3s.buetow.org anki.f3s.buetow.org bag.f3s.buetow.org flux.f3s.buetow.org audiobookshelf.f3s.buetow.org grafana.f3s.buetow.org radicale.f3s.buetow.org vault.f3s.buetow.org syncthing.f3s.buetow.org uprecords.f3s.buetow.org koreader.f3s.buetow.org filebrowser.f3s.buetow.org webdav.f3s.buetow.org ipv6test.f3s.buetow.org ipv4.ipv6test.f3s.buetow.org ipv6.ipv6test.f3s.buetow.org/;
 
 # WireGuard IP addresses for ping checks
 our %wg0_ips = (
diff --git a/frontends/var/nsd/zones/master/buetow.org.zone.tpl b/frontends/var/nsd/zones/master/buetow.org.zone.tpl
index 5ae4c08..27f5bc9 100644
--- a/frontends/var/nsd/zones/master/buetow.org.zone.tpl
+++ b/frontends/var/nsd/zones/master/buetow.org.zone.tpl
@@ -63,6 +63,12 @@ standby.<%= $host %>. 300 IN A <%= $ips->{current_standby}{ipv4} %> ; Enable fai
 standby.<%= $host %>. 300 IN AAAA <%= $ips->{current_standby}{ipv6} %> ; Enable failover
 <% } -%>
 
+; ipv6test stuff
+ipv4.ipv6test.f3s 300 IN A <%= $ips->{current_master}{ipv4} %> ; Enable failover
+ipv6.ipv6test.f3s 300 IN AAAA <%= $ips->{current_master}{ipv6} %> ; Enable failover
+standby.ipv4.ipv6test.f3s 300 IN A <%= $ips->{urrent_standby{ipv4} %> ; Enable failover
+standby.ipv6.ipv6test.f3s 300 IN AAAA <%= $ips->{urrent_standby{ipv6} %> ; Enable failover
+
 ; So joern can directly preview the content before rsync happens from blowfish to fishfinger
 joern IN CNAME blowfish
 www.joern IN CNAME blowfish