feat(google): Added UI to specify Session Affinity for Network LB

* feat(provider/google): Added UI to specify Session Affinity for Network LB spinnaker/spinnaker#3521 * feat(provider/google): Map title into value spinnaker/spinnaker#3521 * feat(provider/google): UI fixes spinnaker/spinnaker#3521 * feat(provider/google): load session affinity values from existing LB spinnaker/spinnaker#3521 * feat(provider/google): disable session affinity dropdown for existing LB spinnaker/spinnaker#3521
spinnaker · Oct 15, 2019 · b999312 · b999312
1 parent b7b49d0
commit b999312
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 0 deletions.
diff --git a/app/scripts/modules/google/src/loadBalancer/configure/network/advancedSettings.html b/app/scripts/modules/google/src/loadBalancer/configure/network/advancedSettings.html
@@ -35,5 +35,20 @@
         <input class="form-control input-sm" type="number" min="0" ng-model="loadBalancer.unhealthyThreshold" />
       </div>
     </div>
+
+    <div class="form-group">
+      <div class="col-md-6 sm-label-right">
+        <b>Session Affinity</b><help-field key="gce.loadBalancer.advancedSettings.unhealthyThreshold"></help-field>
+      </div>
+      <div class="col-md-4">
+        <select
+          class="form-control input-sm"
+          ng-model="loadBalancer.sessionAffinity"
+          ng-options="option.value as option.name for option in sessionAffinityOptions"
+          ng-disabled="!isNew"
+          name="sessionAffinitySelect"
+        ></select>
+      </div>
+    </div>
   </div>
 </div>
diff --git a/...cripts/modules/google/src/loadBalancer/configure/network/createLoadBalancer.controller.js b/...cripts/modules/google/src/loadBalancer/configure/network/createLoadBalancer.controller.js
@@ -35,6 +35,12 @@ module.exports = angular
         submitting: false,
       };
 
+      $scope.sessionAffinityOptions = [
+        { value: 'NONE', name: 'None' },
+        { value: 'CLIENT_IP', name: 'Client IP' },
+        { value: 'CLIENT_IP_PROTO', name: 'Client IP and protocol' },
+      ];
+
       function onApplicationRefresh() {
         // If the user has already closed the modal, do not navigate to the new details view
         if ($scope.$$destroyed) {
@@ -198,6 +204,8 @@ module.exports = angular
             } else {
               params.healthCheck = null;
             }
+
+            params.sessionAffinity = $scope.loadBalancer.sessionAffinity;
           }
 
           return LoadBalancerWriter.upsertLoadBalancer($scope.loadBalancer, application, descriptor, params);

diff --git a/app/scripts/modules/google/src/loadBalancer/loadBalancer.transformer.js b/app/scripts/modules/google/src/loadBalancer/loadBalancer.transformer.js
@@ -132,6 +132,8 @@ module.exports = angular.module('spinnaker.gce.loadBalancer.transformer', []).fa
           toEdit.healthyThreshold = 10;
           toEdit.unhealthyThreshold = 2;
         }
+
+        toEdit.sessionAffinity = loadBalancer.sessionAffinity || 'None';
       }
       return toEdit;
     }
@@ -150,6 +152,7 @@ module.exports = angular.module('spinnaker.gce.loadBalancer.transformer', []).fa
         healthInterval: 10,
         healthyThreshold: 10,
         unhealthyThreshold: 2,
+        sessionAffinity: 'NONE',
         regionZones: [],
         listeners: [
           {