Fix resources isues 5

infrastructure/platform/mail/mailu-helm/scripts/deploy-mailu-prod.sh

@@ -4,11 +4,10 @@
 # =============================================================================
 # This script automates the deployment of Mailu mail server for production.
 # It handles:
-#   1. Unbound DNS deployment (for DNSSEC validation)
-#   2. CoreDNS configuration (forward to Unbound)
-#   3. TLS certificate secret creation
-#   4. Admin credentials secret creation
-#   5. Mailu Helm deployment (admin user created automatically via initialAccount)
+#   1. CoreDNS configuration with DNS-over-TLS for DNSSEC validation
+#   2. TLS certificate secret creation
+#   3. Admin credentials secret creation
+#   4. Mailu Helm deployment (admin user created automatically via initialAccount)
 #
 # Usage:
 #   ./deploy-mailu-prod.sh [--domain DOMAIN] [--admin-password PASSWORD]
@@ -99,52 +98,15 @@ fi
 print_success "Prerequisites check passed"
 
 # =============================================================================
-# Step 1: Deploy Unbound DNS Resolver
+# Step 1: Configure CoreDNS with DNS-over-TLS for DNSSEC
 # =============================================================================
-print_step "Step 1: Deploying Unbound DNS resolver..."
+print_step "Step 1: Configuring CoreDNS with DNS-over-TLS for DNSSEC validation..."
 
-if kubectl get deployment unbound -n "$NAMESPACE" &>/dev/null; then
-    print_success "Unbound already deployed"
-else
-    helm upgrade --install unbound "$MAILU_HELM_DIR/../../networking/dns/unbound-helm" \
-        -n "$NAMESPACE" \
-        -f "$MAILU_HELM_DIR/../../networking/dns/unbound-helm/values.yaml" \
-        -f "$MAILU_HELM_DIR/../../networking/dns/unbound-helm/prod/values.yaml" \
-        --timeout 5m \
-        --wait
+# Check if CoreDNS is already configured with DNS-over-TLS
+CURRENT_FORWARD=$(kubectl get configmap coredns -n kube-system -o jsonpath='{.data.Corefile}' 2>/dev/null | grep -o 'tls://1.1.1.1' || echo "")
 
-    print_success "Unbound deployed"
-fi
-
-# Wait for Unbound to be ready
-kubectl wait --for=condition=ready pod -l app.kubernetes.io/name=unbound -n "$NAMESPACE" --timeout=120s
-
-# Get Unbound service IP (dynamic resolution)
-echo "Waiting for Unbound service to get assigned IP..."
-for i in {1..30}; do
-    UNBOUND_IP=$(kubectl get svc unbound-dns -n "$NAMESPACE" -o jsonpath='{.spec.clusterIP}' 2>/dev/null || echo "")
-    if [ -n "$UNBOUND_IP" ] && [ "$UNBOUND_IP" != "<none>" ]; then
-        echo "Unbound DNS service IP: $UNBOUND_IP"
-        break
-    fi
-    if [ $i -eq 30 ]; then
-        print_error "Failed to get Unbound service IP"
-        exit 1
-    fi
-    sleep 2
-    echo "Waiting for Unbound service IP... (attempt $i/30)"
-done
-
-# =============================================================================
-# Step 2: Configure CoreDNS to Forward to Unbound
-# =============================================================================
-print_step "Step 2: Configuring CoreDNS for DNSSEC validation..."
-
-# Check current CoreDNS forward configuration
-CURRENT_FORWARD=$(kubectl get configmap coredns -n kube-system -o jsonpath='{.data.Corefile}' | grep -o 'forward \. [0-9.]*' | awk '{print $3}' || echo "")
-
-if [ "$CURRENT_FORWARD" != "$UNBOUND_IP" ]; then
-    echo "Updating CoreDNS to forward to Unbound ($UNBOUND_IP)..."
+if [ -z "$CURRENT_FORWARD" ]; then
+    echo "Updating CoreDNS to use DNS-over-TLS with Cloudflare for DNSSEC validation..."
 
     # Create a temporary file with the CoreDNS configuration
     TEMP_COREFILE=$(mktemp)
@@ -161,8 +123,9 @@ if [ "$CURRENT_FORWARD" != "$UNBOUND_IP" ]; then
        ttl 30
     }
     prometheus :9153
