diff --git a/halconfig/settings.js b/halconfig/settings.js index c91a282f308..039ea00f95c 100644 --- a/halconfig/settings.js +++ b/halconfig/settings.js @@ -18,6 +18,7 @@ var mineCanaryEnabled = '{%features.mineCanary%}' === 'true'; var pipelineTemplatesEnabled = '{%features.pipelineTemplates%}' === 'true'; var reduxLoggerEnabled = '{%canary.reduxLogger%}' === 'true'; var showAllConfigsEnabled = '{%canary.showAllCanaryConfigs%}' === 'true'; +var dynamicRollbackTimeoutEnabled = '{%feature.dynamicRollbackTimeout%}' === 'true'; var slack = { botName: '{%notifications.slack.botName%}', enabled: '{%notifications.slack.enabled%}' === 'true', @@ -116,6 +117,7 @@ window.spinnakerSettings = { fiatEnabled: fiatEnabled, pipelineTemplates: pipelineTemplatesEnabled, roscoMode: true, + dynamicRollbackTimeout: dynamicRollbackTimeoutEnabled, }, gateUrl: gateHost, notifications: { diff --git a/packages/amazon/src/pipeline/stages/rollbackCluster/awsRollbackClusterStage.js b/packages/amazon/src/pipeline/stages/rollbackCluster/awsRollbackClusterStage.js index d28ebc21b31..f6dd1c3ff77 100644 --- a/packages/amazon/src/pipeline/stages/rollbackCluster/awsRollbackClusterStage.js +++ b/packages/amazon/src/pipeline/stages/rollbackCluster/awsRollbackClusterStage.js @@ -2,7 +2,7 @@ import { module } from 'angular'; -import { AccountService, Registry } from '@spinnaker/core'; +import { AccountService, Registry, SETTINGS } from '@spinnaker/core'; export const AMAZON_PIPELINE_STAGES_ROLLBACKCLUSTER_AWSROLLBACKCLUSTERSTAGE = 'spinnaker.amazon.pipeline.stage.rollbackClusterStage'; @@ -60,5 +60,7 @@ module(AMAZON_PIPELINE_STAGES_ROLLBACKCLUSTER_AWSROLLBACKCLUSTERSTAGE, []) if (!stage.regions.length && $scope.application.defaultRegions.aws) { stage.regions.push($scope.application.defaultRegions.aws); } + + $scope.viewState.dynamicRollbackTimeout = SETTINGS.feature.dynamicRollbackTimeout; }, ]); diff --git a/packages/amazon/src/pipeline/stages/rollbackCluster/rollbackClusterStage.html b/packages/amazon/src/pipeline/stages/rollbackCluster/rollbackClusterStage.html index cbd2cc8a890..2d25e4ea341 100644 --- a/packages/amazon/src/pipeline/stages/rollbackCluster/rollbackClusterStage.html +++ b/packages/amazon/src/pipeline/stages/rollbackCluster/rollbackClusterStage.html @@ -28,5 +28,16 @@ /> percent of instances are healthy. +