fixes compile

Signed-off-by: yue9944882 <[email protected]>

Author: yue9944882

examples/examples-release-15/src/main/java/io/kubernetes/client/examples/YamlExample.java

@@ -22,8 +22,6 @@
 import io.kubernetes.client.openapi.models.V1PodBuilder;
 import io.kubernetes.client.openapi.models.V1Service;
 import io.kubernetes.client.openapi.models.V1ServiceBuilder;
-import io.kubernetes.client.openapi.models.V1ServicePort;
-import io.kubernetes.client.openapi.models.V1ServiceSpec;
 import io.kubernetes.client.util.Config;
 import io.kubernetes.client.util.Yaml;
 import java.io.File;
@@ -63,10 +61,10 @@ public static void main(String[] args) throws IOException, ApiException, ClassNo
             .withName("aservice")
             .endMetadata()
             .withNewSpec()
-            .withSessionAffinity(V1ServiceSpec.SessionAffinityEnum.CLIENTIP)
-            .withType(V1ServiceSpec.TypeEnum.NODEPORT)
+            .withSessionAffinity("ClientIP")
+            .withType("NodePort")
             .addNewPort()
-            .withProtocol(V1ServicePort.ProtocolEnum.TCP)
+            .withProtocol("TCP")
             .withName("client")
             .withPort(8008)
             .withNodePort(8080)

extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlTaint.java

@@ -12,15 +12,10 @@
 */
 package io.kubernetes.client.extended.kubectl;
 
-import static io.kubernetes.client.openapi.models.V1Taint.EffectEnum.NOEXECUTE;
-import static io.kubernetes.client.openapi.models.V1Taint.EffectEnum.NOSCHEDULE;
-import static io.kubernetes.client.openapi.models.V1Taint.EffectEnum.PREFERNOSCHEDULE;
-
 import io.kubernetes.client.extended.kubectl.exception.KubectlException;
 import io.kubernetes.client.openapi.ApiException;
 import io.kubernetes.client.openapi.apis.CoreV1Api;
 import io.kubernetes.client.openapi.models.V1Node;
-import io.kubernetes.client.openapi.models.V1Taint;
 import io.kubernetes.client.util.taints.Taints;
 import io.kubernetes.client.util.taints.Taints.TaintsBuilder;
 import java.io.IOException;
@@ -89,15 +84,15 @@ private V1Node executeInternal() throws KubectlException, ApiException, IOExcept
     return v1.replaceNode(name, node, null, null, null, null);
   }
 
