From 2c100b6b16966b484133125da07f8aff7088dc1c Mon Sep 17 00:00:00 2001
From: Maggie Neterval <mneterval@google.com>
Date: Tue, 29 Oct 2019 14:20:41 -0400
Subject: [PATCH] feat(kubernetes): permit multiple ReplicaSets to be deployed
 with a single rollout strategy config (#7574)

---
 .../modules/kubernetes/src/shared/help/kubernetes.help.ts      | 2 +-
 .../stages/deployManifest/deployManifest.validator.ts          | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/scripts/modules/kubernetes/src/shared/help/kubernetes.help.ts b/app/scripts/modules/kubernetes/src/shared/help/kubernetes.help.ts
index b4ceed62bf0..9d60e1d0ebd 100644
--- a/app/scripts/modules/kubernetes/src/shared/help/kubernetes.help.ts
+++ b/app/scripts/modules/kubernetes/src/shared/help/kubernetes.help.ts
@@ -203,7 +203,7 @@ const helpContents: { [key: string]: string } = {
       </p>
   `,
   'kubernetes.manifest.rolloutStrategyOptions': `
-    <p>Allow Spinnaker to associate your workload with one or more Services and manage traffic based on your selected rollout strategy options. Valid for ReplicaSets only.</p>
+    <p>Allow Spinnaker to associate each ReplicaSet deployed in this stage with one or more Services and manage traffic based on your selected rollout strategy options.</p>
   `,
   'kubernetes.manifest.rolloutStrategy': `
     <p>The rollout strategy tells Spinnaker what to do with the previous version(s) of the ReplicaSet in the cluster.</p>
diff --git a/app/scripts/modules/kubernetes/src/v2/pipelines/stages/deployManifest/deployManifest.validator.ts b/app/scripts/modules/kubernetes/src/v2/pipelines/stages/deployManifest/deployManifest.validator.ts
index dc1e80707b0..47b99c0f45b 100644
--- a/app/scripts/modules/kubernetes/src/v2/pipelines/stages/deployManifest/deployManifest.validator.ts
+++ b/app/scripts/modules/kubernetes/src/v2/pipelines/stages/deployManifest/deployManifest.validator.ts
@@ -21,9 +21,6 @@ export const deployManifestValidators = (): IValidatorConfig[] => {
         if (enabled && stage.source === 'text') {
           const manifests = get(stage, 'manifests', []);
           const replicaSetManifests = manifests.filter(m => m.kind === 'ReplicaSet');
-          if (replicaSetManifests.length !== 1) {
-            return 'Spinnaker can manage traffic for one ReplicaSet only. Please enter one ReplicaSet manifest or disable rollout strategies.';
-          }
           const strategy = get(stage, 'trafficManagement.options.strategy');
           const maxVersionHistory = parseInt(
             get(replicaSetManifests, [0, 'metadata', 'annotations', MAX_VERSION_HISTORY_ANNOTATION]),