Revert "feat(kubectl): Extract interface for KubectlJobExecutor and u…

…se it. (#6076)" (#6092) This reverts commit bb04878.
spinnaker · Nov 14, 2023 · c4d1827 · c4d1827
1 parent c90e3e3
commit c4d1827
Show file tree

Hide file tree

Showing 14 changed files with 1,245 additions and 1,390 deletions.
diff --git a/...va/com/netflix/spinnaker/clouddriver/kubernetes/caching/agent/KubernetesCachingAgent.java b/...va/com/netflix/spinnaker/clouddriver/kubernetes/caching/agent/KubernetesCachingAgent.java
@@ -41,6 +41,7 @@
 import com.netflix.spinnaker.clouddriver.kubernetes.description.manifest.KubernetesKindProperties.ResourceScope;
 import com.netflix.spinnaker.clouddriver.kubernetes.description.manifest.KubernetesManifest;
 import com.netflix.spinnaker.clouddriver.kubernetes.description.manifest.KubernetesManifestAnnotater;
+import com.netflix.spinnaker.clouddriver.kubernetes.op.job.KubectlJobExecutor;
 import com.netflix.spinnaker.clouddriver.kubernetes.security.KubernetesCredentials;
 import com.netflix.spinnaker.clouddriver.kubernetes.security.KubernetesNamedAccountCredentials;
 import java.util.Arrays;
@@ -84,6 +85,7 @@ public abstract class KubernetesCachingAgent
 
   protected final int agentIndex;
   protected final int agentCount;
+  protected KubectlJobExecutor jobExecutor;
 
   @Getter protected String providerName = KubernetesCloudProvider.ID;
 

diff --git a/...ix/spinnaker/clouddriver/kubernetes/caching/view/provider/KubernetesInstanceProvider.java b/...ix/spinnaker/clouddriver/kubernetes/caching/view/provider/KubernetesInstanceProvider.java
@@ -23,7 +23,7 @@
 import com.netflix.spinnaker.clouddriver.kubernetes.caching.view.model.KubernetesInstance;
 import com.netflix.spinnaker.clouddriver.kubernetes.description.KubernetesCoordinates;
 import com.netflix.spinnaker.clouddriver.kubernetes.model.ContainerLog;
-import com.netflix.spinnaker.clouddriver.kubernetes.op.job.DefaultKubectlJobExecutor;
+import com.netflix.spinnaker.clouddriver.kubernetes.op.job.KubectlJobExecutor;
 import com.netflix.spinnaker.clouddriver.kubernetes.security.KubernetesCredentials;
 import com.netflix.spinnaker.clouddriver.model.InstanceProvider;
 import io.kubernetes.client.openapi.models.V1Container;
@@ -119,7 +119,7 @@ private ContainerLog getContainerLog(
       String containerLogs =
           credentials.logs(metadata.getNamespace(), metadata.getName(), containerName);
       return new ContainerLog(containerName, containerLogs);
-    } catch (DefaultKubectlJobExecutor.KubectlException e) {
+    } catch (KubectlJobExecutor.KubectlException e) {
       // Typically happens if the container/pod isn't running yet
       return new ContainerLog(containerName, e.getMessage());
     }

diff --git a/...etes/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/op/handler/CanDeploy.java b/...etes/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/op/handler/CanDeploy.java
@@ -21,7 +21,7 @@
 import com.netflix.spinnaker.clouddriver.kubernetes.description.manifest.KubernetesManifest;
 import com.netflix.spinnaker.clouddriver.kubernetes.description.manifest.KubernetesManifestStrategy;
 import com.netflix.spinnaker.clouddriver.kubernetes.op.OperationResult;
-import com.netflix.spinnaker.clouddriver.kubernetes.op.job.DefaultKubectlJobExecutor;
+import com.netflix.spinnaker.clouddriver.kubernetes.op.job.KubectlJobExecutor;
 import com.netflix.spinnaker.clouddriver.kubernetes.security.KubernetesCredentials;
 import com.netflix.spinnaker.clouddriver.kubernetes.security.KubernetesSelectorList;
 import io.kubernetes.client.openapi.models.V1DeleteOptions;
@@ -52,7 +52,7 @@ default OperationResult deploy(
               new V1DeleteOptions(),
               task,
               opName);
-        } catch (DefaultKubectlJobExecutor.KubectlException ignored) {
+        } catch (KubectlJobExecutor.KubectlException ignored) {
         }
         deployedManifest = credentials.deploy(manifest, task, opName);
         break;