From 6c54b61d443907c396055d0f8e1bd2df9ab58405 Mon Sep 17 00:00:00 2001 From: maggieneterval Date: Thu, 7 Feb 2019 17:47:22 -0500 Subject: [PATCH] fix(kubernetes): do not override `location` and `replicas` in new Scale Manifest stage --- .../stages/scaleManifest/scaleManifestConfig.controller.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/scripts/modules/kubernetes/src/v2/pipelines/stages/scaleManifest/scaleManifestConfig.controller.ts b/app/scripts/modules/kubernetes/src/v2/pipelines/stages/scaleManifest/scaleManifestConfig.controller.ts index 38fd06cadda..c5e80d9c635 100644 --- a/app/scripts/modules/kubernetes/src/v2/pipelines/stages/scaleManifest/scaleManifestConfig.controller.ts +++ b/app/scripts/modules/kubernetes/src/v2/pipelines/stages/scaleManifest/scaleManifestConfig.controller.ts @@ -1,4 +1,5 @@ import { IController, IScope } from 'angular'; +import { defaults } from 'lodash'; import { IManifestSelector } from 'kubernetes/v2/manifest/selector/IManifestSelector'; import { Application } from '@spinnaker/core'; @@ -14,12 +15,12 @@ export class KubernetesV2ScaleManifestConfigCtrl implements IController { location: '', account: '', }; - Object.assign(this.$scope.stage, defaultSelection); + defaults(this.$scope.stage, defaultSelection); const defaultOptions: any = { replicas: null, app: this.application.name, }; - Object.assign(this.$scope.stage, defaultOptions); + defaults(this.$scope.stage, defaultOptions); this.$scope.stage.cloudProvider = 'kubernetes'; } }