From eb301a87c941f1811ad3cf6847252c97714406a9 Mon Sep 17 00:00:00 2001 From: Maggie Neterval Date: Tue, 29 Oct 2019 14:23:37 -0400 Subject: [PATCH] feat(kubernetes): permit multiple ReplicaSets to be deployed with a single rollout strategy config (#4126) --- .../manifest/KubernetesDeployManifestOperation.java | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesDeployManifestOperation.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesDeployManifestOperation.java index 19e3abde1a2..6498c484939 100644 --- a/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesDeployManifestOperation.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesDeployManifestOperation.java @@ -98,8 +98,6 @@ public OperationResult operate(List _unused) { Set boundArtifacts = new HashSet<>(); - validateManifestsForRolloutStrategies(inputManifests); - for (KubernetesManifest manifest : inputManifests) { if (credentials.getKindRegistry().getKindProperties(manifest.getKind()).isNamespaced()) { if (!StringUtils.isEmpty(description.getNamespaceOverride())) { @@ -251,15 +249,6 @@ private void applyTraffic(KubernetesManifestTraffic traffic, KubernetesManifest traffic.getLoadBalancers().forEach(l -> attachLoadBalancer(l, target)); } - private void validateManifestsForRolloutStrategies(List manifests) { - long numReplicaSets = - manifests.stream().filter(m -> m.getKind().equals(KubernetesKind.REPLICA_SET)).count(); - if (description.getStrategy() != null && numReplicaSets != 1) { - throw new RuntimeException( - "Spinnaker can manage traffic for one ReplicaSet only. Please deploy one ReplicaSet manifest or disable rollout strategies."); - } - } - private void attachLoadBalancer(String loadBalancerName, KubernetesManifest target) { Pair name; try {