Merge pull request #1472 from Vlatombe/tidy-up-JENKINS-72314

jenkinsci · Nov 16, 2023 · fd176ec · fd176ec
2 parents d65bbc7 + cdcb8aa
commit fd176ec
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesCloud.java b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesCloud.java
@@ -148,7 +148,6 @@ public class KubernetesCloud extends Cloud implements PodTemplateGroup {
     public KubernetesCloud(String name) {
         super(name);
         setMaxRequestsPerHost(DEFAULT_MAX_REQUESTS_PER_HOST);
-        setPodLabels(null);
     }
 
     /**
@@ -457,7 +456,7 @@ public void setLabels(Map<String, String> labels) {
      */
     @NonNull
     public List<PodLabel> getPodLabels() {
-        return podLabels == null ? List.of() : podLabels;
+        return podLabels == null || podLabels.isEmpty() ? PodLabel.fromMap(DEFAULT_POD_LABELS) : podLabels;
     }
 
     /**
@@ -466,7 +465,9 @@ public List<PodLabel> getPodLabels() {
     @DataBoundSetter
     public void setPodLabels(@CheckForNull List<PodLabel> labels) {
         this.podLabels = new ArrayList<>();
-        this.podLabels.addAll(labels == null || labels.isEmpty() ? PodLabel.fromMap(DEFAULT_POD_LABELS) : labels);
+        if (labels != null) {
+            this.podLabels.addAll(labels);
+        }
     }
 
     /**
@@ -716,7 +717,7 @@ public boolean equals(Object o) {
                 Objects.equals(jenkinsUrl, that.jenkinsUrl) &&
                 Objects.equals(jenkinsTunnel, that.jenkinsTunnel) &&
                 Objects.equals(credentialsId, that.credentialsId) &&
-                Objects.equals(podLabels, that.podLabels) &&
+                Objects.equals(getPodLabels(), that.getPodLabels()) &&
                 Objects.equals(podRetention, that.podRetention) &&
                 Objects.equals(waitForPodSec, that.waitForPodSec) &&
                 useJenkinsProxy==that.useJenkinsProxy;
@@ -997,8 +998,8 @@ private Object readResolve() {
         if (waitForPodSec == null) {
             waitForPodSec = DEFAULT_WAIT_FOR_POD_SEC;
         }
-        if (podLabels == null) {
-            setPodLabels(labels == null ? null : PodLabel.fromMap(labels));
+        if (podLabels == null && labels != null) {
+            setPodLabels(PodLabel.fromMap(labels));
         }
         if (containerCap != null && containerCap == 0) {
             containerCap = null;