aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjonmv <venstad@gmail.com>2023-01-18 19:40:47 +0100
committerjonmv <venstad@gmail.com>2023-01-18 19:40:47 +0100
commit09f5b42038b2a73872578d35f6fd71b3647c3f3a (patch)
tree32a91832d35d29ab09226c2701d6479cbd773fc3
parent1e411a756d534ecac16d19ef740456f66affc14a (diff)
Add back API used by config model to describe LoadBalancerSettings
-rw-r--r--config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java11
-rw-r--r--config-provisioning/src/main/java/com/yahoo/config/provision/LoadBalancerSettings.java2
2 files changed, 13 insertions, 0 deletions
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java
index 196255a8342..22f753951ca 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java
@@ -2,6 +2,8 @@
package com.yahoo.config.provision;
import com.yahoo.component.Version;
+import com.yahoo.config.provision.ZoneEndpoint.AccessType;
+import com.yahoo.config.provision.ZoneEndpoint.AllowedUrn;
import java.util.Objects;
import java.util.Optional;
@@ -168,6 +170,15 @@ public final class ClusterSpec {
return this;
}
+ // TODO jonmv: remove once 8.113 is gone
+ public Builder loadBalancerSettings(LoadBalancerSettings settings) {
+ return loadBalancerSettings(new ZoneEndpoint(true,
+ true,
+ settings.allowedUrns().stream()
+ .map(urn -> new AllowedUrn(AccessType.awsPrivateLink, urn))
+ .toList()));
+ }
+
public Builder loadBalancerSettings(ZoneEndpoint zoneEndpoint) {
this.zoneEndpoint = zoneEndpoint;
return this;
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/LoadBalancerSettings.java b/config-provisioning/src/main/java/com/yahoo/config/provision/LoadBalancerSettings.java
index 723de25fa87..3fd885783f3 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/LoadBalancerSettings.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/LoadBalancerSettings.java
@@ -5,6 +5,8 @@ import java.util.List;
/**
* Settings for a load balancer provisioned for an application container cluster.
*
+ * TODO: Remove once 8.113 is gone
+ *
* @author jonmv
*/
public record LoadBalancerSettings(List<String> allowedUrns) {