Merge branch 'master' into JENKINS-63847

Author: Vlatombe

README.md

@@ -494,6 +494,28 @@ pipeline {
 }
 ```
 
+Run steps within a container by default. Steps will be nested within an implicit `container(name) {...}` block instead
+of being executed in the jnlp container.
+
+```
+pipeline {
+  agent {
+    kubernetes {
+      defaultContainer 'maven'
+      yamlFile 'KubernetesPod.yaml'
+    }
+  }
+
+  stages {
+    stage('Run maven') {
+      steps {
+        sh 'mvn -version'
+      }
+    }
+  }
+}
+```
+
 Run the Pipeline or individual stage within a custom workspace - not required unless explicitly stated.
 
 ```

examples/kaniko-declarative.groovy

@@ -24,8 +24,9 @@ spec:
     image: gcr.io/kaniko-project/executor:debug-539ddefcae3fd6b411a95982a830d987f4214251
     imagePullPolicy: Always
     command:
-    - /busybox/cat
-    tty: true
+    - sleep
+    args:
+    - 9999999
     volumeMounts:
       - name: jenkins-docker-cfg
         mountPath: /kaniko/.docker

examples/kaniko-gcr.groovy

@@ -16,8 +16,9 @@ spec:
     image: gcr.io/kaniko-project/executor:debug
     imagePullPolicy: Always
     command:
-    - /busybox/cat
-    tty: true
+    - sleep
+    args:
+    - 9999999
     volumeMounts:
       - name: kaniko-secret
         mountPath: /secret

examples/multi-container.groovy

@@ -9,12 +9,16 @@ spec:
   containers:
   - name: maven
     image: maven:3.3.9-jdk-8-alpine
-    command: ['cat']
-    tty: true
+    command:
+    - sleep
+    args:
+    - 9999999
   - name: golang
     image: golang:1.8.0
-    command: ['cat']
-    tty: true
+    command:
+    - sleep
+    args:
+    - 9999999
 """
   ) {
 

examples/openshift-home-yaml.groovy

@@ -18,8 +18,8 @@ spec:
       value: /home/jenkins
   - name: maven
     image: maven:3.6.3-jdk-8
-    command: ['cat']
-    tty: true
+    command: ['sleep']
+    args: ['9999999']
     volumeMounts:
     - name: home-volume
       mountPath: /home/jenkins

examples/selenium.groovy

@@ -10,12 +10,12 @@ spec:
   containers:
   - name: maven-firefox
     image: maven:3.3.9-jdk-8-alpine
-    command: ['cat']
-    tty: true
+    command: ['sleep']
+    args: ['9999999']
   - name: maven-chrome
     image: maven:3.3.9-jdk-8-alpine
-    command: ['cat']
-    tty: true
+    command: ['sleep']
+    args: ['9999999']
   - name: selenium-hub
     image: selenium/hub:3.4.0
   - name: selenium-chrome

pom.xml

@@ -39,7 +39,7 @@
   </developers>
 
   <properties>
-    <revision>1.28.5</revision>
+    <revision>1.28.6</revision>
     <changelist>-SNAPSHOT</changelist>
     <!-- in minikube
     minikube ip | sed -e 's/\([0-9]*\.[0-9]*\.[0-9]*\).*/\1.1/' -->

src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesComputer.java

@@ -69,7 +69,7 @@ public void taskCompletedWithProblems(Executor executor, Queue.Task task, long d
 
     @Exported
     public List<Container> getContainers() throws KubernetesAuthException, IOException {
-        if(!Jenkins.get().hasPermission(Jenkins.ADMINISTER)) {
+        if(!Jenkins.get().hasPermission(Computer.EXTENDED_READ)) {
             LOGGER.log(Level.FINE, " Computer {0} getContainers, lack of admin permission, returning empty list", this);
             return Collections.emptyList();
         }
@@ -90,7 +90,7 @@ public List<Container> getContainers() throws KubernetesAuthException, IOExcepti
 
     @Exported
     public List<Event> getPodEvents() throws KubernetesAuthException, IOException {
-        if(!Jenkins.get().hasPermission(Jenkins.ADMINISTER)) {
+        if(!Jenkins.get().hasPermission(Computer.EXTENDED_READ)) {
             LOGGER.log(Level.FINE, " Computer {0} getPodEvents, lack of admin permission, returning empty list", this);
             return Collections.emptyList();
         }
@@ -124,7 +124,7 @@ public List<Event> getPodEvents() throws KubernetesAuthException, IOException {
 
     public void doContainerLog(@QueryParameter String containerId,
                                StaplerRequest req, StaplerResponse rsp) throws KubernetesAuthException, IOException {
-        Jenkins.get().checkPermission(Jenkins.ADMINISTER);
+        Jenkins.get().checkPermission(Computer.EXTENDED_READ);
 
         ByteBuffer outputStream = new ByteBuffer();
         KubernetesSlave slave = getNode();

src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesLauncher.java

@@ -138,8 +138,19 @@ public synchronized void launch(SlaveComputer computer, TaskListener listener) {
                 Metrics.metricRegistry().counter(MetricNames.CREATION_FAILED).inc();
                 int httpCode = e.getCode();
                 if (400 <= httpCode && httpCode < 500) { // 4xx
-                    runListener.getLogger().printf("ERROR: Unable to create pod %s %s/%s.%n%s%n", cloudName, namespace, pod.getMetadata().getName(), e.getMessage());
-                    PodUtils.cancelQueueItemFor(pod, e.getMessage());
+                    if (httpCode == 403 && e.getMessage().contains("is forbidden: exceeded quota")) {
+                        runListener.getLogger().printf("WARNING: Unable to create pod: %s %s/%s because kubernetes resource quota exceeded. %n%s%nRetrying...%n%n",
+                                cloudName, namespace, pod.getMetadata().getName(), e.getMessage());
+                    }
+                    else if (httpCode == 409 && e.getMessage().contains("Operation cannot be fulfilled on resourcequotas")) {
+                        // See: https://github.com/kubernetes/kubernetes/issues/67761 ; A retry usually works.
+                        runListener.getLogger().printf("WARNING: Unable to create pod: %s %s/%s because kubernetes resource quota update conflict. %n%s%nRetrying...%n%n",
+                                cloudName, namespace, pod.getMetadata().getName(), e.getMessage());
+                    }
+                    else {
+                        runListener.getLogger().printf("ERROR: Unable to create pod %s %s/%s.%n%s%n", cloudName, namespace, pod.getMetadata().getName(), e.getMessage());
+                        PodUtils.cancelQueueItemFor(pod, e.getMessage());
+                    }
                 } else if (500 <= httpCode && httpCode < 600) { // 5xx
                     LOGGER.log(FINE,"Kubernetes returned HTTP code {0} {1}. Retrying...", new Object[] {e.getCode(), e.getStatus()});
                 } else {

src/main/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/ContainerExecDecorator.java

@@ -363,7 +363,7 @@ private Proc doLaunch(boolean quiet, String[] cmdEnvs, OutputStream outputForCal
                 }
 
                 // Send to proc caller as well if they sent one
-                if (outputForCaller != null && !outputForCaller.equals(stream)) {
+                if (outputForCaller != null && !outputForCaller.equals(printStream)) {
                     stream = new TeeOutputStream(outputForCaller, stream);
                 }
                 ByteArrayOutputStream error = new ByteArrayOutputStream();