remove namespace

jenkinsci · Nov 21, 2017 · 4e10ca4 · 4e10ca4
1 parent 2d02a3b
commit 4e10ca4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 16 deletions.
diff --git a/...main/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/ContainerLogStepExecution.java b/...main/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/ContainerLogStepExecution.java
@@ -35,22 +35,9 @@ public class ContainerLogStepExecution extends SynchronousNonBlockingStepExecuti
     private static final long serialVersionUID = 5588861066775717487L;
     private static final transient Logger LOGGER = Logger.getLogger(ContainerLogStepExecution.class.getName());
 
-    @SuppressFBWarnings(value = "SE_TRANSIENT_FIELD_NOT_RESTORED", justification = "not needed on deserialization")
-    private transient final ContainerLogStep step;
+    private final ContainerLogStep step;
     private transient KubernetesClient client;
 
-    @Override
-    // TODO Revisit for JENKINS-40161
-    public void onResume() {
-        super.onResume();
-        LOGGER.log(Level.FINE, "onResume");
-        try {
-            KubernetesNodeContext nodeContext = new KubernetesNodeContext(getContext());
-            client = nodeContext.connectToCloud();
-        } catch (Exception e) {
-            ContainerLogStepExecution.this.getContext().onFailure(e);
-        }
-    }
     ContainerLogStepExecution(ContainerLogStep step, StepContext context) {
         super(context);
         this.step = step;

diff --git a/...ources/org/csanchez/jenkins/plugins/kubernetes/pipeline/getContainerLogWithRestart.groovy b/...ources/org/csanchez/jenkins/plugins/kubernetes/pipeline/getContainerLogWithRestart.groovy
@@ -1,5 +1,5 @@
 //noinspection GrPackage
-podTemplate(label: 'mypod', namespace: 'default')
+podTemplate(label: 'mypod')
 {
     node ('mypod') {
         stage('container log') {

diff --git a/.../jenkins/plugins/kubernetes/pipeline/runInPodWithRestartWithMultipleContainerCalls.groovy b/.../jenkins/plugins/kubernetes/pipeline/runInPodWithRestartWithMultipleContainerCalls.groovy
@@ -1,6 +1,6 @@
 package org.csanchez.jenkins.plugins.kubernetes.pipeline
 
-podTemplate(label: 'mypod', namespace: 'default', idleMinutes: 0, containers: [
+podTemplate(label: 'mypod', idleMinutes: 0, containers: [
         containerTemplate(name: 'busybox', image: 'busybox', ttyEnabled: true, command: '/bin/cat'),
 ]) {