Allow creating A records

4 files changed, 13 insertions, 14 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java
index 071d8a4d11f..91bca1e481c 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java
@@ -268,9 +268,9 @@ public class RoutingController {
             // Register names in DNS
             Rotation rotation = rotationRepository.requireRotation(assignedRotation.rotationId());
             for (var endpoint : rotationEndpoints) {
-                controller.nameServiceForwarder().createCname(RecordName.from(endpoint.dnsName()),
-                                                              RecordData.fqdn(rotation.name()),
-                                                              Priority.normal);
+                controller.nameServiceForwarder().createRecord(
+                        new Record(Record.Type.CNAME, RecordName.from(endpoint.dnsName()), RecordData.fqdn(rotation.name())),
+                        Priority.normal);
                 List<String> names = List.of(endpoint.dnsName(),
                                              // Include rotation ID as a valid name of this container endpoint
                                              // (required by global routing health checks)
@@ -305,9 +305,9 @@ public class RoutingController {
             ZoneId targetZone = targetZones.iterator().next();
             String vipHostname = controller.zoneRegistry().getVipHostname(targetZone)
                                            .orElseThrow(() -> new IllegalArgumentException("No VIP configured for zone " + targetZone));
-            controller.nameServiceForwarder().createCname(RecordName.from(endpoint.dnsName()),
-                                                          RecordData.fqdn(vipHostname),
-                                                          Priority.normal);
+            controller.nameServiceForwarder().createRecord(
+                    new Record(Record.Type.CNAME, RecordName.from(endpoint.dnsName()), RecordData.fqdn(vipHostname)),
+                    Priority.normal);
         }
         Map<ClusterSpec.Id, EndpointList> applicationEndpointsByCluster = applicationEndpoints.groupingBy(Endpoint::cluster);
         for (var kv : applicationEndpointsByCluster.entrySet()) {
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/CreateRecord.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/CreateRecord.java
index 464e3eff203..344ffad80e9 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/CreateRecord.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/CreateRecord.java
@@ -19,7 +19,7 @@ public class CreateRecord implements NameServiceRequest {
     /** DO NOT USE. Public for serialization purposes */
     public CreateRecord(Record record) {
         this.record = Objects.requireNonNull(record, "record must be non-null");
-        if (record.type() != Record.Type.CNAME) {
+        if (record.type() != Record.Type.CNAME && record.type() != Record.Type.A) {
             throw new IllegalArgumentException("Record of type " + record.type() + " is not supported: " + record);
         }
     }
@@ -38,7 +38,7 @@ public class CreateRecord implements NameServiceRequest {
             }
         });
         if (records.isEmpty()) {
-            nameService.createCname(record.name(), record.data());
+            nameService.createRecord(record.type(), record.name(), record.data());
         }
     }
 
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceForwarder.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceForwarder.java
index 540e8489e6d..9d2c7918252 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceForwarder.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceForwarder.java
@@ -2,7 +2,6 @@
 package com.yahoo.vespa.hosted.controller.dns;
 
 import com.yahoo.transaction.Mutex;
-import com.yahoo.vespa.curator.Lock;
 import com.yahoo.vespa.hosted.controller.api.integration.dns.AliasTarget;
 import com.yahoo.vespa.hosted.controller.api.integration.dns.NameService;
 import com.yahoo.vespa.hosted.controller.api.integration.dns.Record;
@@ -43,9 +42,9 @@ public class NameServiceForwarder {
         this.db = Objects.requireNonNull(db, "db must be non-null");
     }
 
-    /** Create or update a CNAME record with given name and data */
-    public void createCname(RecordName name, RecordData canonicalName, NameServiceQueue.Priority priority) {
-        forward(new CreateRecord(new Record(Record.Type.CNAME, name, canonicalName)), priority);
+    /** Create or update a given record */
+    public void createRecord(Record record, NameServiceQueue.Priority priority) {
+        forward(new CreateRecord(record), priority);
     }
 
     /** Create or update an ALIAS record with given name and targets */
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicies.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicies.java
index ac29f8952a0..683b16c803c 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicies.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicies.java
@@ -332,8 +332,8 @@ public class RoutingPolicies {
     private void updateZoneDnsOf(RoutingPolicy policy) {
         for (var endpoint : policy.zoneEndpointsIn(controller.system(), RoutingMethod.exclusive, controller.zoneRegistry())) {
             var name = RecordName.from(endpoint.dnsName());
-            var data = RecordData.fqdn(policy.canonicalName().value());
-            nameServiceForwarderIn(policy.id().zone()).createCname(name, data, Priority.normal);
+            var record = new Record(Record.Type.CNAME, name, RecordData.fqdn(policy.canonicalName().value()));
+            nameServiceForwarderIn(policy.id().zone()).createRecord(record, Priority.normal);
         }
     }