@spinnaker/google 0.1.11 → 0.2.0

package/src/serverGroup/configure/serverGroup.configure.gce.module.js

@@ -4,6 +4,8 @@ import { module } from 'angular';
 
 import { GOOGLE_AUTOSCALINGPOLICY_COMPONENTS_BASICSETTINGS_BASICSETTINGS_COMPONENT } from '../../autoscalingPolicy/components/basicSettings/basicSettings.component';
 import { GOOGLE_AUTOSCALINGPOLICY_COMPONENTS_METRICSETTINGS_METRICSETTINGS_COMPONENT } from '../../autoscalingPolicy/components/metricSettings/metricSettings.component';
+import { GOOGLE_AUTOSCALINGPOLICY_COMPONENTS_SCALINGSCHEDULES_SCALINGSCHEDULES_COMPONENT } from '../../autoscalingPolicy/components/scalingSchedules/scalingSchedules.component';
+import { GCE_TIMEZONE_SELECT } from '../../autoscalingPolicy/components/scalingSchedules/timeZoneSelect';
 import { GCE_CACHE_REFRESH } from '../../cache/cacheRefresh.component';
 import { GCE_IMAGE_SELECT } from '../../image/ImageSelect';
 import { GOOGLE_INSTANCE_CUSTOM_CUSTOMINSTANCEBUILDER_GCE_SERVICE } from './../../instance/custom/customInstanceBuilder.gce.service';
@@ -13,6 +15,7 @@ import { GCE_ACCELERATOR_CONFIGURER } from './wizard/advancedSettings/GceAcceler
 import { GOOGLE_SERVERGROUP_CONFIGURE_WIZARD_ADVANCEDSETTINGS_ADVANCEDSETTINGSSELECTOR_DIRECTIVE } from './wizard/advancedSettings/advancedSettingsSelector.directive';
 import { GCE_DISK_CONFIGURER } from './wizard/advancedSettings/diskConfigurer.component';
 import { GCE_AUTOHEALING_POLICY_SELECTOR } from './wizard/autoHealingPolicy/autoHealingPolicySelector.component';
+import { GCE_AUTOSCALING_POLICY_SELECTOR_COMPONENT } from './wizard/autoScalingPolicy/autoScalingPolicySelector.component';
 import { GOOGLE_SERVERGROUP_CONFIGURE_WIZARD_CAPACITY_ADVANCEDCAPACITYSELECTOR_COMPONENT } from './wizard/capacity/advancedCapacitySelector.component';
 import { GOOGLE_SERVERGROUP_CONFIGURE_WIZARD_CAPACITY_SIMPLECAPACITYSELECTOR_COMPONENT } from './wizard/capacity/simpleCapacitySelector.component';
 import { GCE_CUSTOM_INSTANCE_CONFIGURER } from './wizard/customInstance/customInstanceConfigurer.component';
