ingress: Move zone_id to provider internal

Author: kvinwang

custom-domain/dstack-ingress/DNS_PROVIDERS.md

@@ -19,7 +19,6 @@ This guide explains how to configure dstack-ingress to work with different DNS p
 
 ### Optional Variables
 
-- `DNS_ZONE_ID` - Pre-configured zone ID (auto-detected if not provided)
 - `SET_CAA` - Enable CAA record setup (default: false)
 - `PORT` - HTTPS port (default: 443)
 - `TXT_PREFIX` - Prefix for TXT records (default: "_tapp-address")
@@ -85,7 +84,6 @@ If you're currently using the Cloudflare-only version:
 
 1. **No changes needed for Cloudflare users** - The default behavior remains Cloudflare
 2. **For other providers** - Add the `DNS_PROVIDER` environment variable and provider-specific credentials
-3. **Zone ID changes** - The variable `CLOUDFLARE_ZONE_ID` is now `DNS_ZONE_ID` (auto-detected if not set)
 
 ## Troubleshooting
 

custom-domain/dstack-ingress/scripts/dns_manager.py

@@ -1,26 +1,25 @@
 #!/usr/bin/env python3
 
+from dns_providers import DNSProviderFactory
 import argparse
 import os
 import sys
 
 sys.path.append(os.path.dirname(os.path.abspath(__file__)))
 
-from dns_providers import DNSProviderFactory
-
 
 def main():
     parser = argparse.ArgumentParser(
         description="Manage DNS records across multiple providers"
     )
     parser.add_argument(
         "action",
-        choices=["get_zone_id", "set_cname", "set_alias", "set_txt", "set_caa"],
+        choices=["set_cname", "set_alias", "set_txt", "set_caa"],
         help="Action to perform",
     )
     parser.add_argument("--domain", required=True, help="Domain name")
     parser.add_argument("--provider", help="DNS provider (cloudflare, linode)")
-    parser.add_argument("--zone-id", help="Zone ID (if already known)")
+    # Zone ID is now handled internally by each provider
     parser.add_argument(
         "--content", help="Record content (target for alias/CNAME, value for TXT/CAA)"
     )
@@ -35,51 +34,42 @@ def main():
         # Create DNS provider instance
         provider = DNSProviderFactory.create_provider(args.provider)
 
-        # Get zone ID if not provided
-        zone_id = args.zone_id
-        if not zone_id:
-            zone_id = provider.get_zone_id(args.domain)
-            if not zone_id:
-                print(
-                    f"Error: Could not find zone for domain {args.domain}",
-                    file=sys.stderr,
-                )
-                sys.exit(1)
-
-        if args.action == "get_zone_id":
-            print(zone_id)  # Output zone ID for shell script to capture
-
-        elif args.action == "set_cname":
-            # Legacy action - redirects to set_alias for backward compatibility
+        if args.action == "set_cname":
             if not args.content:
-                print("Error: --content is required for CNAME records", file=sys.stderr)
+                print("Error: --content is required for CNAME records",
+                      file=sys.stderr)
                 sys.exit(1)
 
-            success = provider.set_alias_record(zone_id, args.domain, args.content)
+            success = provider.set_alias_record(args.domain, args.content)
             if not success:
-                print(f"Failed to set alias record for {args.domain}", file=sys.stderr)
+                print(
+                    f"Failed to set alias record for {args.domain}", file=sys.stderr)
                 sys.exit(1)
             print(f"Successfully set alias record for {args.domain}")
 
         elif args.action == "set_alias":
             if not args.content:
-                print("Error: --content is required for alias records", file=sys.stderr)
+                print("Error: --content is required for alias records",
+                      file=sys.stderr)
                 sys.exit(1)
 
-            success = provider.set_alias_record(zone_id, args.domain, args.content)
+            success = provider.set_alias_record(args.domain, args.content)
             if not success:
-                print(f"Failed to set alias record for {args.domain}", file=sys.stderr)
+                print(
+                    f"Failed to set alias record for {args.domain}", file=sys.stderr)
                 sys.exit(1)
             print(f"Successfully set alias record for {args.domain}")
 
         elif args.action == "set_txt":
             if not args.content:
-                print("Error: --content is required for TXT records", file=sys.stderr)
+                print("Error: --content is required for TXT records",
+                      file=sys.stderr)
                 sys.exit(1)
 