-    forward . $UNBOUND_IP {
-       max_concurrent 1000
+    forward . tls://1.1.1.1 tls://1.0.0.1 {
+       tls_servername cloudflare-dns.com
+       health_check 5s
     }
     cache 30 {
        disable success cluster.local
@@ -187,15 +150,19 @@ EOF
     kubectl rollout restart deployment coredns -n kube-system
     kubectl rollout status deployment coredns -n kube-system --timeout=60s
 
-    print_success "CoreDNS configured to forward to Unbound"
+    print_success "CoreDNS configured with DNS-over-TLS for DNSSEC validation"
 else
-    print_success "CoreDNS already configured for Unbound"
+    print_success "CoreDNS already configured with DNS-over-TLS"
 fi
 
+# Get CoreDNS service IP for Mailu configuration
+COREDNS_IP=$(kubectl get svc kube-dns -n kube-system -o jsonpath='{.spec.clusterIP}')
+echo "CoreDNS service IP: $COREDNS_IP"
+
 # =============================================================================
-# Step 3: Create TLS Certificate Secret
+# Step 2: Create TLS Certificate Secret
 # =============================================================================
-print_step "Step 3: Creating TLS certificate secret..."
+print_step "Step 2: Creating TLS certificate secret..."
 
 if kubectl get secret mailu-certificates -n "$NAMESPACE" &>/dev/null; then
     print_success "TLS certificate secret already exists"
@@ -217,9 +184,9 @@ else
 fi
 
 # =============================================================================
-# Step 4: Create Admin Credentials Secret
+# Step 3: Create Admin Credentials Secret
 # =============================================================================
-print_step "Step 4: Creating admin credentials secret..."
+print_step "Step 3: Creating admin credentials secret..."
 
 if kubectl get secret mailu-admin-credentials -n "$NAMESPACE" &>/dev/null; then
     print_success "Admin credentials secret already exists"
@@ -243,33 +210,28 @@ else
 fi
 
 # =============================================================================
-# Step 5: Deploy Mailu via Helm
+# Step 4: Deploy Mailu via Helm
 # =============================================================================
-print_step "Step 5: Deploying Mailu via Helm..."
+print_step "Step 4: Deploying Mailu via Helm..."
 
 # Add Mailu Helm repository
 helm repo add mailu https://mailu.github.io/helm-charts 2>/dev/null || true
 helm repo update mailu
 
-# Create temporary values file with dynamic DNS server
-TEMP_VALUES=$(mktemp)
-cat "$MAILU_HELM_DIR/values.yaml" | sed "s/# custom_dns_servers: \"\"  # Will be set dynamically by deployment script/custom_dns_servers: \"$UNBOUND_IP\"/" > "$TEMP_VALUES"
-
-# Deploy Mailu with dynamic DNS configuration
+# Deploy Mailu with CoreDNS configuration
 helm upgrade --install mailu mailu/mailu \
     -n "$NAMESPACE" \
-    -f "$TEMP_VALUES" \
+    -f "$MAILU_HELM_DIR/values.yaml" \
     -f "$MAILU_HELM_DIR/prod/values.yaml" \
+    --set global.custom_dns_servers="$COREDNS_IP" \
     --timeout 10m
 
-rm -f "$TEMP_VALUES"
-
 print_success "Mailu Helm release deployed (admin user will be created automatically)"
 
 # =============================================================================
-# Step 6: Wait for Pods to be Ready
+# Step 5: Wait for Pods to be Ready
 # =============================================================================
-print_step "Step 6: Waiting for Mailu pods to be ready..."
+print_step "Step 5: Waiting for Mailu pods to be ready..."
 
 echo "This may take 5-10 minutes (ClamAV takes time to initialize)..."
 
@@ -307,6 +269,10 @@ echo "  Webmail:     https://mail.$DOMAIN/webmail"
 echo "  SMTP:        mail.$DOMAIN:587 (STARTTLS)"
 echo "  IMAP:        mail.$DOMAIN:993 (SSL)"
 echo ""
+echo "DNS Configuration:"
+echo "  CoreDNS is configured with DNS-over-TLS (Cloudflare) for DNSSEC validation"
+echo "  CoreDNS IP: $COREDNS_IP"
+echo ""
 echo "Next Steps:"
 echo "  1. Configure DNS records (A, MX, SPF, DMARC)"
 echo "  2. Get DKIM key: kubectl exec -n $NAMESPACE deployment/mailu-admin -- cat /dkim/$DOMAIN.dkim.pub"