fix(deploy/ha): Orca reads should point to clouddriver-ro. (#1068)

spinnaker · Oct 15, 2018 · b45a4ee · b45a4ee
1 parent 7e64227
commit b45a4ee
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 0 deletions.
diff --git a/.../src/main/java/com/netflix/spinnaker/halyard/deploy/spinnaker/v1/service/OrcaService.java b/.../src/main/java/com/netflix/spinnaker/halyard/deploy/spinnaker/v1/service/OrcaService.java
@@ -57,6 +57,9 @@ public Class<Orca> getEndpointClass() {
     return Orca.class;
   }
 
+  protected void appendReadonlyClouddriver(Profile profile, DeploymentConfiguration deploymentConfiguration, SpinnakerRuntimeSettings endpoints) {
+  }
+
   @Override
   public List<Profile> getProfiles(DeploymentConfiguration deploymentConfiguration, SpinnakerRuntimeSettings endpoints) {
     List<Profile> profiles = super.getProfiles(deploymentConfiguration, endpoints);
@@ -65,6 +68,8 @@ public List<Profile> getProfiles(DeploymentConfiguration deploymentConfiguration
     String path = Paths.get(getConfigOutputPath(), filename).toString();
     Profile profile = orcaProfileFactory.getProfile(filename, path, deploymentConfiguration, endpoints);
 
+    appendReadonlyClouddriver(profile, deploymentConfiguration, endpoints);
+
     profiles.add(profile);
     return profiles;
   }

diff --git a/...spinnaker/v1/service/distributed/kubernetes/v2/KubernetesV2ClouddriverCachingService.java b/...spinnaker/v1/service/distributed/kubernetes/v2/KubernetesV2ClouddriverCachingService.java
@@ -55,11 +55,13 @@ public List<Profile> getProfiles(DeploymentConfiguration deploymentConfiguration
     return profiles;
   }
 
+  @Override
   protected boolean hasServiceOverrides(DeploymentConfiguration deploymentConfiguration) {
     HaServices haServices = deploymentConfiguration.getDeploymentEnvironment().getHaServices();
     return haServices.getClouddriver().getRedisMasterEndpoint() != null;
   }
 
+  @Override
   protected SpinnakerRuntimeSettings getServiceOverrides(DeploymentConfiguration deploymentConfiguration, SpinnakerRuntimeSettings endpoints) {
     SpinnakerRuntimeSettings serviceOverrides = super.getServiceOverrides(deploymentConfiguration, endpoints);
 

diff --git a/...ploy/spinnaker/v1/service/distributed/kubernetes/v2/KubernetesV2ClouddriverRoService.java b/...ploy/spinnaker/v1/service/distributed/kubernetes/v2/KubernetesV2ClouddriverRoService.java
@@ -54,11 +54,13 @@ public List<Profile> getProfiles(DeploymentConfiguration deploymentConfiguration
     return profiles;
   }
 
+  @Override
   protected boolean hasServiceOverrides(DeploymentConfiguration deploymentConfiguration) {
     HaServices haServices = deploymentConfiguration.getDeploymentEnvironment().getHaServices();
     return haServices.getClouddriver().getRedisSlaveEndpoint() != null;
   }
 
+  @Override
   protected SpinnakerRuntimeSettings getServiceOverrides(DeploymentConfiguration deploymentConfiguration, SpinnakerRuntimeSettings endpoints) {
     SpinnakerRuntimeSettings serviceOverrides = super.getServiceOverrides(deploymentConfiguration, endpoints);
 

diff --git a/...ploy/spinnaker/v1/service/distributed/kubernetes/v2/KubernetesV2ClouddriverRwService.java b/...ploy/spinnaker/v1/service/distributed/kubernetes/v2/KubernetesV2ClouddriverRwService.java
@@ -55,11 +55,13 @@ public List<Profile> getProfiles(DeploymentConfiguration deploymentConfiguration
     return profiles;
   }
 
+  @Override
   protected boolean hasServiceOverrides(DeploymentConfiguration deploymentConfiguration) {
     HaServices haServices = deploymentConfiguration.getDeploymentEnvironment().getHaServices();
     return haServices.getClouddriver().getRedisMasterEndpoint() != null;
   }
 
+  @Override
   protected SpinnakerRuntimeSettings getServiceOverrides(DeploymentConfiguration deploymentConfiguration, SpinnakerRuntimeSettings endpoints) {
     SpinnakerRuntimeSettings serviceOverrides = super.getServiceOverrides(deploymentConfiguration, endpoints);
 

diff --git a/...alyard/deploy/spinnaker/v1/service/distributed/kubernetes/v2/KubernetesV2OrcaService.java b/...alyard/deploy/spinnaker/v1/service/distributed/kubernetes/v2/KubernetesV2OrcaService.java
@@ -27,7 +27,9 @@
 import com.netflix.spinnaker.halyard.deploy.spinnaker.v1.service.ServiceSettings;
 import com.netflix.spinnaker.halyard.deploy.spinnaker.v1.service.distributed.DistributedService.DeployPriority;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Delegate;
@@ -83,4 +85,15 @@ protected List<Type> overrideServiceEndpoints() {
         Type.ECHO_WORKER
     );
   }
+
+  @Override
+  protected void appendReadonlyClouddriver(Profile profile, DeploymentConfiguration deploymentConfiguration, SpinnakerRuntimeSettings endpoints) {
+    if (hasServiceOverrides(deploymentConfiguration)) {
+      Map<String, Map<String, Map<String, String>>> clouddriver = Collections.singletonMap(
+          "clouddriver", Collections.singletonMap(
+              "readonly", Collections.singletonMap(
+                  "baseUrl", endpoints.getServiceSettings(Type.CLOUDDRIVER_RO).getBaseUrl())));
+      profile.appendContents("\n" + getYamlParser().dump(clouddriver));
+    }
+  }
 }