-  private V1Taint.EffectEnum makeEffect(String effect) throws KubectlException {
-    if (effect.equals(NOSCHEDULE.toString())) {
-      return NOSCHEDULE;
+  private Taints.Effect makeEffect(String effect) throws KubectlException {
+    if (effect.equals(Taints.Effect.NO_SCHEDULE.toString())) {
+      return Taints.Effect.NO_SCHEDULE;
     }
-    if (effect.equals(PREFERNOSCHEDULE.toString())) {
-      return PREFERNOSCHEDULE;
+    if (effect.equals(Taints.Effect.PREFER_NO_SCHEDULE.toString())) {
+      return Taints.Effect.PREFER_NO_SCHEDULE;
     }
-    if (effect.equals(NOEXECUTE.toString())) {
-      return NOEXECUTE;
+    if (effect.equals(Taints.Effect.NO_EXECUTE.toString())) {
+      return Taints.Effect.NO_EXECUTE;
     }
     throw new KubectlException("Unknown effect: " + effect);
   }

util/src/main/java/io/kubernetes/client/util/CSRUtils.java

@@ -68,7 +68,7 @@ public static void approve(ApiClient apiClient, String csrObjName) throws ApiExc
         .getStatus()
         .addConditionsItem(
             new V1CertificateSigningRequestCondition()
-                .type(V1CertificateSigningRequestCondition.TypeEnum.APPROVED)
+                .type("Approved")
                 .status("True")
                 .reason("Kubernetes Java Client")
                 .lastTransitionTime(now)

util/src/main/java/io/kubernetes/client/util/Yaml.java

@@ -16,7 +16,6 @@
 import io.kubernetes.client.common.KubernetesType;
 import io.kubernetes.client.custom.IntOrString;
 import io.kubernetes.client.custom.Quantity;
-import io.kubernetes.client.openapi.models.V1Container;
 import io.kubernetes.client.openapi.models.V1JSONSchemaProps;
 import java.io.File;
 import java.io.FileReader;
@@ -275,15 +274,6 @@ public CustomRepresenter() {
       this.representers.put(byte[].class, new RepresentByteArray());
       this.representers.put(Quantity.class, new RepresentQuantity());
       this.representers.put(OffsetDateTime.class, new RepresentDateTime());
-      this.representers.put(V1Container.ImagePullPolicyEnum.class, new RepresentImagePull());
-    }
-
-    private class RepresentImagePull implements Represent {
-      @Override
-      public Node representData(Object data) {
-        return CustomRepresenter.this.representData(
-            ((V1Container.ImagePullPolicyEnum) data).getValue());
-      }
     }
 
     private class RepresentDateTime implements Represent {

util/src/main/java/io/kubernetes/client/util/taints/Taints.java

@@ -18,7 +18,26 @@
 import java.util.Iterator;
 
 public class Taints {
-  public static V1Taint findTaint(V1Node node, String key, V1Taint.EffectEnum effect) {
+
+  public enum Effect {
+    NO_SCHEDULE {
+      public String toString() {
+        return "NoSchedule";
+      }
+    },
+    PREFER_NO_SCHEDULE {
+      public String toString() {
+        return "PreferNoSchedule";
+      }
+    },
+    NO_EXECUTE {
+      public String toString() {
+        return "NoExcute";
+      }
+    }
+  }
+
+  public static V1Taint findTaint(V1Node node, String key, Effect effect) {
     for (V1Taint taint : node.getSpec().getTaints()) {
       if (taint.getKey().equals(key) && taint.getEffect().equals(effect)) {
         return taint;
@@ -44,7 +63,7 @@ public static class TaintsBuilder {
      * @param key The key for the taint
      * @param effect The effect
      */
-    public TaintsBuilder addTaint(String key, V1Taint.EffectEnum effect) {
+    public TaintsBuilder addTaint(String key, Effect effect) {
       return addTaint(key, null, effect);
     }
 
@@ -54,11 +73,11 @@ public TaintsBuilder addTaint(String key, V1Taint.EffectEnum effect) {
      * @param key The key for the taint
      * @param effect The effect
      */
-    public TaintsBuilder addTaint(String key, String value, V1Taint.EffectEnum effect) {
+    public TaintsBuilder addTaint(String key, String value, Effect effect) {
       V1Taint taint = new V1Taint();
       taint.setKey(key);
       taint.setValue(value);
-      taint.setEffect(effect);
+      taint.setEffect(effect.toString());
       if (node.getSpec() == null) {
         node.setSpec(new V1NodeSpec());
       }
@@ -72,7 +91,7 @@ public TaintsBuilder addTaint(String key, String value, V1Taint.EffectEnum effec
      * @param key The key for the taint
      * @param effect The effect
      */
-    public TaintsBuilder updateTaint(String key, String value, V1Taint.EffectEnum effect) {
+    public TaintsBuilder updateTaint(String key, String value, Effect effect) {
       V1Taint taint = findTaint(node, key, effect);
       taint.setValue(value);
       return this;
@@ -81,7 +100,7 @@ public TaintsBuilder updateTaint(String key, String value, V1Taint.EffectEnum ef
     /**
      * Remove all taints matching a specified key
      *
-     * @param The key for the taint(s) to remove
+     * @param key: The key for the taint(s) to remove
      */
     public TaintsBuilder removeTaint(String key) {
       if (node.getSpec() == null) {
@@ -103,7 +122,7 @@ public TaintsBuilder removeTaint(String key) {
      * @param key They key to match
      * @param effect The effect to match
      */
-    public TaintsBuilder removeTaint(String key, V1Taint.EffectEnum effect) {
+    public TaintsBuilder removeTaint(String key, Effect effect) {
       if (node.getSpec() == null) {
         return this;
       }

util/src/test/java/io/kubernetes/client/util/taints/TaintsTest.java

@@ -12,9 +12,6 @@
 */
 package io.kubernetes.client.util.taints;
 
-import static io.kubernetes.client.openapi.models.V1Taint.EffectEnum.NOEXECUTE;
-import static io.kubernetes.client.openapi.models.V1Taint.EffectEnum.NOSCHEDULE;
-import static io.kubernetes.client.openapi.models.V1Taint.EffectEnum.PREFERNOSCHEDULE;
 import static io.kubernetes.client.util.taints.Taints.taints;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
@@ -26,36 +23,38 @@ public class TaintsTest {
   @Test
   public void testAddTaints() {
     V1Node node = new V1Node();
-    taints(node).addTaint("key1", NOSCHEDULE).addTaint("key2", PREFERNOSCHEDULE);
+    taints(node)
+        .addTaint("key1", Taints.Effect.NO_SCHEDULE)
+        .addTaint("key2", Taints.Effect.PREFER_NO_SCHEDULE);
 
-    assertNotNull(Taints.findTaint(node, "key1", NOSCHEDULE));
-    assertNotNull(Taints.findTaint(node, "key2", PREFERNOSCHEDULE));
+    assertNotNull(Taints.findTaint(node, "key1", Taints.Effect.NO_SCHEDULE));
+    assertNotNull(Taints.findTaint(node, "key2", Taints.Effect.PREFER_NO_SCHEDULE));
   }
 
   @Test
   public void testRemoveTaints() {
     V1Node node = new V1Node();
     taints(node)
-        .addTaint("key1", NOSCHEDULE)
-        .addTaint("key1", PREFERNOSCHEDULE)
-        .addTaint("key1", NOEXECUTE)
-        .addTaint("key2", PREFERNOSCHEDULE)
-        .addTaint("key3", NOSCHEDULE)
-        .addTaint("key3", NOEXECUTE);
+        .addTaint("key1", Taints.Effect.NO_SCHEDULE)
+        .addTaint("key1", Taints.Effect.PREFER_NO_SCHEDULE)
+        .addTaint("key1", Taints.Effect.NO_EXECUTE)
+        .addTaint("key2", Taints.Effect.PREFER_NO_SCHEDULE)
+        .addTaint("key3", Taints.Effect.NO_SCHEDULE)
+        .addTaint("key3", Taints.Effect.NO_EXECUTE);
 
     taints(node)
         // Remove all
         .removeTaint("key1")
         // Shouldn't remove, 'effect' is different.
-        .removeTaint("key2", NOSCHEDULE)
+        .removeTaint("key2", Taints.Effect.NO_SCHEDULE)
         // Remove matching
-        .removeTaint("key3", NOEXECUTE);
+        .removeTaint("key3", Taints.Effect.NO_EXECUTE);
 
-    assertNull(Taints.findTaint(node, "key1", NOSCHEDULE));
-    assertNull(Taints.findTaint(node, "key1", PREFERNOSCHEDULE));
-    assertNull(Taints.findTaint(node, "key1", NOEXECUTE));
-    assertNull(Taints.findTaint(node, "key3", NOEXECUTE));
-    assertNotNull(Taints.findTaint(node, "key2", PREFERNOSCHEDULE));
-    assertNotNull(Taints.findTaint(node, "key3", NOSCHEDULE));
+    assertNull(Taints.findTaint(node, "key1", Taints.Effect.NO_SCHEDULE));
+    assertNull(Taints.findTaint(node, "key1", Taints.Effect.PREFER_NO_SCHEDULE));
+    assertNull(Taints.findTaint(node, "key1", Taints.Effect.NO_EXECUTE));
+    assertNull(Taints.findTaint(node, "key3", Taints.Effect.NO_EXECUTE));
+    assertNotNull(Taints.findTaint(node, "key2", Taints.Effect.PREFER_NO_SCHEDULE));
+    assertNotNull(Taints.findTaint(node, "key3", Taints.Effect.NO_SCHEDULE));
   }
 }