-            success = provider.set_txt_record(zone_id, args.domain, args.content)
+            success = provider.set_txt_record(args.domain, args.content)
             if not success:
-                print(f"Failed to set TXT record for {args.domain}", file=sys.stderr)
+                print(
+                    f"Failed to set TXT record for {args.domain}", file=sys.stderr)
                 sys.exit(1)
             print(f"Successfully set TXT record for {args.domain}")
 
@@ -92,10 +82,11 @@ def main():
                 sys.exit(1)
 
             success = provider.set_caa_record(
-                zone_id, args.domain, args.caa_tag, args.caa_value
+                args.domain, args.caa_tag, args.caa_value
             )
             if not success:
-                print(f"Failed to set CAA record for {args.domain}", file=sys.stderr)
+                print(
+                    f"Failed to set CAA record for {args.domain}", file=sys.stderr)
                 sys.exit(1)
             print(f"Successfully set CAA record for {args.domain}")
 

custom-domain/dstack-ingress/scripts/dns_providers/base.py

@@ -69,26 +69,13 @@ def suitable(cls) -> bool:
         """Check if the current environment is suitable for this DNS provider."""
         return os.environ.get(cls.DETECT_ENV) is not None
 
-    @abstractmethod
-    def get_zone_id(self, domain: str) -> Optional[str]:
-        """Get the zone ID for a domain.
-
-        Args:
-            domain: The domain name
-
-        Returns:
-            The zone ID if found, None otherwise
-        """
-        pass
-
     @abstractmethod
     def get_dns_records(
-        self, zone_id: str, name: str, record_type: Optional[RecordType] = None
+        self, name: str, record_type: Optional[RecordType] = None
     ) -> List[DNSRecord]:
         """Get DNS records for a domain.
 
         Args:
-            zone_id: The zone ID
             name: The record name
             record_type: Optional record type filter
 
@@ -98,11 +85,10 @@ def get_dns_records(
         pass
 
     @abstractmethod
-    def create_dns_record(self, zone_id: str, record: DNSRecord) -> bool:
+    def create_dns_record(self, record: DNSRecord) -> bool:
         """Create a DNS record.
 
         Args:
-            zone_id: The zone ID
             record: The DNS record to create
 
         Returns:
@@ -111,24 +97,23 @@ def create_dns_record(self, zone_id: str, record: DNSRecord) -> bool:
         pass
 
     @abstractmethod
-    def delete_dns_record(self, zone_id: str, record_id: str) -> bool:
+    def delete_dns_record(self, record_id: str, domain: str) -> bool:
         """Delete a DNS record.
 
         Args:
-            zone_id: The zone ID
             record_id: The record ID to delete
+            domain: The domain name (for zone lookup)
 
         Returns:
             True if successful, False otherwise
         """
         pass
 
     @abstractmethod
-    def create_caa_record(self, zone_id: str, caa_record: CAARecord) -> bool:
+    def create_caa_record(self, caa_record: CAARecord) -> bool:
         """Create a CAA record.
 
         Args:
-            zone_id: The zone ID
             caa_record: The CAA record to create
 
         Returns:
@@ -137,12 +122,11 @@ def create_caa_record(self, zone_id: str, caa_record: CAARecord) -> bool:
         pass
 
     def set_a_record(
-        self, zone_id: str, name: str, ip_address: str, ttl: int = 60, proxied: bool = False
+        self, name: str, ip_address: str, ttl: int = 60, proxied: bool = False
     ) -> bool:
         """Set an A record (delete existing and create new).
 
         Args:
-            zone_id: The zone ID
             name: The record name
             ip_address: The IP address
             ttl: Time to live
