Merge remote-tracking branch 'origin/develop' into benvin/halb-drop-grafana

# Conflicts:
#	hieradata/country/au/region/syd1/infra/halb/haproxy2.yaml

hieradata/country/au/region/syd1/infra/halb/haproxy2.yaml

@@ -3,22 +3,7 @@ haproxy_server_k8s_syd1_traefik_internal: 'k8s-traefik-internal 198.18.200.4:443
 haproxy_server_k8s_syd1_traefik_external: 'k8s-traefik-external 198.18.199.0:443 ssl verify none check inter 2s rise 3 fall 2'
 
 profiles::haproxy::dns::ipaddr: "%{hiera('anycast_ip')}"
-profiles::haproxy::dns::vrrp_cnames:
-  - sonarr.main.unkin.net
-  - radarr.main.unkin.net
-  - lidarr.main.unkin.net
-  - readarr.main.unkin.net
-  - prowlarr.main.unkin.net
-  - nzbget.main.unkin.net
-  - git.unkin.net
-  - fafflix.unkin.net
-  - dashboard.ceph.unkin.net
-  - mail-webadmin.main.unkin.net
-  - mail-in.main.unkin.net
-  - mail.main.unkin.net
-  - autoconfig.main.unkin.net
-  - autodiscover.main.unkin.net
-  - auth.unkin.net
+profiles::haproxy::dns::vrrp_cnames: []
 
 profiles::haproxy::mappings:
   fe_http:
@@ -426,9 +411,7 @@ profiles::pki::vault::alt_names:
   - mail-webadmin.main.unkin.net
 
 # additional cnames
-profiles::haproxy::dns::cnames:
-  - au-syd1-pve.main.unkin.net
-  - au-syd1-pve-api.main.unkin.net
+profiles::haproxy::dns::cnames: []
 
 # letsencrypt certificates
 certbot::client::service: haproxy