upgrade the k8s java client to 18.0.1 to be compatible with Kubernetes 1.26

README.md

@@ -21,7 +21,7 @@ You should also add the dependency of Kubernetes official java SDK:
 <dependency>
     <groupId>io.kubernetes</groupId>
     <artifactId>client-java</artifactId>
-    <version>11.0.1</version>
+    <version>18.0.1</version>
 </dependency>
 ```
 

pom.xml

@@ -4,7 +4,7 @@
     <artifactId>client-java</artifactId>
     <packaging>jar</packaging>
     <name>client-java</name>
-    <version>1.4.0</version>
+    <version>1.8.1-SNAPSHOT</version>
     <url>https://github.com/openkruise/client-java</url>
     <description>Jave Client For OpenKruise</description>
 
@@ -225,7 +225,7 @@
         </dependency>
     </dependencies>
     <properties>
-        <k8s.client.version>14.0.0</k8s.client.version>
+        <k8s.client.version>18.0.1</k8s.client.version>
         <java.version>1.8</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
@@ -238,3 +238,4 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 </project>
+

src/main/java/io/openkruise/client/models/KruiseAppsV1alpha1AdvancedCronJobStatus.java

@@ -17,11 +17,12 @@
 import io.kubernetes.client.openapi.models.V1ObjectReference;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
+import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import javax.annotation.Generated;
-import org.joda.time.DateTime;
 
 /**
  * AdvancedCronJobStatus defines the observed state of AdvancedCronJob
@@ -33,7 +34,7 @@ public class KruiseAppsV1alpha1AdvancedCronJobStatus {
   private List<V1ObjectReference> active = null;
 
   @SerializedName("lastScheduleTime")
-  private DateTime lastScheduleTime = null;
+  private OffsetDateTime lastScheduleTime = null;
 
   @SerializedName("type")
   private String type = null;
@@ -64,7 +65,7 @@ public void setActive(List<V1ObjectReference> active) {
     this.active = active;
   }
 
-  public KruiseAppsV1alpha1AdvancedCronJobStatus lastScheduleTime(DateTime lastScheduleTime) {
+  public KruiseAppsV1alpha1AdvancedCronJobStatus lastScheduleTime(OffsetDateTime lastScheduleTime) {
     this.lastScheduleTime = lastScheduleTime;
     return this;
   }
@@ -74,11 +75,11 @@ public KruiseAppsV1alpha1AdvancedCronJobStatus lastScheduleTime(DateTime lastSch
    * @return lastScheduleTime
   **/
   @ApiModelProperty(value = "Information when was the last time the job was successfully scheduled.")
-  public DateTime getLastScheduleTime() {
+  public OffsetDateTime getLastScheduleTime() {
     return lastScheduleTime;
   }
 
-  public void setLastScheduleTime(DateTime lastScheduleTime) {
+  public void setLastScheduleTime(OffsetDateTime lastScheduleTime) {
     this.lastScheduleTime = lastScheduleTime;
   }
 

src/main/java/io/openkruise/client/models/KruiseAppsV1alpha1BroadcastJobStatus.java

@@ -16,11 +16,12 @@
 import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
+import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import javax.annotation.Generated;
-import org.joda.time.DateTime;
 
 /**
  * BroadcastJobStatus defines the observed state of BroadcastJob
@@ -32,7 +33,7 @@ public class KruiseAppsV1alpha1BroadcastJobStatus {
   private Integer active = null;
 
   @SerializedName("completionTime")
-  private DateTime completionTime = null;
+  private OffsetDateTime completionTime = null;
 
   @SerializedName("conditions")
   private List<KruiseAppsV1alpha1JobCondition> conditions = null;
@@ -47,7 +48,7 @@ public class KruiseAppsV1alpha1BroadcastJobStatus {
   private String phase = null;
 
   @SerializedName("startTime")
-  private DateTime startTime = null;
+  private OffsetDateTime startTime = null;
 
   @SerializedName("succeeded")
   private Integer succeeded = null;
@@ -70,7 +71,7 @@ public void setActive(Integer active) {
     this.active = active;
   }
 
-  public KruiseAppsV1alpha1BroadcastJobStatus completionTime(DateTime completionTime) {
+  public KruiseAppsV1alpha1BroadcastJobStatus completionTime(OffsetDateTime completionTime) {
     this.completionTime = completionTime;
     return this;
   }
@@ -80,11 +81,11 @@ public KruiseAppsV1alpha1BroadcastJobStatus completionTime(DateTime completionTi
    * @return completionTime
   **/
   @ApiModelProperty(value = "Represents time when the job was completed. It is not guaranteed to be set in happens-before order across separate operations. It is represented in RFC3339 form and is in UTC.")
-  public DateTime getCompletionTime() {
+  public OffsetDateTime getCompletionTime() {
     return completionTime;
   }
 
-  public void setCompletionTime(DateTime completionTime) {
+  public void setCompletionTime(OffsetDateTime completionTime) {
     this.completionTime = completionTime;
   }
 
@@ -168,7 +169,7 @@ public void setPhase(String phase) {
     this.phase = phase;
   }
 
-  public KruiseAppsV1alpha1BroadcastJobStatus startTime(DateTime startTime) {
+  public KruiseAppsV1alpha1BroadcastJobStatus startTime(OffsetDateTime startTime) {
     this.startTime = startTime;
     return this;
   }
@@ -178,11 +179,11 @@ public KruiseAppsV1alpha1BroadcastJobStatus startTime(DateTime startTime) {
    * @return startTime
   **/
   @ApiModelProperty(value = "Represents time when the job was acknowledged by the job controller. It is not guaranteed to be set in happens-before order across separate operations. It is represented in RFC3339 form and is in UTC.")
-  public DateTime getStartTime() {
+  public OffsetDateTime getStartTime() {
     return startTime;
   }
 
-  public void setStartTime(DateTime startTime) {
+  public void setStartTime(OffsetDateTime startTime) {
     this.startTime = startTime;
   }
 

src/main/java/io/openkruise/client/models/KruiseAppsV1alpha1CloneSetCondition.java

@@ -16,9 +16,10 @@
 import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
+import java.time.OffsetDateTime;
 import java.util.Objects;
 import javax.annotation.Generated;
-import org.joda.time.DateTime;
 
 /**
  * CloneSetCondition describes the state of a CloneSet at a certain point.
@@ -27,7 +28,7 @@
 @Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2023-07-21T15:55:09.049+08:00")
 public class KruiseAppsV1alpha1CloneSetCondition {
   @SerializedName("lastTransitionTime")
-  private DateTime lastTransitionTime = null;
+  private OffsetDateTime lastTransitionTime = null;
 
   @SerializedName("message")
   private String message = null;
@@ -41,7 +42,7 @@ public class KruiseAppsV1alpha1CloneSetCondition {
   @SerializedName("type")
   private String type = null;
 
-  public KruiseAppsV1alpha1CloneSetCondition lastTransitionTime(DateTime lastTransitionTime) {
+  public KruiseAppsV1alpha1CloneSetCondition lastTransitionTime(OffsetDateTime lastTransitionTime) {
     this.lastTransitionTime = lastTransitionTime;
     return this;
   }
@@ -51,11 +52,11 @@ public KruiseAppsV1alpha1CloneSetCondition lastTransitionTime(DateTime lastTrans
    * @return lastTransitionTime
   **/
   @ApiModelProperty(value = "Last time the condition transitioned from one status to another.")
-  public DateTime getLastTransitionTime() {
+  public OffsetDateTime getLastTransitionTime() {
     return lastTransitionTime;
   }
 
-  public void setLastTransitionTime(DateTime lastTransitionTime) {
+  public void setLastTransitionTime(OffsetDateTime lastTransitionTime) {
     this.lastTransitionTime = lastTransitionTime;
   }
 

src/main/java/io/openkruise/client/models/KruiseAppsV1alpha1ContainerProbeState.java

@@ -15,20 +15,21 @@
 
 import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModelProperty;
+
+import java.time.OffsetDateTime;
 import java.util.Objects;
 import javax.annotation.Generated;
-import org.joda.time.DateTime;
 
 /**
  * KruiseAppsV1alpha1NodePodProbeStatusProbeStates
  */
 @Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2023-07-21T15:55:09.049+08:00")
 public class KruiseAppsV1alpha1ContainerProbeState {
   @SerializedName("lastProbeTime")
-  private DateTime lastProbeTime = null;
+  private OffsetDateTime lastProbeTime = null;
 
   @SerializedName("lastTransitionTime")
-  private DateTime lastTransitionTime = null;
+  private OffsetDateTime lastTransitionTime = null;
 
   @SerializedName("message")
   private String message = null;
@@ -39,7 +40,7 @@ public class KruiseAppsV1alpha1ContainerProbeState {
   @SerializedName("state")
   private String state = null;
 
-  public KruiseAppsV1alpha1ContainerProbeState lastProbeTime(DateTime lastProbeTime) {
+  public KruiseAppsV1alpha1ContainerProbeState lastProbeTime(OffsetDateTime lastProbeTime) {
     this.lastProbeTime = lastProbeTime;
     return this;
   }
@@ -49,15 +50,15 @@ public KruiseAppsV1alpha1ContainerProbeState lastProbeTime(DateTime lastProbeTim
    * @return lastProbeTime
   **/
   @ApiModelProperty(value = "Last time we probed the condition.")
-  public DateTime getLastProbeTime() {
+  public OffsetDateTime getLastProbeTime() {
     return lastProbeTime;
   }
 
-  public void setLastProbeTime(DateTime lastProbeTime) {
+  public void setLastProbeTime(OffsetDateTime lastProbeTime) {
     this.lastProbeTime = lastProbeTime;
   }
 
-  public KruiseAppsV1alpha1ContainerProbeState lastTransitionTime(DateTime lastTransitionTime) {
+  public KruiseAppsV1alpha1ContainerProbeState lastTransitionTime(OffsetDateTime lastTransitionTime) {
     this.lastTransitionTime = lastTransitionTime;
     return this;
   }
@@ -67,11 +68,11 @@ public KruiseAppsV1alpha1ContainerProbeState lastTransitionTime(DateTime lastTra
    * @return lastTransitionTime
   **/
   @ApiModelProperty(value = "Last time the condition transitioned from one status to another.")
-  public DateTime getLastTransitionTime() {
+  public OffsetDateTime getLastTransitionTime() {
     return lastTransitionTime;
   }
 
-  public void setLastTransitionTime(DateTime lastTransitionTime) {
+  public void setLastTransitionTime(OffsetDateTime lastTransitionTime) {
     this.lastTransitionTime = lastTransitionTime;
   }
 

src/main/java/io/openkruise/client/models/KruiseAppsV1alpha1ContainerRecreateRequestContainer.java

@@ -15,7 +15,6 @@
 
 import com.google.gson.annotations.SerializedName;
 import io.kubernetes.client.openapi.models.V1ContainerPort;
-import io.kubernetes.client.openapi.models.V1Handler;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
@@ -36,7 +35,7 @@ public class KruiseAppsV1alpha1ContainerRecreateRequestContainer {
   private List<V1ContainerPort> ports = null;
 
   @SerializedName("preStop")
-  private V1Handler preStop = null;
+  private ProbeHandler preStop = null;
 
   @SerializedName("statusContext")
   private KruiseAppsV1alpha1ContainerRecreateRequestContext statusContext = null;
@@ -85,7 +84,7 @@ public void setPorts(List<V1ContainerPort> ports) {
     this.ports = ports;
   }
 
-  public KruiseAppsV1alpha1ContainerRecreateRequestContainer preStop(V1Handler preStop) {
+  public KruiseAppsV1alpha1ContainerRecreateRequestContainer preStop(ProbeHandler preStop) {
     this.preStop = preStop;
     return this;
   }
@@ -95,11 +94,11 @@ public KruiseAppsV1alpha1ContainerRecreateRequestContainer preStop(V1Handler pre
    * @return preStop
   **/
   @ApiModelProperty(value = "")
-  public V1Handler getPreStop() {
+  public ProbeHandler getPreStop() {
     return preStop;
   }
 
-  public void setPreStop(V1Handler preStop) {
+  public void setPreStop(ProbeHandler preStop) {
     this.preStop = preStop;
   }
 

src/main/java/io/openkruise/client/models/KruiseAppsV1alpha1ContainerRecreateRequestStatus.java

@@ -16,11 +16,12 @@
 import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
+import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import javax.annotation.Generated;
-import org.joda.time.DateTime;
 
 /**
  * ContainerRecreateRequestStatus defines the observed state of ContainerRecreateRequest
@@ -29,7 +30,7 @@
 @Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2023-07-21T15:55:09.049+08:00")
 public class KruiseAppsV1alpha1ContainerRecreateRequestStatus {
   @SerializedName("completionTime")
-  private DateTime completionTime = null;
+  private OffsetDateTime completionTime = null;
 
   @SerializedName("containerRecreateStates")
   private List<KruiseAppsV1alpha1ContainerRecreateRequestContainerRecreateState> containerRecreateStates = null;
@@ -40,7 +41,7 @@ public class KruiseAppsV1alpha1ContainerRecreateRequestStatus {
   @SerializedName("phase")
   private String phase = null;
 
-  public KruiseAppsV1alpha1ContainerRecreateRequestStatus completionTime(DateTime completionTime) {
+  public KruiseAppsV1alpha1ContainerRecreateRequestStatus completionTime(OffsetDateTime completionTime) {
     this.completionTime = completionTime;
     return this;
   }
@@ -50,11 +51,11 @@ public KruiseAppsV1alpha1ContainerRecreateRequestStatus completionTime(DateTime
    * @return completionTime
   **/
   @ApiModelProperty(value = "Represents time when the ContainerRecreateRequest was completed. It is not guaranteed to be set in happens-before order across separate operations. It is represented in RFC3339 form and is in UTC.")
-  public DateTime getCompletionTime() {
+  public OffsetDateTime getCompletionTime() {
     return completionTime;
   }
 
-  public void setCompletionTime(DateTime completionTime) {
+  public void setCompletionTime(OffsetDateTime completionTime) {
     this.completionTime = completionTime;
   }
 

src/main/java/io/openkruise/client/models/KruiseAppsV1alpha1CronJobTemplate.java

@@ -14,7 +14,7 @@
 package io.openkruise.client.models;
 
 import com.google.gson.annotations.SerializedName;
-import io.kubernetes.client.openapi.models.V1beta1JobTemplateSpec;
+import io.kubernetes.client.openapi.models.V1JobTemplateSpec;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.Objects;
@@ -30,7 +30,7 @@ public class KruiseAppsV1alpha1CronJobTemplate {
   private KruiseAppsV1alpha1BroadcastJobSpec broadcastJobTemplate = null;
 
   @SerializedName("jobTemplate")
-  private V1beta1JobTemplateSpec jobTemplate = null;
+  private V1JobTemplateSpec jobTemplate = null;
 
   public KruiseAppsV1alpha1CronJobTemplate broadcastJobTemplate(KruiseAppsV1alpha1BroadcastJobSpec broadcastJobTemplate) {
     this.broadcastJobTemplate = broadcastJobTemplate;
@@ -50,7 +50,7 @@ public void setBroadcastJobTemplate(KruiseAppsV1alpha1BroadcastJobSpec broadcast
     this.broadcastJobTemplate = broadcastJobTemplate;
   }
 
-  public KruiseAppsV1alpha1CronJobTemplate jobTemplate(V1beta1JobTemplateSpec jobTemplate) {
+  public KruiseAppsV1alpha1CronJobTemplate jobTemplate(V1JobTemplateSpec jobTemplate) {
     this.jobTemplate = jobTemplate;
     return this;
   }
@@ -60,11 +60,11 @@ public KruiseAppsV1alpha1CronJobTemplate jobTemplate(V1beta1JobTemplateSpec jobT
    * @return jobTemplate
   **/
   @ApiModelProperty(value = "Specifies the job that will be created when executing a CronJob.")
-  public V1beta1JobTemplateSpec getJobTemplate() {
+  public V1JobTemplateSpec getJobTemplate() {
     return jobTemplate;
   }
 
-  public void setJobTemplate(V1beta1JobTemplateSpec jobTemplate) {
+  public void setJobTemplate(V1JobTemplateSpec jobTemplate) {
     this.jobTemplate = jobTemplate;
   }