feat(kubernetes): permit multiple ReplicaSets to be deployed with a s…

…ingle rollout strategy config (#7574)
spinnaker · Oct 29, 2019 · 2c100b6 · 2c100b6
1 parent 03cb78c
commit 2c100b6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 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
@@ -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/...pts/modules/kubernetes/src/v2/pipelines/stages/deployManifest/deployManifest.validator.ts b/...pts/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]),