Fix resources isues 5
This commit is contained in:
@@ -1,38 +0,0 @@
|
||||
# CoreDNS ConfigMap patch to forward external DNS queries to Unbound for DNSSEC validation
|
||||
# This is required for Mailu Admin which requires DNSSEC-validating DNS resolver
|
||||
#
|
||||
# Apply with: kubectl apply -f coredns-unbound-patch.yaml
|
||||
# Then restart CoreDNS: kubectl rollout restart deployment coredns -n kube-system
|
||||
#
|
||||
# Note: The Unbound service IP (10.104.127.213) may change when the cluster is recreated.
|
||||
# The setup script will automatically update this based on the actual Unbound service IP.
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: coredns
|
||||
namespace: kube-system
|
||||
data:
|
||||
Corefile: |
|
||||
.: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_SERVICE_IP {
|
||||
max_concurrent 1000
|
||||
}
|
||||
cache 30 {
|
||||
disable success cluster.local
|
||||
disable denial cluster.local
|
||||
}
|
||||
loop
|
||||
reload
|
||||
loadbalance
|
||||
}
|
||||
@@ -1,34 +1,19 @@
|
||||
# Development-tuned Mailu configuration
|
||||
global:
|
||||
# Using Unbound DNS for DNSSEC validation (required by Mailu admin)
|
||||
# This value is dynamically set via --set during helm install:
|
||||
# UNBOUND_IP=$(kubectl get svc unbound-dns -n bakery-ia -o jsonpath='{.spec.clusterIP}')
|
||||
# helm upgrade --install mailu ... --set global.custom_dns_servers="$UNBOUND_IP"
|
||||
# Default fallback to Kubernetes DNS (will be overridden by --set)
|
||||
custom_dns_servers: "10.96.0.10" # Override with Unbound IP via --set
|
||||
# Using Kubernetes CoreDNS for DNS resolution
|
||||
# CoreDNS is configured with DNS-over-TLS (Cloudflare) for DNSSEC validation
|
||||
# Default to Kubernetes DNS IP (will be overridden dynamically if needed)
|
||||
custom_dns_servers: "10.96.0.10" # Kubernetes DNS IP
|
||||
|
||||
# Redis configuration - use built-in Mailu Redis (no authentication needed)
|
||||
externalRedis:
|
||||
enabled: false
|
||||
|
||||
# Component-specific DNS configuration
|
||||
# Admin requires DNSSEC validation - use Unbound DNS (forwards cluster.local to kube-dns)
|
||||
# NOTE: dnsConfig.nameservers is dynamically set via --set during helm install
|
||||
# DNS configuration - use Kubernetes DNS (ClusterFirst)
|
||||
# CoreDNS provides DNSSEC validation via DNS-over-TLS to Cloudflare
|
||||
admin:
|
||||
dnsPolicy: "None"
|
||||
dnsConfig:
|
||||
nameservers:
|
||||
- "10.96.0.10" # Override with Unbound IP via --set admin.dnsConfig.nameservers[0]
|
||||
searches:
|
||||
- "bakery-ia.svc.cluster.local"
|
||||
- "svc.cluster.local"
|
||||
- "cluster.local"
|
||||
options:
|
||||
- name: ndots
|
||||
value: "5"
|
||||
dnsPolicy: "ClusterFirst"
|
||||
|
||||
# RSPAMD needs Unbound for DNSSEC validation (DKIM/SPF/DMARC checks)
|
||||
# Using ClusterFirst with search domains + Kubernetes DNS which can forward to Unbound
|
||||
rspamd:
|
||||
dnsPolicy: "ClusterFirst"
|
||||
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
# Production-tuned Mailu configuration
|
||||
global:
|
||||
# Using Kubernetes cluster DNS for name resolution
|
||||
custom_dns_servers: "10.96.0.10" # Kubernetes cluster DNS IP
|
||||
# Using Kubernetes CoreDNS for DNS resolution
|
||||
# CoreDNS is configured with DNS-over-TLS (Cloudflare) for DNSSEC validation
|
||||
custom_dns_servers: "10.152.183.10" # MicroK8s CoreDNS IP
|
||||
|
||||
# Redis configuration - use built-in Mailu Redis (no authentication needed for internal)
|
||||
externalRedis:
|
||||
enabled: false
|
||||
|
||||
# DNS configuration for production
|
||||
# Use Kubernetes DNS (ClusterFirst) which forwards to Unbound via CoreDNS
|
||||
# This is configured automatically by the mailu-helm Tilt resource
|
||||
# Use Kubernetes DNS (ClusterFirst) - CoreDNS provides DNSSEC via DNS-over-TLS
|
||||
admin:
|
||||
dnsPolicy: "ClusterFirst"
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -3,16 +3,13 @@
|
||||
# Phase 7: Deploy Optional Services - Fixed Version
|
||||
# =============================================================================
|
||||
# This script deploys the optional services for production:
|
||||
# 1. Unbound DNS (with dynamic IP resolution)
|
||||
# 2. CoreDNS configuration for DNSSEC
|
||||
# 3. Mailu Email Server
|
||||
# 4. SigNoz Monitoring
|
||||
# 1. CoreDNS configuration with DNS-over-TLS for DNSSEC validation
|
||||
# 2. Mailu Email Server
|
||||
# 3. SigNoz Monitoring
|
||||
#
|
||||
# Fixed issues:
|
||||
# - Removed static ClusterIP that caused CIDR range conflicts
|
||||
# - Implemented dynamic IP resolution for Unbound DNS
|
||||
# - Updated CoreDNS patching to use dynamic IP
|
||||
# - Updated Mailu configuration to use dynamic DNS server
|
||||
# DNS Architecture:
|
||||
# - CoreDNS uses DNS-over-TLS with Cloudflare (1.1.1.1) for DNSSEC validation
|
||||
# - Mailu uses CoreDNS for DNS resolution (internal K8s + external DNSSEC)
|
||||
# =============================================================================
|
||||
|
||||
set -e
|
||||
@@ -40,49 +37,15 @@ print_success() {
|
||||
}
|
||||
|
||||
# =============================================================================
|
||||
# Step 7.1: Deploy Unbound DNS (with dynamic IP)
|
||||
# Step 7.1: Configure CoreDNS with DNS-over-TLS for DNSSEC
|
||||
# =============================================================================
|
||||
print_step "Step 7.1: Deploying Unbound DNS resolver (dynamic IP)..."
|
||||
print_step "Step 7.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 infrastructure/platform/networking/dns/unbound-helm \
|
||||
-n "$NAMESPACE" \
|
||||
-f infrastructure/platform/networking/dns/unbound-helm/values.yaml \
|
||||
-f infrastructure/platform/networking/dns/unbound-helm/prod/values.yaml \
|
||||
--timeout 5m \
|
||||
--wait
|
||||
|
||||
print_success "Unbound deployed"
|
||||
fi
|
||||
# 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 "")
|
||||
|
||||
# Wait for Unbound service to get assigned IP
|
||||
print_step "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 7.2: Configure CoreDNS for DNSSEC (dynamic IP)
|
||||
# =============================================================================
|
||||
print_step "Step 7.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..."
|
||||
|
||||
# Create a temporary file with the CoreDNS configuration
|
||||
TEMP_COREFILE=$(mktemp)
|
||||
@@ -99,8 +62,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
|
||||
@@ -125,33 +89,32 @@ 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"
|
||||
else
|
||||
print_success "CoreDNS already configured for Unbound"
|
||||
print_success "CoreDNS already configured with DNS-over-TLS"
|
||||
fi
|
||||
|
||||
# Get CoreDNS service IP
|
||||
COREDNS_IP=$(kubectl get svc kube-dns -n kube-system -o jsonpath='{.spec.clusterIP}')
|
||||
echo "CoreDNS service IP: $COREDNS_IP"
|
||||
|
||||
# =============================================================================
|
||||
# Step 7.3: Deploy Mailu Email Server (dynamic DNS)
|
||||
# Step 7.2: Deploy Mailu Email Server
|
||||
# =============================================================================
|
||||
print_step "Step 7.3: Deploying Mailu Email Server..."
|
||||
print_step "Step 7.2: Deploying Mailu Email Server..."
|
||||
|
||||
# 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 infrastructure/platform/mail/mailu-helm/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 infrastructure/platform/mail/mailu-helm/values.yaml \
|
||||
-f infrastructure/platform/mail/mailu-helm/prod/values.yaml \
|
||||
--set global.custom_dns_servers="$COREDNS_IP" \
|
||||
--timeout 10m
|
||||
|
||||
rm -f "$TEMP_VALUES"
|
||||
|
||||
print_success "Mailu Helm release deployed"
|
||||
|
||||
# Wait for Mailu pods to be ready
|
||||
@@ -165,9 +128,9 @@ kubectl wait --for=condition=ready pod -l app.kubernetes.io/component=admin -n "
|
||||
print_success "Mailu deployment completed"
|
||||
|
||||
# =============================================================================
|
||||
# Step 7.4: Deploy SigNoz Monitoring
|
||||
# Step 7.3: Deploy SigNoz Monitoring
|
||||
# =============================================================================
|
||||
print_step "Step 7.4: Deploying SigNoz Monitoring..."
|
||||
print_step "Step 7.3: Deploying SigNoz Monitoring..."
|
||||
|
||||
# Add SigNoz Helm repository
|
||||
helm repo add signoz https://charts.signoz.io 2>/dev/null || true
|
||||
@@ -196,9 +159,8 @@ echo -e "${GREEN}Phase 7 Deployment Complete!${NC}"
|
||||
echo "=============================================="
|
||||
echo ""
|
||||
echo "Deployed Services:"
|
||||
echo " ✓ Unbound DNS (IP: $UNBOUND_IP)"
|
||||
echo " ✓ CoreDNS (configured for DNSSEC)"
|
||||
echo " ✓ Mailu Email Server"
|
||||
echo " ✓ CoreDNS (configured with DNS-over-TLS for DNSSEC)"
|
||||
echo " ✓ Mailu Email Server (using CoreDNS IP: $COREDNS_IP)"
|
||||
echo " ✓ SigNoz Monitoring"
|
||||
echo ""
|
||||
echo "Next Steps:"
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
|
||||
# Global DNS configuration for DNSSEC validation
|
||||
global:
|
||||
# Using Unbound DNS resolver directly for DNSSEC validation
|
||||
# Unbound service is available at unbound-dns.bakery-ia.svc.cluster.local
|
||||
# Using Kubernetes CoreDNS with DNS-over-TLS for DNSSEC validation
|
||||
# CoreDNS is configured to forward external queries to Cloudflare (tls://1.1.1.1)
|
||||
# DNS server IP will be dynamically resolved during deployment
|
||||
# custom_dns_servers: "" # Will be set dynamically by deployment script
|
||||
|
||||
@@ -230,6 +230,5 @@ networkPolicy:
|
||||
|
||||
# DNS Policy Configuration
|
||||
# Use Kubernetes DNS (ClusterFirst) for internal service resolution
|
||||
# DNSSEC validation for email is handled by rspamd component
|
||||
# Note: For production with DNSSEC needs, configure CoreDNS to forward to Unbound
|
||||
# DNSSEC validation is provided by CoreDNS with DNS-over-TLS (Cloudflare)
|
||||
dnsPolicy: "ClusterFirst"
|
||||
@@ -1,18 +0,0 @@
|
||||
apiVersion: v2
|
||||
name: unbound
|
||||
description: A Helm chart for deploying Unbound DNS resolver for Bakery-IA
|
||||
type: application
|
||||
version: 0.1.0
|
||||
appVersion: "1.19.1"
|
||||
maintainers:
|
||||
- name: Bakery-IA Team
|
||||
email: devops@bakery-ia.com
|
||||
keywords:
|
||||
- dns
|
||||
- resolver
|
||||
- caching
|
||||
- unbound
|
||||
home: https://www.nlnetlabs.nl/projects/unbound/
|
||||
sources:
|
||||
- https://github.com/NLnetLabs/unbound
|
||||
- https://hub.docker.com/r/mvance/unbound
|
||||
@@ -1,64 +0,0 @@
|
||||
# Development values for unbound DNS resolver
|
||||
# Using same configuration as production for consistency
|
||||
|
||||
# Use official image for development (same as production)
|
||||
image:
|
||||
repository: "mvance/unbound"
|
||||
tag: "latest"
|
||||
pullPolicy: "IfNotPresent"
|
||||
|
||||
# Resource settings (slightly lower than production for dev)
|
||||
resources:
|
||||
requests:
|
||||
cpu: "100m"
|
||||
memory: "128Mi"
|
||||
limits:
|
||||
cpu: "300m"
|
||||
memory: "384Mi"
|
||||
|
||||
# Single replica for development (can be scaled if needed)
|
||||
replicaCount: 1
|
||||
|
||||
# Development annotations
|
||||
podAnnotations:
|
||||
environment: "development"
|
||||
managed-by: "helm"
|
||||
|
||||
# Probe settings (same as production but slightly faster)
|
||||
probes:
|
||||
readiness:
|
||||
initialDelaySeconds: 10
|
||||
periodSeconds: 30
|
||||
command: "drill @127.0.0.1 -p 53 example.org || echo 'DNS query test'"
|
||||
liveness:
|
||||
initialDelaySeconds: 30
|
||||
periodSeconds: 60
|
||||
command: "drill @127.0.0.1 -p 53 example.org || echo 'DNS query test'"
|
||||
|
||||
# Custom Unbound forward records for Kubernetes DNS
|
||||
config:
|
||||
enabled: true
|
||||
# The mvance/unbound image includes forward-records.conf
|
||||
# We need to add Kubernetes-specific forwarding zones
|
||||
forwardRecords: |
|
||||
# Forward all queries to Cloudflare with DNSSEC (catch-all)
|
||||
forward-zone:
|
||||
name: "."
|
||||
forward-tls-upstream: yes
|
||||
forward-addr: 1.1.1.1@853#cloudflare-dns.com
|
||||
forward-addr: 1.0.0.1@853#cloudflare-dns.com
|
||||
|
||||
# Additional server config to mark cluster.local as insecure (no DNSSEC)
|
||||
# and use stub zones for Kubernetes internal DNS (more reliable than forward)
|
||||
serverConfig: |
|
||||
domain-insecure: "cluster.local."
|
||||
private-domain: "cluster.local."
|
||||
local-zone: "10.in-addr.arpa." nodefault
|
||||
|
||||
stub-zone:
|
||||
name: "cluster.local."
|
||||
stub-addr: 10.96.0.10
|
||||
|
||||
stub-zone:
|
||||
name: "10.in-addr.arpa."
|
||||
stub-addr: 10.96.0.10
|
||||
@@ -1,130 +0,0 @@
|
||||
# Production-specific values for unbound DNS resolver
|
||||
# Overrides for the production environment
|
||||
#
|
||||
# ARCHITECTURE NOTE:
|
||||
# Unbound provides DNSSEC validation required by Mailu (rspamd for DKIM/SPF/DMARC).
|
||||
# CoreDNS does NOT support DNSSEC, so we need Unbound as a dedicated resolver.
|
||||
#
|
||||
# Two deployment options:
|
||||
# 1. Mailu-only: Only Mailu pods use Unbound (via dnsPolicy: None)
|
||||
# - CoreDNS forwards to public DNS (8.8.8.8, 1.1.1.1)
|
||||
# - Lower resource usage, simpler architecture
|
||||
#
|
||||
# 2. Cluster-wide: CoreDNS forwards ALL external queries to Unbound
|
||||
# - All pods get DNSSEC validation
|
||||
# - Higher resource usage, single point of failure for DNS
|
||||
|
||||
# Use official image for production
|
||||
image:
|
||||
repository: "mvance/unbound"
|
||||
tag: "latest"
|
||||
pullPolicy: "IfNotPresent"
|
||||
|
||||
# Production resource settings - MINIMAL for single-node clusters
|
||||
# Unbound is very lightweight - DNS queries use minimal CPU
|
||||
resources:
|
||||
requests:
|
||||
cpu: "50m"
|
||||
memory: "64Mi"
|
||||
limits:
|
||||
cpu: "200m"
|
||||
memory: "256Mi"
|
||||
|
||||
# Single replica for single-node clusters (saves resources)
|
||||
# Increase to 2 for multi-node HA deployments
|
||||
replicaCount: 1
|
||||
|
||||
# Production annotations
|
||||
podAnnotations:
|
||||
environment: "production"
|
||||
critical: "true"
|
||||
|
||||
# Anti-affinity disabled for single-node clusters
|
||||
# Uncomment for multi-node HA deployments
|
||||
# affinity:
|
||||
# podAntiAffinity:
|
||||
# preferredDuringSchedulingIgnoredDuringExecution:
|
||||
# - weight: 100
|
||||
# podAffinityTerm:
|
||||
# labelSelector:
|
||||
# matchExpressions:
|
||||
# - key: app.kubernetes.io/name
|
||||
# operator: In
|
||||
# values:
|
||||
# - unbound
|
||||
# topologyKey: "kubernetes.io/hostname"
|
||||
|
||||
# Production probe settings (more conservative)
|
||||
# NOTE: mvance/unbound image does NOT have 'nc' (netcat), use 'drill' instead
|
||||
probes:
|
||||
readiness:
|
||||
initialDelaySeconds: 10
|
||||
periodSeconds: 30
|
||||
command: "drill @127.0.0.1 localhost || exit 1"
|
||||
liveness:
|
||||
initialDelaySeconds: 30
|
||||
periodSeconds: 60
|
||||
command: "drill @127.0.0.1 localhost || exit 1"
|
||||
|
||||
# Custom unbound configuration to forward internal Kubernetes zones to CoreDNS
|
||||
config:
|
||||
enabled: true
|
||||
content: |
|
||||
server:
|
||||
interface: 0.0.0.0
|
||||
port: 53
|
||||
do-ip4: yes
|
||||
do-ip6: no
|
||||
do-udp: yes
|
||||
do-tcp: yes
|
||||
|
||||
# Access control - allow all private networks
|
||||
access-control: 10.0.0.0/8 allow
|
||||
access-control: 172.16.0.0/12 allow
|
||||
access-control: 192.168.0.0/16 allow
|
||||
access-control: 127.0.0.0/8 allow
|
||||
|
||||
# DNSSEC validation (required for Mailu)
|
||||
auto-trust-anchor-file: "/opt/unbound/etc/unbound/root.key"
|
||||
|
||||
# Performance tuning
|
||||
num-threads: 2
|
||||
msg-cache-size: 32m
|
||||
rrset-cache-size: 64m
|
||||
cache-min-ttl: 60
|
||||
cache-max-ttl: 86400
|
||||
|
||||
# Logging
|
||||
verbosity: 1
|
||||
log-queries: no
|
||||
log-replies: no
|
||||
|
||||
# Private addresses - don't send to upstream
|
||||
private-address: 10.0.0.0/8
|
||||
private-address: 172.16.0.0/12
|
||||
private-address: 192.168.0.0/16
|
||||
|
||||
# Forward Kubernetes internal zones to CoreDNS (10.152.183.10 for MicroK8s)
|
||||
forward-zone:
|
||||
name: "cluster.local."
|
||||
forward-addr: 10.152.183.10
|
||||
|
||||
forward-zone:
|
||||
name: "svc.cluster.local."
|
||||
forward-addr: 10.152.183.10
|
||||
|
||||
forward-zone:
|
||||
name: "bakery-ia.svc.cluster.local."
|
||||
forward-addr: 10.152.183.10
|
||||
|
||||
# Forward in-addr.arpa for reverse DNS lookups within cluster
|
||||
forward-zone:
|
||||
name: "in-addr.arpa."
|
||||
forward-addr: 10.152.183.10
|
||||
|
||||
# Forward all other queries to upstream DNS with DNSSEC
|
||||
forward-zone:
|
||||
name: "."
|
||||
forward-tls-upstream: yes
|
||||
forward-addr: 1.1.1.1@853#cloudflare-dns.com
|
||||
forward-addr: 8.8.8.8@853#dns.google
|
||||
@@ -1,63 +0,0 @@
|
||||
{{/*
|
||||
Expand the name of the chart.
|
||||
*/}}
|
||||
{{- define "unbound.name" -}}
|
||||
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
|
||||
{{- end -}}
|
||||
|
||||
{{/*
|
||||
Create a default fully qualified app name.
|
||||
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
|
||||
*/}}
|
||||
{{- define "unbound.fullname" -}}
|
||||
{{- if .Values.fullnameOverride -}}
|
||||
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
|
||||
{{- else -}}
|
||||
{{- $name := default .Chart.Name .Values.nameOverride -}}
|
||||
{{- if contains $name .Release.Name -}}
|
||||
{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
|
||||
{{- else -}}
|
||||
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
|
||||
{{/*
|
||||
Create chart name and version as used by the chart label.
|
||||
*/}}
|
||||
{{- define "unbound.chart" -}}
|
||||
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
|
||||
{{- end -}}
|
||||
|
||||
{{/*
|
||||
Common labels
|
||||
*/}}
|
||||
{{- define "unbound.labels" -}}
|
||||
helm.sh/chart: {{ include "unbound.chart" . }}
|
||||
{{ include "unbound.selectorLabels" . }}
|
||||
{{- if .Chart.AppVersion }}
|
||||
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
|
||||
{{- end }}
|
||||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||
{{- end -}}
|
||||
|
||||
{{/*
|
||||
Selector labels
|
||||
*/}}
|
||||
{{- define "unbound.selectorLabels" -}}
|
||||
app.kubernetes.io/name: {{ include "unbound.name" . }}
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
app.kubernetes.io/component: dns
|
||||
app.kubernetes.io/part-of: bakery-ia
|
||||
{{- end -}}
|
||||
|
||||
{{/*
|
||||
Create the name of the service account to use
|
||||
*/}}
|
||||
{{- define "unbound.serviceAccountName" -}}
|
||||
{{- if .Values.serviceAccount.create -}}
|
||||
{{ default (include "unbound.fullname" .) .Values.serviceAccount.name }}
|
||||
{{- else -}}
|
||||
{{ default "default" .Values.serviceAccount.name }}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
@@ -1,22 +0,0 @@
|
||||
{{- if .Values.config.enabled }}
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: {{ include "unbound.fullname" . }}-config
|
||||
namespace: {{ .Values.global.namespace }}
|
||||
labels:
|
||||
{{- include "unbound.labels" . | nindent 4 }}
|
||||
data:
|
||||
{{- if .Values.config.forwardRecords }}
|
||||
forward-records.conf: |
|
||||
{{ .Values.config.forwardRecords | indent 4 }}
|
||||
{{- end }}
|
||||
{{- if .Values.config.serverConfig }}
|
||||
a-records.conf: |
|
||||
{{ .Values.config.serverConfig | indent 4 }}
|
||||
{{- end }}
|
||||
{{- if .Values.config.content }}
|
||||
unbound.conf: |
|
||||
{{ .Values.config.content | indent 4 }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
@@ -1,117 +0,0 @@
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: {{ include "unbound.fullname" . }}
|
||||
namespace: {{ .Values.global.namespace }}
|
||||
labels:
|
||||
{{- include "unbound.labels" . | nindent 4 }}
|
||||
spec:
|
||||
replicas: {{ .Values.replicaCount }}
|
||||
selector:
|
||||
matchLabels:
|
||||
{{- include "unbound.selectorLabels" . | nindent 6 }}
|
||||
template:
|
||||
metadata:
|
||||
{{- with .Values.podAnnotations }}
|
||||
annotations:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
labels:
|
||||
{{- include "unbound.selectorLabels" . | nindent 8 }}
|
||||
spec:
|
||||
{{- with .Values.imagePullSecrets }}
|
||||
imagePullSecrets:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
serviceAccountName: {{ include "unbound.serviceAccountName" . }}
|
||||
securityContext:
|
||||
{{- toYaml .Values.podSecurityContext | nindent 8 }}
|
||||
containers:
|
||||
- name: {{ .Chart.Name }}
|
||||
securityContext:
|
||||
{{- toYaml .Values.securityContext | nindent 12 }}
|
||||
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
|
||||
imagePullPolicy: {{ .Values.image.pullPolicy }}
|
||||
ports:
|
||||
- name: dns-udp
|
||||
containerPort: {{ .Values.service.ports.dnsUdp }}
|
||||
protocol: UDP
|
||||
- name: dns-tcp
|
||||
containerPort: {{ .Values.service.ports.dnsTcp }}
|
||||
protocol: TCP
|
||||
{{- if .Values.probes.readiness.enabled }}
|
||||
readinessProbe:
|
||||
exec:
|
||||
command:
|
||||
- sh
|
||||
- -c
|
||||
- {{ .Values.probes.readiness.command | quote }}
|
||||
initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
|
||||
periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
|
||||
{{- end }}
|
||||
{{- if .Values.probes.liveness.enabled }}
|
||||
livenessProbe:
|
||||
exec:
|
||||
command:
|
||||
- sh
|
||||
- -c
|
||||
- {{ .Values.probes.liveness.command | quote }}
|
||||
initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
|
||||
periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
|
||||
{{- end }}
|
||||
resources:
|
||||
{{- toYaml .Values.resources | nindent 12 }}
|
||||
volumeMounts:
|
||||
{{- if .Values.config.enabled }}
|
||||
{{- if .Values.config.forwardRecords }}
|
||||
- name: unbound-config
|
||||
mountPath: /opt/unbound/etc/unbound/forward-records.conf
|
||||
subPath: forward-records.conf
|
||||
{{- end }}
|
||||
{{- if .Values.config.serverConfig }}
|
||||
- name: unbound-config
|
||||
mountPath: /opt/unbound/etc/unbound/a-records.conf
|
||||
subPath: a-records.conf
|
||||
{{- end }}
|
||||
{{- if .Values.config.content }}
|
||||
- name: unbound-config
|
||||
mountPath: /opt/unbound/etc/unbound/unbound.conf
|
||||
subPath: unbound.conf
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- with .Values.volumeMounts }}
|
||||
{{- toYaml . | nindent 12 }}
|
||||
{{- end }}
|
||||
{{- with .Values.env }}
|
||||
env:
|
||||
{{- toYaml . | nindent 12 }}
|
||||
{{- end }}
|
||||
volumes:
|
||||
{{- if .Values.config.enabled }}
|
||||
- name: unbound-config
|
||||
configMap:
|
||||
name: {{ include "unbound.fullname" . }}-config
|
||||
{{- end }}
|
||||
{{- with .Values.volumes }}
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
{{- with .Values.nodeSelector }}
|
||||
nodeSelector:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
{{- with .Values.affinity }}
|
||||
affinity:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
{{- with .Values.tolerations }}
|
||||
tolerations:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
{{- with .Values.extraInitContainers }}
|
||||
initContainers:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
{{- with .Values.extraContainers }}
|
||||
containers:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
@@ -1,27 +0,0 @@
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: {{ .Values.global.dnsServiceName }}
|
||||
namespace: {{ .Values.global.namespace }}
|
||||
labels:
|
||||
{{- include "unbound.labels" . | nindent 4 }}
|
||||
{{- with .Values.serviceAnnotations }}
|
||||
annotations:
|
||||
{{- toYaml . | nindent 4 }}
|
||||
{{- end }}
|
||||
spec:
|
||||
type: {{ .Values.service.type }}
|
||||
{{- if .Values.service.clusterIP }}
|
||||
clusterIP: {{ .Values.service.clusterIP }}
|
||||
{{- end }}
|
||||
ports:
|
||||
- name: dns-udp
|
||||
port: {{ .Values.service.ports.dnsUdp }}
|
||||
targetPort: {{ .Values.service.ports.dnsUdp }}
|
||||
protocol: UDP
|
||||
- name: dns-tcp
|
||||
port: {{ .Values.service.ports.dnsTcp }}
|
||||
targetPort: {{ .Values.service.ports.dnsTcp }}
|
||||
protocol: TCP
|
||||
selector:
|
||||
{{- include "unbound.selectorLabels" . | nindent 4 }}
|
||||
@@ -1,13 +0,0 @@
|
||||
{{- if .Values.serviceAccount.create -}}
|
||||
apiVersion: v1
|
||||
kind: ServiceAccount
|
||||
metadata:
|
||||
name: {{ include "unbound.serviceAccountName" . }}
|
||||
namespace: {{ .Values.global.namespace }}
|
||||
labels:
|
||||
{{- include "unbound.labels" . | nindent 4 }}
|
||||
{{- with .Values.serviceAccount.annotations }}
|
||||
annotations:
|
||||
{{- toYaml . | nindent 4 }}
|
||||
{{- end }}
|
||||
{{- end -}}
|
||||
@@ -1,105 +0,0 @@
|
||||
# Default values for unbound DNS resolver
|
||||
# This is a YAML-formatted file.
|
||||
# Declare variables to be passed into your templates.
|
||||
#
|
||||
# PURPOSE: Provides DNSSEC validation for Mailu email server
|
||||
# CoreDNS does NOT support DNSSEC, so Unbound fills this gap.
|
||||
# Mailu's rspamd requires DNSSEC for DKIM/SPF/DMARC validation.
|
||||
|
||||
# Global settings
|
||||
global:
|
||||
# DNS service name for other services to reference
|
||||
dnsServiceName: "unbound-dns"
|
||||
namespace: "bakery-ia"
|
||||
|
||||
# Unbound image configuration
|
||||
image:
|
||||
repository: "mvance/unbound"
|
||||
tag: "latest"
|
||||
pullPolicy: "IfNotPresent"
|
||||
|
||||
# Deployment configuration
|
||||
replicaCount: 1
|
||||
|
||||
# Resource limits and requests
|
||||
# Unbound is very lightweight - these minimal resources are sufficient
|
||||
resources:
|
||||
requests:
|
||||
cpu: "25m"
|
||||
memory: "32Mi"
|
||||
limits:
|
||||
cpu: "100m"
|
||||
memory: "128Mi"
|
||||
|
||||
# Security context
|
||||
securityContext:
|
||||
capabilities:
|
||||
add: ["NET_BIND_SERVICE"]
|
||||
|
||||
# Service configuration
|
||||
service:
|
||||
type: "ClusterIP"
|
||||
# Dynamic ClusterIP - Kubernetes will assign automatically
|
||||
# clusterIP: "" # Leave empty for automatic assignment
|
||||
ports:
|
||||
dnsUdp: 53
|
||||
dnsTcp: 53
|
||||
|
||||
# Health probes configuration
|
||||
# NOTE: mvance/unbound image does NOT have 'nc' (netcat), use 'drill' instead
|
||||
probes:
|
||||
readiness:
|
||||
enabled: true
|
||||
initialDelaySeconds: 10
|
||||
periodSeconds: 30
|
||||
# Use drill (DNS lookup tool included in unbound image)
|
||||
command: "drill @127.0.0.1 localhost || exit 1"
|
||||
liveness:
|
||||
enabled: true
|
||||
initialDelaySeconds: 30
|
||||
periodSeconds: 60
|
||||
# Use drill (DNS lookup tool included in unbound image)
|
||||
command: "drill @127.0.0.1 localhost || exit 1"
|
||||
|
||||
# Additional environment variables
|
||||
env: {}
|
||||
|
||||
# Additional volume mounts
|
||||
volumeMounts: []
|
||||
|
||||
# Additional volumes
|
||||
volumes: []
|
||||
|
||||
# Node selector
|
||||
nodeSelector: {}
|
||||
|
||||
# Tolerations
|
||||
tolerations: []
|
||||
|
||||
# Affinity
|
||||
affinity: {}
|
||||
|
||||
# Pod annotations
|
||||
podAnnotations: {}
|
||||
|
||||
# Service annotations
|
||||
serviceAnnotations: {}
|
||||
|
||||
# Custom unbound configuration
|
||||
config:
|
||||
enabled: false
|
||||
|
||||
# Additional containers (sidecars)
|
||||
extraContainers: []
|
||||
|
||||
# Additional init containers
|
||||
extraInitContainers: []
|
||||
|
||||
# Service account configuration
|
||||
serviceAccount:
|
||||
create: false
|
||||
annotations: {}
|
||||
name: ""
|
||||
|
||||
# Pod security context
|
||||
podSecurityContext: {}
|
||||
Reference in New Issue
Block a user