Merge pull request #2212 from yue9944882/cherrypick-15-regen-openapi

Cherrypick release-15 #2206: Automated Generate from openapi release-1.23

Author: k8s-ci-robot

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);
   }