@@ -151,14 +135,14 @@ def set_a_record(
         Returns:
             True if successful, False otherwise
         """
-        existing_records = self.get_dns_records(zone_id, name, RecordType.A)
+        existing_records = self.get_dns_records(name, RecordType.A)
         for record in existing_records:
             # Check if record already exists with same IP
             if record.content == ip_address:
                 print("A record with the same IP already exists")
                 return True
             if record.id:
-                self.delete_dns_record(zone_id, record.id)
+                self.delete_dns_record(record.id, name)
 
         new_record = DNSRecord(
             id=None,
@@ -168,11 +152,10 @@ def set_a_record(
             ttl=ttl,
             proxied=proxied,
         )
-        return self.create_dns_record(zone_id, new_record)
+        return self.create_dns_record(new_record)
 
     def set_alias_record(
         self,
-        zone_id: str,
         name: str,
         content: str,
         ttl: int = 60,
@@ -184,7 +167,6 @@ def set_alias_record(
         to use A records instead (e.g., Linode to avoid CAA conflicts).
 
         Args:
-            zone_id: The zone ID
             name: The record name
             content: The alias target (domain name)
             ttl: Time to live
@@ -193,11 +175,10 @@ def set_alias_record(
         Returns:
             True if successful, False otherwise
         """
-        return self.set_cname_record(zone_id, name, content, ttl, proxied)
+        return self.set_cname_record(name, content, ttl, proxied)
 
     def set_cname_record(
         self,
-        zone_id: str,
         name: str,
         content: str,
         ttl: int = 60,
@@ -209,7 +190,6 @@ def set_cname_record(
         to use A records instead (e.g., Linode to avoid CAA conflicts).
 
         Args:
-            zone_id: The zone ID
             name: The record name
             content: The alias target (domain name)
             ttl: Time to live
@@ -218,14 +198,14 @@ def set_cname_record(
         Returns:
             True if successful, False otherwise
         """
-        existing_records = self.get_dns_records(zone_id, name, RecordType.CNAME)
+        existing_records = self.get_dns_records(name, RecordType.CNAME)
         for record in existing_records:
             # Check if record already exists with same content
             if record.content == content:
                 print("CNAME record with the same content already exists")
                 return True
             if record.id:
-                self.delete_dns_record(zone_id, record.id)
+                self.delete_dns_record(record.id, name)
 
         new_record = DNSRecord(
             id=None,
@@ -235,39 +215,37 @@ def set_cname_record(
             ttl=ttl,
             proxied=proxied,
         )
-        return self.create_dns_record(zone_id, new_record)
+        return self.create_dns_record(new_record)
 
     def set_txt_record(
-        self, zone_id: str, name: str, content: str, ttl: int = 60
+        self, name: str, content: str, ttl: int = 60
     ) -> bool:
         """Set a TXT record (delete existing and create new).
 
         Args:
-            zone_id: The zone ID
             name: The record name
             content: The TXT content
             ttl: Time to live
 
         Returns:
             True if successful, False otherwise
         """
-        existing_records = self.get_dns_records(zone_id, name, RecordType.TXT)
+        existing_records = self.get_dns_records(name, RecordType.TXT)
         for record in existing_records:
             # Check if record already exists with same content
             if record.content == content or record.content == f'"{content}"':
                 print("TXT record with the same content already exists")
                 return True
             if record.id:
-                self.delete_dns_record(zone_id, record.id)
+                self.delete_dns_record(record.id, name)
 
         new_record = DNSRecord(
             id=None, name=name, type=RecordType.TXT, content=content, ttl=ttl
         )
-        return self.create_dns_record(zone_id, new_record)
+        return self.create_dns_record(new_record)
 
     def set_caa_record(
         self,
-        zone_id: str,
         name: str,
         tag: str,
         value: str,
@@ -277,7 +255,6 @@ def set_caa_record(
         """Set a CAA record (delete existing with same tag and create new).
 
         Args:
-            zone_id: The zone ID
             name: The record name
             tag: The CAA tag (issue, issuewild, iodef)
             value: The CAA value
@@ -287,14 +264,14 @@ def set_caa_record(
         Returns:
             True if successful, False otherwise
         """
-        existing_records = self.get_dns_records(zone_id, name, RecordType.CAA)
+        existing_records = self.get_dns_records(name, RecordType.CAA)
         for record in existing_records:
             if record.data and record.data.get("tag") == tag:
                 if record.data.get("value") == value:
                     print("CAA record with the same content already exists")
                     return True
                 if record.id:
-                    self.delete_dns_record(zone_id, record.id)
+                    self.delete_dns_record(record.id, name)
 
         caa_record = CAARecord(name=name, flags=flags, tag=tag, value=value, ttl=ttl)
-        return self.create_caa_record(zone_id, caa_record)
+        return self.create_caa_record(caa_record)