Merge pull request #1253 from Vlatombe/websocket-injection

jenkinsci · Oct 26, 2022 · 562bba6 · 562bba6
2 parents 8932362 + 80eaa79
commit 562bba6
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesSlave.java b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesSlave.java
@@ -1,5 +1,6 @@
 package org.csanchez.jenkins.plugins.kubernetes;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
 import java.io.IOException;
 import java.util.HashSet;
 import java.util.Objects;
@@ -556,13 +557,14 @@ public KubernetesSlave build() throws IOException, Descriptor.FormException {
                     nodeDescription == null ? podTemplate.getName() : nodeDescription,
                     cloud.name,
                     label == null ? podTemplate.getLabel() : label,
-                    computerLauncher == null ? defaultLauncher() : computerLauncher,
+                    decorateLauncher(computerLauncher == null ? new KubernetesLauncher(cloud.getJenkinsTunnel(), null) : computerLauncher),
                     retentionStrategy == null ? determineRetentionStrategy() : retentionStrategy);
         }
 
-        private KubernetesLauncher defaultLauncher() {
-            KubernetesLauncher launcher = new KubernetesLauncher(cloud.getJenkinsTunnel(), null);
-            launcher.setWebSocket(cloud.isWebSocket());
+        private ComputerLauncher decorateLauncher(@NonNull ComputerLauncher launcher) {
+            if (launcher instanceof KubernetesLauncher) {
+                ((KubernetesLauncher) launcher).setWebSocket(cloud.isWebSocket());
+            }
             return launcher;
         }