diff --git a/app/scripts/modules/google/src/serverGroup/configure/serverGroupConfiguration.service.js b/app/scripts/modules/google/src/serverGroup/configure/serverGroupConfiguration.service.js index 09bc6bb8f5a..297154a713f 100644 --- a/app/scripts/modules/google/src/serverGroup/configure/serverGroupConfiguration.service.js +++ b/app/scripts/modules/google/src/serverGroup/configure/serverGroupConfiguration.service.js @@ -369,7 +369,7 @@ module.exports = angular const regions = command.backingData.credentialsKeyedByAccount[command.credentials].regions; if (_.isArray(regions)) { filteredData.zones = _.find(regions, { name: command.region }).zones; - filteredData.truncatedZones = _.takeRight(filteredData.zones.sort(), 3); + filteredData.automaticZones = filteredData.zones.slice().sort(); } else { // TODO(duftler): Remove this once we finish deprecating the old style regions/zones in clouddriver GCE credentials. filteredData.zones = regions[command.region]; diff --git a/app/scripts/modules/google/src/serverGroup/configure/wizard/zones/zoneSelector.directive.html b/app/scripts/modules/google/src/serverGroup/configure/wizard/zones/zoneSelector.directive.html index 88f731d8fdd..d4ff1a5715f 100644 --- a/app/scripts/modules/google/src/serverGroup/configure/wizard/zones/zoneSelector.directive.html +++ b/app/scripts/modules/google/src/serverGroup/configure/wizard/zones/zoneSelector.directive.html @@ -19,7 +19,7 @@ Server group will be available in:

diff --git a/app/scripts/modules/google/src/serverGroup/serverGroup.transformer.js b/app/scripts/modules/google/src/serverGroup/serverGroup.transformer.js index 942e6e71e41..80e3f45b59d 100644 --- a/app/scripts/modules/google/src/serverGroup/serverGroup.transformer.js +++ b/app/scripts/modules/google/src/serverGroup/serverGroup.transformer.js @@ -29,7 +29,7 @@ module.exports = angular } function convertServerGroupCommandToDeployConfiguration(base) { - const truncatedZones = base.backingData.filtered.truncatedZones; + const automaticZones = base.backingData.filtered.automaticZones; // use defaults to avoid copying the backingData, which is huge and expensive to copy over const command = defaults({ backingData: [], viewState: [] }, base); @@ -40,7 +40,7 @@ module.exports = angular command.disableTraffic = !command.enableTraffic; command.cloudProvider = 'gce'; command.availabilityZones = {}; - command.availabilityZones[command.region] = base.zone ? [base.zone] : truncatedZones; + command.availabilityZones[command.region] = base.zone ? [base.zone] : automaticZones; command.account = command.credentials; delete command.viewState; delete command.backingData;