@@ -30,7 +33,9 @@ export const name = GOOGLE_SERVERGROUP_CONFIGURE_SERVERGROUP_CONFIGURE_GCE_MODUL
 module(GOOGLE_SERVERGROUP_CONFIGURE_SERVERGROUP_CONFIGURE_GCE_MODULE, [
   GOOGLE_AUTOSCALINGPOLICY_COMPONENTS_BASICSETTINGS_BASICSETTINGS_COMPONENT,
   GOOGLE_AUTOSCALINGPOLICY_COMPONENTS_METRICSETTINGS_METRICSETTINGS_COMPONENT,
+  GOOGLE_AUTOSCALINGPOLICY_COMPONENTS_SCALINGSCHEDULES_SCALINGSCHEDULES_COMPONENT,
   GCE_LOAD_BALANCING_POLICY_SELECTOR,
+  GCE_AUTOSCALING_POLICY_SELECTOR_COMPONENT,
   GCE_AUTOHEALING_POLICY_SELECTOR,
   GOOGLE_INSTANCE_CUSTOM_CUSTOMINSTANCEBUILDER_GCE_SERVICE,
   GCE_CACHE_REFRESH,
@@ -38,6 +43,7 @@ module(GOOGLE_SERVERGROUP_CONFIGURE_SERVERGROUP_CONFIGURE_GCE_MODULE, [
   GCE_DISK_CONFIGURER,
   GCE_ACCELERATOR_CONFIGURER,
   GCE_IMAGE_SELECT,
+  GCE_TIMEZONE_SELECT,
   GOOGLE_SERVERGROUP_SERVERGROUP_TRANSFORMER,
   GOOGLE_SERVERGROUP_CONFIGURE_SERVERGROUPCONFIGURATION_SERVICE,
   GOOGLE_SERVERGROUP_CONFIGURE_WIZARD_ADVANCEDSETTINGS_ADVANCEDSETTINGSSELECTOR_DIRECTIVE,

package/src/serverGroup/configure/serverGroupConfiguration.service.js

@@ -151,6 +151,12 @@ angular
                 networkReloader = refreshNetworks(command);
               }
             }
+
+            // eslint-disable-next-line no-console
+            if (command.autoScalingPolicy) {
+              command.enableAutoScaling = true;
+            }
+
             if (command.autoHealingPolicy) {
               command.enableAutoHealing = true;
             }

package/src/serverGroup/configure/wizard/autoScalingPolicy/autoScalingPolicy.html

@@ -0,0 +1,20 @@
+<ng-form name="autoScalingPolicySubForm">
+  <div class="form-group">
+    <div class="col-md-3 sm-label-right">
+      <b>Enable Autoscaling</b>
+    </div>
+    <div class="col-md-6 checkbox">
+      <label>
+        <input type="checkbox" ng-model="command.enableAutoScaling" ng-change="ctrl.onEnableAutoScalingChange()" />
+      </label>
+    </div>
+  </div>
+  <div>
+    <gce-auto-scaling-policy-Selector-Component
+      ng-if="command.enableAutoScaling"
+      enabled="command.enableAutoScaling"
+      auto-scaling-policy="command.autoscalingPolicy"
+      set-auto-scaling-policy="ctrl.setAutoScalingPolicy(autoscalingPolicy)"
+    ></gce-auto-scaling-policy-Selector-Component>
+  </div>
+</ng-form>

package/src/serverGroup/configure/wizard/autoScalingPolicy/autoScalingPolicySelector.component.html

@@ -0,0 +1,21 @@
+<div class="gce-scaling-policy-wizard">
+  <h5 class="section-heading">Basic Settings</h5>
+  <div class="section-body">
+    <gce-autoscaling-policy-basic-settings policy="$ctrl.policy" update-policy="$ctrl.updatePolicy">
+    </gce-autoscaling-policy-basic-settings>
+  </div>
+  <h5 class="section-heading">Metric Types</h5>
+  <gce-autoscaling-policy-metric-settings
+    show-no-metrics-warning="$ctrl.showNoMetricsWarning"
+    policy="$ctrl.policy"
+    update-policy="$ctrl.updatePolicy"
+  >
+  </gce-autoscaling-policy-metric-settings>
+  <h5 class="section-heading">Scaling Schedules</h5>
+  <div class="section-body">
+    <gce-autoscaling-policy-scaling-schedules
+      policy="$ctrl.policy"
+      update-policy="$ctrl.updatePolicy"
+    ></gce-autoscaling-policy-scaling-schedules>
+  </div>
+</div>

package/src/serverGroup/configure/wizard/autoScalingPolicy/autoScalingPolicySelector.component.js

@@ -0,0 +1,47 @@
+/* eslint-disable no-debugger */
+import { IComponentOptions, module } from 'angular';
+import { cloneDeep } from 'lodash';
+
+import { TaskMonitor } from '@spinnaker/core';
+
+import { GOOGLE_AUTOSCALINGPOLICY_COMPONENTS_BASICSETTINGS_BASICSETTINGS_COMPONENT } from '../../../../autoscalingPolicy/components/basicSettings/basicSettings.component';
+import { GOOGLE_AUTOSCALINGPOLICY_COMPONENTS_METRICSETTINGS_METRICSETTINGS_COMPONENT } from '../../../../autoscalingPolicy/components/metricSettings/metricSettings.component';
+import { GOOGLE_AUTOSCALINGPOLICY_COMPONENTS_SCALINGSCHEDULES_SCALINGSCHEDULES_COMPONENT } from '../../../../autoscalingPolicy/components/scalingSchedules/scalingSchedules.component';
+
+import './autoScalingPolicySelector.less';
+
+const gceAutoScalingPolicySelectorComponent = {
+  bindings: {
+    policy: '<',
+    enabled: '<',
+    setAutoScalingPolicy: '&',
+    autoscalingPolicy: '<',
+  },
+  templateUrl: require('./autoScalingPolicySelector.component.html'),
+  controller: 'gceUpsertAutoscalingPolicyCtrl',
+};
+
+export const GCE_AUTOSCALING_POLICY_SELECTOR_COMPONENT = 'spinnaker.gce.autoScalingPolicy.selector.component';
+module(GCE_AUTOSCALING_POLICY_SELECTOR_COMPONENT, [
+  GOOGLE_AUTOSCALINGPOLICY_COMPONENTS_BASICSETTINGS_BASICSETTINGS_COMPONENT,
+  GOOGLE_AUTOSCALINGPOLICY_COMPONENTS_METRICSETTINGS_METRICSETTINGS_COMPONENT,
+  GOOGLE_AUTOSCALINGPOLICY_COMPONENTS_SCALINGSCHEDULES_SCALINGSCHEDULES_COMPONENT,
+])
+  .controller('gceUpsertAutoscalingPolicyCtrl', [
+    '$scope',
+    function ($scope) {
+      var vm = this;
+      this.$onInit = function () {
+        this.policy = cloneDeep({});
+        this.setAutoScalingPolicy({ autoscalingPolicy: this.policy });
+
+        this.updatePolicy = (updatedPolicy) => {
+          $scope.$applyAsync(() => {
+            this.policy = updatedPolicy;
+            this.setAutoScalingPolicy({ autoscalingPolicy: this.policy });
+          });
+        };
+      };
+    },
+  ])
+  .component('gceAutoScalingPolicySelectorComponent', gceAutoScalingPolicySelectorComponent);

package/src/serverGroup/configure/wizard/autoScalingPolicy/autoScalingPolicySelector.less

@@ -0,0 +1,15 @@
+.gce-scaling-policy-wizard {
+  .error-message {
+    margin-top: 4px;
+  }
+
+  input.form-control,
+  select.form-control {
+    margin-bottom: 2px;
+    width: 100%;
+  }
+
+  .schedule-container {
+    overflow: hidden;
+  }
+}

package/src/serverGroup/configure/wizard/cloneServerGroup.gce.controller.js

@@ -2,7 +2,7 @@
 
 import UIROUTER_ANGULARJS from '@uirouter/angularjs';
 import * as angular from 'angular';
-import _ from 'lodash';
+import _, { isEmpty } from 'lodash';
 
 import { FirewallLabels, INSTANCE_TYPE_SERVICE, ModalWizard, TaskMonitor } from '@spinnaker/core';
 
@@ -61,8 +61,9 @@ angular
         securityGroups: require('./securityGroups/securityGroups.html'),
         instanceType: require('./instanceType/instanceType.html'),
         capacity: require('./capacity/capacity.html'),
-        zones: require('./capacity/zones.html'),
         autoHealingPolicy: require('./autoHealingPolicy/autoHealingPolicy.html'),
+        autoScalingPolicy: require('./autoScalingPolicy/autoScalingPolicy.html'),
+        zones: require('./capacity/zones.html'),
         advancedSettings: require('./advancedSettings/advancedSettings.html'),
       };
 
@@ -155,7 +156,8 @@ angular
               .register({ page: 'capacity', subForm: 'capacitySubForm' })
               .register({ page: 'zones', subForm: 'zonesSubForm' })
               .register({ page: 'load-balancers', subForm: 'loadBalancerSubForm' })
-              .register({ page: 'autohealing-policy', subForm: 'autoHealingPolicySubForm' });
+              .register({ page: 'autohealing-policy', subForm: 'autoHealingPolicySubForm' })
+              .register({ page: 'autoscaling-policy', subForm: 'autoScalingPolicySubForm' });
           })
           .catch((e) => {
             $log.error('Error generating server group command: ', e);
@@ -261,6 +263,7 @@ angular
       this.isValid = function () {
         const selectedZones =
           $scope.command.selectZones && _.get($scope, 'command.distributionPolicy.zones.length') >= 1;
+        const autoScalingPolicy = $scope.command.autoscalingPolicy;
         return (
           $scope.command &&
           ($scope.command.viewState.disableImageSelection || $scope.command.image) &&
@@ -272,6 +275,11 @@ angular
           $scope.command.capacity.desired !== null &&
           (!$scope.command.selectZones || selectedZones) &&
           $scope.form.$valid &&
+          (!autoScalingPolicy ||
+            (autoScalingPolicy &&
+              (!isEmpty(autoScalingPolicy.cpuUtilization) ||
+                !isEmpty(autoScalingPolicy.customMetricUtilizations) ||
+                !isEmpty(autoScalingPolicy.loadBalancingUtilization)))) &&
           ModalWizard.isComplete()
         );
       };
@@ -431,6 +439,16 @@ angular
         $scope.command.autoHealingPolicy = autoHealingPolicy;
       };
 
+      this.onEnableAutoScalingChange = function () {
+        // Prevent empty auto-scaling policies from being overwritten by those of their ancestors
+        $scope.command.overwriteAncestorAutoScalingPolicy =
+          $scope.command.autoscalingPolicy != null && $scope.command.enableAutoScaling === false;
+      };
+
+      this.setAutoScalingPolicy = function (autoScalingPolicy) {
+        $scope.command.autoscalingPolicy = autoScalingPolicy;
+      };
+
       this.cancel = function () {
         $uibModalInstance.dismiss();
       };

package/src/serverGroup/configure/wizard/serverGroupWizard.html

@@ -22,6 +22,9 @@
       <v2-wizard-page key="capacity" label="Capacity" mark-complete-on-view="false">
         <ng-include src="pages.capacity"></ng-include>
       </v2-wizard-page>
+      <v2-wizard-page key="autoscaling-policy" label="Autoscaling Policy" mark-complete-on-view="false">
+        <ng-include src="pages.autoScalingPolicy"></ng-include>
+      </v2-wizard-page>
       <v2-wizard-page key="autohealing-policy" label="Autohealing Policy" mark-complete-on-view="false">
         <ng-include src="pages.autoHealingPolicy"></ng-include>
       </v2-wizard-page>

package/src/serverGroup/details/autoscalingPolicy/autoscalingPolicy.directive.js

@@ -6,9 +6,9 @@ import ANGULAR_UI_BOOTSTRAP from 'angular-ui-bootstrap';
 import { ConfirmationModalService, SETTINGS } from '@spinnaker/core';
 
 import { GOOGLE_AUTOSCALINGPOLICY_AUTOSCALINGPOLICY_WRITE_SERVICE } from './../../../autoscalingPolicy/autoscalingPolicy.write.service';
+import { GCE_AUTOSCALING_POLICY_SELECTOR_COMPONENT } from '../../configure/wizard/autoScalingPolicy/autoScalingPolicySelector.component';
 import { GCEProviderSettings } from '../../../gce.settings';
 import { GOOGLE_SERVERGROUP_DETAILS_AUTOSCALINGPOLICY_MODAL_UPSERTAUTOSCALINGPOLICY_MODAL_CONTROLLER } from './modal/upsertAutoscalingPolicy.modal.controller';
-
 export const GOOGLE_SERVERGROUP_DETAILS_AUTOSCALINGPOLICY_AUTOSCALINGPOLICY_DIRECTIVE =
   'spinnaker.gce.instance.details.scalingPolicy.directive';
 export const name = GOOGLE_SERVERGROUP_DETAILS_AUTOSCALINGPOLICY_AUTOSCALINGPOLICY_DIRECTIVE; // for backwards compatibility
@@ -16,6 +16,7 @@ module(GOOGLE_SERVERGROUP_DETAILS_AUTOSCALINGPOLICY_AUTOSCALINGPOLICY_DIRECTIVE,
   ANGULAR_UI_BOOTSTRAP,
   GOOGLE_AUTOSCALINGPOLICY_AUTOSCALINGPOLICY_WRITE_SERVICE,
   GOOGLE_SERVERGROUP_DETAILS_AUTOSCALINGPOLICY_MODAL_UPSERTAUTOSCALINGPOLICY_MODAL_CONTROLLER,
+  GCE_AUTOSCALING_POLICY_SELECTOR_COMPONENT,
 ]).component('gceAutoscalingPolicy', {
   bindings: {
     policy: '=',
@@ -27,106 +28,110 @@ module(GOOGLE_SERVERGROUP_DETAILS_AUTOSCALINGPOLICY_AUTOSCALINGPOLICY_DIRECTIVE,
     '$uibModal',
     'gceAutoscalingPolicyWriter',
     function ($uibModal, gceAutoscalingPolicyWriter) {
-      const policy = this.policy;
+      var scope = this;
+      scope.$onInit = function () {
+        const policy = scope.policy;
 
-      policy.bases = [];
+        policy.bases = [];
 
-      if (policy.cpuUtilization) {
-        const basis = {
-          description: 'CPU Usage',
-          helpKey: 'gce.serverGroup.autoscaling.targetCPUUsage',
-        };
+        if (policy.cpuUtilization) {
+          const basis = {
+            description: 'CPU Usage',
+            helpKey: 'gce.serverGroup.autoscaling.targetCPUUsage',
+          };
 
-        if (policy.cpuUtilization.utilizationTarget) {
-          basis.targets = [Math.round(policy.cpuUtilization.utilizationTarget * 100) + '%'];
+          if (policy.cpuUtilization.utilizationTarget) {
+            basis.targets = [Math.round(policy.cpuUtilization.utilizationTarget * 100) + '%'];
+          }
+
+          policy.bases.push(basis);
         }
 
-        policy.bases.push(basis);
-      }
+        if (policy.loadBalancingUtilization) {
+          const basis = {
+            description: 'HTTP Load Balancing Usage',
+            helpKey: 'gce.serverGroup.autoscaling.targetHTTPLoadBalancingUsage',
+          };
 
-      if (policy.loadBalancingUtilization) {
-        const basis = {
-          description: 'HTTP Load Balancing Usage',
-          helpKey: 'gce.serverGroup.autoscaling.targetHTTPLoadBalancingUsage',
-        };
+          if (policy.loadBalancingUtilization.utilizationTarget) {
+            basis.targets = [Math.round(policy.loadBalancingUtilization.utilizationTarget * 100) + '%'];
+          }
 
-        if (policy.loadBalancingUtilization.utilizationTarget) {
-          basis.targets = [Math.round(policy.loadBalancingUtilization.utilizationTarget * 100) + '%'];
+          policy.bases.push(basis);
         }
 
-        policy.bases.push(basis);
-      }
+        if (policy.customMetricUtilizations) {
+          const basis = {
+            description: policy.customMetricUtilizations.length > 1 ? 'Monitoring Metrics' : 'Monitoring Metric',
+            helpKey: 'gce.serverGroup.autoscaling.targetMetric',
+          };
 
-      if (policy.customMetricUtilizations) {
-        const basis = {
-          description: policy.customMetricUtilizations.length > 1 ? 'Monitoring Metrics' : 'Monitoring Metric',
-          helpKey: 'gce.serverGroup.autoscaling.targetMetric',
-        };
+          if (policy.customMetricUtilizations.length > 0) {
+            basis.targets = [];
+            policy.customMetricUtilizations.forEach((metric) => {
+              let target = metric.metric + ': ' + metric.utilizationTarget;
 
-        if (policy.customMetricUtilizations.length > 0) {
-          basis.targets = [];
-          policy.customMetricUtilizations.forEach((metric) => {
-            let target = metric.metric + ': ' + metric.utilizationTarget;
+              if (metric.utilizationTargetType === 'DELTA_PER_SECOND') {
+                target += '/sec';
+              } else if (metric.utilizationTargetType === 'DELTA_PER_MINUTE') {
+                target += '/min';
+              }
 
-            if (metric.utilizationTargetType === 'DELTA_PER_SECOND') {
-              target += '/sec';
-            } else if (metric.utilizationTargetType === 'DELTA_PER_MINUTE') {
-              target += '/min';
-            }
+              basis.targets.push(target);
+            });
+          }
 
-            basis.targets.push(target);
-          });
+          policy.bases.push(basis);
         }
 
-        policy.bases.push(basis);
-      }
-
-      this.scaleInControlsConfigured =
-        policy.scaleInControl &&
-        policy.scaleInControl.timeWindowSec &&
-        policy.scaleInControl.maxScaledInReplicas &&
-        (policy.scaleInControl.maxScaledInReplicas.percent || policy.scaleInControl.maxScaledInReplicas.fixed);
-
-      if (this.scaleInControlsConfigured) {
-        this.maxScaledInReplicasMessage = policy.scaleInControl.maxScaledInReplicas.percent
-          ? `${policy.scaleInControl.maxScaledInReplicas.percent}%`
-          : `${policy.scaleInControl.maxScaledInReplicas.fixed}`;
-
-        this.timeWindowSecMessage = `${policy.scaleInControl.timeWindowSec} seconds`;
-      }
-
-      this.predictiveAutoscalingEnabled =
-        GCEProviderSettings.feature.predictiveAutoscaling &&
-        policy.cpuUtilization &&
-        policy.cpuUtilization.predictiveMethod;
-
-      this.editPolicy = () => {
-        $uibModal.open({
-          templateUrl: require('./modal/upsertAutoscalingPolicy.modal.html'),
-          controller: 'gceUpsertAutoscalingPolicyModalCtrl',
-          controllerAs: 'ctrl',
-          size: 'lg',
-          resolve: {
-            policy: () => this.policy,
-            application: () => this.application,
-            serverGroup: () => this.serverGroup,
-          },
-        });
-      };
+        scope.scaleInControlsConfigured =
+          policy.scaleInControl &&
+          policy.scaleInControl.timeWindowSec &&
+          policy.scaleInControl.maxScaledInReplicas &&
+          (policy.scaleInControl.maxScaledInReplicas.percent || policy.scaleInControl.maxScaledInReplicas.fixed);
 
-      this.deletePolicy = () => {
-        const taskMonitor = {
-          application: this.application,
-          title: `Deleting autoscaler for ${this.serverGroup.name}`,
+        if (scope.scaleInControlsConfigured) {
+          scope.maxScaledInReplicasMessage = policy.scaleInControl.maxScaledInReplicas.percent
+            ? `${policy.scaleInControl.maxScaledInReplicas.percent}%`
+            : `${policy.scaleInControl.maxScaledInReplicas.fixed}`;
+
+          scope.timeWindowSecMessage = `${policy.scaleInControl.timeWindowSec} seconds`;
+        }
+
+        scope.predictiveAutoscalingEnabled =
+          GCEProviderSettings.feature.predictiveAutoscaling &&
+          policy.cpuUtilization &&
+          policy.cpuUtilization.predictiveMethod;
+
+        scope.editPolicy = () => {
+          $uibModal.open({
+            templateUrl: require('./modal/upsertAutoscalingPolicy.modal.html'),
+            controller: 'gceUpsertAutoscalingPolicyModalCtrl',
+            controllerAs: 'ctrl',
+            size: 'lg',
+            resolve: {
+              policy: () => scope.policy,
+              application: () => scope.application,
+              serverGroup: () => scope.serverGroup,
+            },
+          });
         };
 
-        ConfirmationModalService.confirm({
-          header: `Really delete autoscaler for ${this.serverGroup.name}?`,
-          buttonText: 'Delete autoscaler',
-          account: this.serverGroup.account,
-          taskMonitorConfig: taskMonitor,
-          submitMethod: () => gceAutoscalingPolicyWriter.deleteAutoscalingPolicy(this.application, this.serverGroup),
-        });
+        scope.deletePolicy = () => {
+          const taskMonitor = {
+            application: scope.application,
+            title: `Deleting autoscaler for ${scope.serverGroup.name}`,
+          };
+
+          ConfirmationModalService.confirm({
+            header: `Really delete autoscaler for ${scope.serverGroup.name}?`,
+            buttonText: 'Delete autoscaler',
+            account: scope.serverGroup.account,
+            taskMonitorConfig: taskMonitor,
+            submitMethod: () =>
+              gceAutoscalingPolicyWriter.deleteAutoscalingPolicy(scope.application, scope.serverGroup),
+          });
+        };
       };
     },
   ],

package/src/serverGroup/details/autoscalingPolicy/modal/GceScaleInControls.tsx

@@ -35,10 +35,19 @@ const defaultScaleInControl: IGceScaleInControl = {
 
 function GceScaleInControls({ policy, updatePolicy }: IGceScaleInControlsProps) {
   function updateScaleInControl(scaleInControl: IGceScaleInControl) {
-    updatePolicy({
-      ...policy,
-      scaleInControl,
-    });
+    const scaleInControlExist = Object.keys(scaleInControl).length;
+    if (scaleInControlExist) {
+      updatePolicy({
+        ...policy,
+        scaleInControl,
+      });
+    } else {
+      const updatedPolicy: any = policy;
+      delete updatedPolicy['scaleInControl'];
+      updatePolicy({
+        ...updatedPolicy,
+      });
+    }
   }
 
   function getMaxReplicasUnit(): maxReplicasUnit {

package/src/serverGroup/details/autoscalingPolicy/modal/upsertAutoscalingPolicy.modal.controller.js

@@ -4,9 +4,12 @@ import { module } from 'angular';
 import { cloneDeep } from 'lodash';
 
 import { TaskMonitor } from '@spinnaker/core';
+
 import { GOOGLE_AUTOSCALINGPOLICY_AUTOSCALINGPOLICY_WRITE_SERVICE } from '../../../../autoscalingPolicy/autoscalingPolicy.write.service';
 import { GOOGLE_AUTOSCALINGPOLICY_COMPONENTS_BASICSETTINGS_BASICSETTINGS_COMPONENT } from '../../../../autoscalingPolicy/components/basicSettings/basicSettings.component';
 import { GOOGLE_AUTOSCALINGPOLICY_COMPONENTS_METRICSETTINGS_METRICSETTINGS_COMPONENT } from '../../../../autoscalingPolicy/components/metricSettings/metricSettings.component';
+import { GOOGLE_AUTOSCALINGPOLICY_COMPONENTS_SCALINGSCHEDULES_SCALINGSCHEDULES_COMPONENT } from '../../../../autoscalingPolicy/components/scalingSchedules/scalingSchedules.component';
+import { GOOGLE_SERVERGROUP_CONFIGURE_SERVERGROUP_CONFIGURE_GCE_MODULE } from '../../../configure/serverGroup.configure.gce.module';
 
 import './upsertAutoscalingPolicy.modal.less';
 
@@ -17,6 +20,7 @@ module(GOOGLE_SERVERGROUP_DETAILS_AUTOSCALINGPOLICY_MODAL_UPSERTAUTOSCALINGPOLIC
   GOOGLE_AUTOSCALINGPOLICY_AUTOSCALINGPOLICY_WRITE_SERVICE,
   GOOGLE_AUTOSCALINGPOLICY_COMPONENTS_BASICSETTINGS_BASICSETTINGS_COMPONENT,
   GOOGLE_AUTOSCALINGPOLICY_COMPONENTS_METRICSETTINGS_METRICSETTINGS_COMPONENT,
+  GOOGLE_AUTOSCALINGPOLICY_COMPONENTS_SCALINGSCHEDULES_SCALINGSCHEDULES_COMPONENT,
 ]).controller('gceUpsertAutoscalingPolicyModalCtrl', [
   'policy',
   'application',

package/src/serverGroup/details/autoscalingPolicy/modal/upsertAutoscalingPolicy.modal.html

@@ -17,6 +17,13 @@
         update-policy="ctrl.updatePolicy"
       >
       </gce-autoscaling-policy-metric-settings>
+      <h4 class="section-heading">Scaling Schedules</h4>
+      <div class="section-body">
+        <gce-autoscaling-policy-scaling-schedules
+          policy="ctrl.policy"
+          update-policy="ctrl.updatePolicy"
+        ></gce-autoscaling-policy-scaling-schedules>
+      </div>
     </div>
   </ng-form>
   <div class="modal-footer">

package/src/serverGroup/details/autoscalingPolicy/modal/upsertAutoscalingPolicy.modal.less

@@ -3,7 +3,8 @@
     margin-top: 4px;
   }
 
-  input.form-control {
+  input.form-control,
+  select.form-control {
     margin-bottom: 2px;
     width: 100%;
   }