Add new infra architecture 13

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

@@ -119,9 +119,21 @@ 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
-UNBOUND_IP=$(kubectl get svc unbound-dns -n "$NAMESPACE" -o jsonpath='{.spec.clusterIP}')
-echo "Unbound DNS service IP: $UNBOUND_IP"
+# 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
@@ -134,12 +146,43 @@ CURRENT_FORWARD=$(kubectl get configmap coredns -n kube-system -o jsonpath='{.da
 if [ "$CURRENT_FORWARD" != "$UNBOUND_IP" ]; then
     echo "Updating CoreDNS to forward to Unbound ($UNBOUND_IP)..."
 
+    # Create a temporary file with the CoreDNS configuration
+    TEMP_COREFILE=$(mktemp)
+    cat > "$TEMP_COREFILE" <<EOF
+.:53 {
+    errors
+    health {
+       lameduck 5s
+    }
+    ready
+    kubernetes cluster.local in-addr.arpa ip6.arpa {
+       pods insecure
+       fallthrough in-addr.arpa ip6.arpa
+       ttl 30
+    }
+    prometheus :9153
+    forward . $UNBOUND_IP {
+       max_concurrent 1000
+    }
+    cache 30 {
+       disable success cluster.local
+       disable denial cluster.local
+    }
+    loop
+    reload
+    loadbalance
+}
+EOF
+
+    # Apply the configuration
     kubectl patch configmap coredns -n kube-system --type merge -p "{
       \"data\": {
-        \"Corefile\": \".:53 {\\n    errors\\n    health {\\n       lameduck 5s\\n    }\\n    ready\\n    kubernetes cluster.local in-addr.arpa ip6.arpa {\\n       pods insecure\\n       fallthrough in-addr.arpa ip6.arpa\\n       ttl 30\\n    }\\n    prometheus :9153\\n    forward . $UNBOUND_IP {\\n       max_concurrent 1000\\n    }\\n    cache 30 {\\n       disable success cluster.local\\n       disable denial cluster.local\\n    }\\n    loop\\n    reload\\n    loadbalance\\n}\\n\"
+        \"Corefile\": \"$(cat "$TEMP_COREFILE" | sed 's/\\/\\\\/g' | sed ':a;N;$!ba;s/\n/\\\\n/g')\"
       }
     }"
 
+    rm -f "$TEMP_COREFILE"
+
     # Restart CoreDNS
     kubectl rollout restart deployment coredns -n kube-system
     kubectl rollout status deployment coredns -n kube-system --timeout=60s
@@ -208,13 +251,19 @@ print_step "Step 5: Deploying Mailu via Helm..."
 helm repo add mailu https://mailu.github.io/helm-charts 2>/dev/null || true
 helm repo update mailu
 
-# Deploy 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
 helm upgrade --install mailu mailu/mailu \
     -n "$NAMESPACE" \
-    -f "$MAILU_HELM_DIR/values.yaml" \
+    -f "$TEMP_VALUES" \
     -f "$MAILU_HELM_DIR/prod/values.yaml" \
     --timeout 10m
 
+rm -f "$TEMP_VALUES"
+
 print_success "Mailu Helm release deployed (admin user will be created automatically)"
 
 # =============================================================================