diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesDeployManifestConverter.java b/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesDeployManifestConverter.java index f7a3c93c1ab..c6f1751618b 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesDeployManifestConverter.java +++ b/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesDeployManifestConverter.java @@ -48,7 +48,7 @@ public class KubernetesDeployManifestConverter extends AbstractAtomicOperationsC @Override public AtomicOperation convertOperation(Map input) { - return new KubernetesDeployManifestOperation(convertDescription(input), registry, artifactProvider, artifactDownloader); + return new KubernetesDeployManifestOperation(convertDescription(input), registry, artifactProvider); } @Override diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesDeployManifestOperation.java b/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesDeployManifestOperation.java index b7a7d35c595..a90c3f1bf49 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesDeployManifestOperation.java +++ b/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesDeployManifestOperation.java @@ -17,7 +17,6 @@ package com.netflix.spinnaker.clouddriver.kubernetes.v2.op.manifest; -import com.netflix.spinnaker.clouddriver.artifacts.ArtifactDownloader; import com.netflix.spinnaker.clouddriver.data.task.Task; import com.netflix.spinnaker.clouddriver.data.task.TaskRepository; import com.netflix.spinnaker.clouddriver.kubernetes.KubernetesCloudProvider; @@ -41,29 +40,24 @@ import com.netflix.spinnaker.moniker.Namer; import org.apache.commons.lang.StringUtils; -import java.io.IOException; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; -import static com.netflix.spinnaker.clouddriver.kubernetes.v2.description.manifest.KubernetesDeployManifestDescription.Source.text; - public class KubernetesDeployManifestOperation implements AtomicOperation { private final KubernetesDeployManifestDescription description; private final KubernetesV2Credentials credentials; - private final ArtifactDownloader artifactDownloader; private final ArtifactProvider provider; private final Namer namer; private final KubernetesResourcePropertyRegistry registry; private static final String OP_NAME = "DEPLOY_KUBERNETES_MANIFEST"; - public KubernetesDeployManifestOperation(KubernetesDeployManifestDescription description, KubernetesResourcePropertyRegistry registry, ArtifactProvider provider, ArtifactDownloader artifactDownloader) { + public KubernetesDeployManifestOperation(KubernetesDeployManifestDescription description, KubernetesResourcePropertyRegistry registry, ArtifactProvider provider) { this.description = description; this.credentials = (KubernetesV2Credentials) description.getCredentials().getCredentials(); this.registry = registry; this.provider = provider; - this.artifactDownloader = artifactDownloader; this.namer = NamerRegistry.lookup() .withProvider(KubernetesCloudProvider.getID()) .withAccount(description.getCredentials().getName()) @@ -78,23 +72,7 @@ private static Task getTask() { public OperationResult operate(List _unused) { getTask().updateStatus(OP_NAME, "Beginning deployment of manifest..."); - KubernetesManifest manifest; - KubernetesDeployManifestDescription.Source source = description.getSource(); - source = source == null ? text : source; - switch (source) { - case text: - manifest = description.getManifest(); - break; - case artifact: - try { - manifest = artifactDownloader.downloadAsYaml(description.getManifestArtifact(), KubernetesManifest.class); - } catch (IOException e) { - throw new IllegalStateException("Failed to fetch artifact '" + description.getManifestArtifact() + "'", e); - } - break; - default: - throw new IllegalArgumentException("Unsupported artifact source: " + source); - } + KubernetesManifest manifest = description.getManifest(); if (StringUtils.isEmpty(manifest.getNamespace())) { manifest.setNamespace(credentials.getDefaultNamespace()); diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/KubernetesDeployManifestOperationSpec.groovy b/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/KubernetesDeployManifestOperationSpec.groovy index 5c953e85977..6502f85dc0d 100644 --- a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/KubernetesDeployManifestOperationSpec.groovy +++ b/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/KubernetesDeployManifestOperationSpec.groovy @@ -107,7 +107,7 @@ metadata: .withAccount(ACCOUNT) .setNamer(KubernetesManifest.class, new KubernetesManifestNamer()) - def deployOp = new KubernetesDeployManifestOperation(deployDescription, registry, null, null) + def deployOp = new KubernetesDeployManifestOperation(deployDescription, registry, null) return deployOp }