Settle on v1 setup method. Test run completed successfully from bootstrap to service setup.

- Refactor dnsmasq configuration and scripts for improved variable handling and clarity
- Updated dnsmasq configuration files to use direct variable references instead of data source functions for better readability.
- Modified setup scripts to ensure they are run from the correct environment and directory, checking for the WC_HOME variable.
- Changed paths in README and scripts to reflect the new directory structure.
- Enhanced error handling in setup scripts to provide clearer guidance on required configurations.
- Adjusted kernel and initramfs URLs in boot.ipxe to use the updated variable references.

setup/cluster/coredns/README.md

@@ -19,31 +19,27 @@ Any query for a resource in the `internal.$DOMAIN` domain will be given the IP o
 
 ## Default CoreDNS Configuration
 
-Found at: https://github.com/k3s-io/k3s/blob/master/manifests/coredns.yaml
-
-This is k3s default CoreDNS configuration, for reference:
+This is the default CoreDNS configuration, for reference:
 
 ```txt
 .:53 {
     errors
-    health
+    health { lameduck 5s }
     ready
-    kubernetes %{CLUSTER_DOMAIN}% in-addr.arpa ip6.arpa {
-      pods insecure
-      fallthrough in-addr.arpa ip6.arpa
-    }
-    hosts /etc/coredns/NodeHosts {
-      ttl 60
-      reload 15s
-      fallthrough
-    }
+    log . { class error }
     prometheus :9153
-    forward . /etc/resolv.conf
-    cache 30
+    kubernetes cluster.local in-addr.arpa ip6.arpa {
+        pods insecure
+        fallthrough in-addr.arpa ip6.arpa
+        ttl 30
+    }
+    forward . /etc/resolv.conf { max_concurrent 1000 }
+    cache 30 {
+        disable success cluster.local
+        disable denial cluster.local
+    }
     loop
     reload
     loadbalance
-    import /etc/coredns/custom/*.override
 }
-import /etc/coredns/custom/*.server
 ```

setup/cluster/coredns/install.sh

@@ -0,0 +1,37 @@
+#!/bin/bash
+set -e
+
+if [ -z "${WC_HOME}" ]; then
+    echo "Please source the wildcloud environment first. (e.g., \`source ./env.sh\`)"
+    exit 1
+fi
+
+CLUSTER_SETUP_DIR="${WC_HOME}/setup/cluster"
+COREDNS_DIR="${CLUSTER_SETUP_DIR}/coredns"
+
+echo "Setting up CoreDNS for k3s..."
+
+# Process templates with wild-compile-template-dir
+echo "Processing CoreDNS templates..."
+wild-compile-template-dir --clean ${COREDNS_DIR}/kustomize.template ${COREDNS_DIR}/kustomize
+
+# Apply the k3s-compatible custom DNS override (k3s will preserve this)
+echo "Applying CoreDNS custom override configuration..."
+kubectl apply -f "${COREDNS_DIR}/kustomize/coredns-custom-config.yaml"
+
+# Apply the LoadBalancer service for external access to CoreDNS
+echo "Applying CoreDNS service configuration..."
+kubectl apply -f "${COREDNS_DIR}/kustomize/coredns-lb-service.yaml"
+
+# Restart CoreDNS pods to apply the changes
+echo "Restarting CoreDNS pods to apply changes..."
+kubectl rollout restart deployment/coredns -n kube-system
+kubectl rollout status deployment/coredns -n kube-system
+
+echo "CoreDNS setup complete!"
+echo
+echo "To verify the installation:"
+echo "  kubectl get pods -n kube-system"
+echo "  kubectl get svc -n kube-system coredns"
+echo "  kubectl describe svc -n kube-system coredns"
+echo "  kubectl logs -n kube-system -l k8s-app=kube-dns -f"

setup/cluster/coredns/kustomize.template/coredns-custom-config.yaml

@@ -0,0 +1,28 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: coredns-custom
+  namespace: kube-system
+data:
+  # Custom server block for internal domains. All internal domains should
+  # resolve to the cluster proxy.
+  internal.server: |
+    {{ .cloud.internalDomain }} {
+      errors
+      cache 30
+      reload
+      template IN A {
+        match (.*)\.{{ .cloud.internalDomain | strings.ReplaceAll "." "\\." }}\.
+        answer "{{`{{ .Name }}`}} 60 IN A {{ .cluster.loadBalancerIp }}"
+      }
+      template IN AAAA {
+        match (.*)\.{{ .cloud.internalDomain | strings.ReplaceAll "." "\\." }}\.
+        rcode NXDOMAIN
+      }
+    }
+  # Custom override to set external resolvers.
+  external.override: |
+    forward . {{ .cloud.dns.externalResolver }} {
+      max_concurrent 1000
+    }

setup/cluster/coredns/kustomize.template/coredns-lb-service.yaml

@@ -0,0 +1,25 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: coredns-lb
+  namespace: kube-system
+  annotations:
+    metallb.universe.tf/loadBalancerIPs: "{{ .cluster.loadBalancerIp }}"
+spec:
+  type: LoadBalancer
+  ports:
+  - name: dns
+    port: 53
+    protocol: UDP
+    targetPort: 53
+  - name: dns-tcp
+    port: 53
+    protocol: TCP
+    targetPort: 53
+  - name: metrics
+    port: 9153
+    protocol: TCP
+    targetPort: 9153
+  selector:
+    k8s-app: kube-dns

setup/cluster/coredns/kustomize/coredns-custom-config.yaml

@@ -8,21 +8,21 @@ data:
   # Custom server block for internal domains. All internal domains should
   # resolve to the cluster proxy.
   internal.server: |
-    internal.cloud.payne.io {
+    internal.cloud2.payne.io {
       errors
       cache 30
       reload
       template IN A {
-        match (.*)\.internal\.cloud\.payne\.io\.
-        answer "{{ .Name }} 60 IN A 192.168.8.240"
+        match (.*)\.internal\.cloud2\.payne\.io\.
+        answer "{{ .Name }} 60 IN A 192.168.8.20"
       }
       template IN AAAA {
-        match (.*)\.internal\.cloud\.payne\.io\.
+        match (.*)\.internal\.cloud2\.payne\.io\.
         rcode NXDOMAIN
       }
     }
   # Custom override to set external resolvers.
   external.override: |
-    forward . 1.1.1.1 8.8.8.8 {
+    forward . 1.1.1.1 {
       max_concurrent 1000
     }

setup/cluster/coredns/kustomize/coredns-lb-service.yaml

@@ -5,7 +5,7 @@ metadata:
   name: coredns-lb
   namespace: kube-system
   annotations:
-    metallb.universe.tf/loadBalancerIPs: "192.168.8.241"
+    metallb.universe.tf/loadBalancerIPs: "192.168.8.20"
 spec:
   type: LoadBalancer
   ports: