fix(aws): Support cross zone load balancing for NLB (#8557)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
spinnaker · Oct 13, 2020 · a7e8847 · a7e8847
1 parent 7f266fb
commit a7e8847
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git a/app/scripts/modules/amazon/src/domain/IAmazonLoadBalancer.ts b/app/scripts/modules/amazon/src/domain/IAmazonLoadBalancer.ts
@@ -56,6 +56,7 @@ export interface IAmazonApplicationLoadBalancer extends IAmazonLoadBalancer {
   ipAddressType?: string; // returned from clouddriver
   deletionProtection: boolean;
   idleTimeout: number;
+  loadBalancingCrossZone: boolean;
 }
 
 export interface IAmazonNetworkLoadBalancer extends IAmazonLoadBalancer {
@@ -64,6 +65,7 @@ export interface IAmazonNetworkLoadBalancer extends IAmazonLoadBalancer {
   ipAddressType?: string; // returned from clouddriver
   deletionProtection: boolean;
   idleTimeout: number;
+  loadBalancingCrossZone: boolean;
 }
 
 export interface IRedirectActionConfig {
@@ -267,6 +269,7 @@ export interface IAmazonApplicationLoadBalancerUpsertCommand extends IAmazonLoad
 
 export interface IAmazonNetworkLoadBalancerUpsertCommand extends IAmazonLoadBalancerUpsertCommand {
   deletionProtection: boolean;
+  loadBalancingCrossZone: boolean;
   listeners: IListenerDescription[];
   targetGroups: INLBTargetGroupDescription[];
 }
diff --git a/app/scripts/modules/amazon/src/loadBalancer/configure/network/NLBAdvancedSettings.tsx b/app/scripts/modules/amazon/src/loadBalancer/configure/network/NLBAdvancedSettings.tsx
@@ -23,6 +23,15 @@ export class NLBAdvancedSettings extends React.Component<INLBAdvancedSettingsPro
             Enable deletion protection
           </label>
         </div>
+        <div className="col-md-3 sm-label-right">
+          <b>Cross-Zone Load Balancing</b> <HelpField id="loadBalancer.advancedSettings.loadBalancingCrossZone" />
+        </div>
+        <div className="col-md-7 checkbox">
+          <label>
+            <Field type="checkbox" name="loadBalancingCrossZone" checked={values.loadBalancingCrossZone} />
+            Cross-Zone Load Balancing
+          </label>
+        </div>
       </div>
     );
   }

diff --git a/app/scripts/modules/amazon/src/loadBalancer/loadBalancer.transformer.ts b/app/scripts/modules/amazon/src/loadBalancer/loadBalancer.transformer.ts
@@ -392,6 +392,7 @@ export class AwsLoadBalancerTransformer {
       subnetType: loadBalancer.subnetType,
       vpcId: undefined,
       deletionProtection: loadBalancer.deletionProtection,
+      loadBalancingCrossZone: loadBalancer.loadBalancingCrossZone,
     };
 
     if (loadBalancer.elb) {
@@ -594,6 +595,7 @@ export class AwsLoadBalancerTransformer {
       vpcId: null,
       subnetType: defaultSubnetType,
       deletionProtection: false,
+      loadBalancingCrossZone: true,
       securityGroups: [],
       targetGroups: [
         {

diff --git a/app/scripts/modules/core/src/help/help.contents.ts b/app/scripts/modules/core/src/help/help.contents.ts
@@ -211,6 +211,8 @@ const helpContents: { [key: string]: string } = {
     '<p>Configures the number of healthy observations before reinstituting an instance into the ELB’s traffic rotation.</p><p>Default: <b>10</b></p>',
   'loadBalancer.advancedSettings.unhealthyThreshold':
     '<p>Configures the number of unhealthy observations before deservicing an instance from the ELB.</p><p>Default: <b>2</b></p>',
+  'loadBalancer.advancedSettings.loadBalancingCrossZone':
+    '<p>Cross-zone load balancing distributes traffic evenly across all targets in the Availability Zones enabled for the load balancer.</p><p> Default: <b>True</b></p>',
   'pipeline.config.resizeAsg.action': `
       <p>Configures the resize action for the target server group.
       <ul>