Fix fabric8io#2684: Update Kubernetes Model to v1.20.2

- Updated Kubernetes Model to v1.20.2 - Remove kubernetes-model-settings as v1alpha1 PodPreset API got removed in Kubernetes 1.20.x - Remove client.settings() DSL and related classes from KubernetesClient interface - Added v1 models for scheduling, certificates and admission
rohanKanojia · Jan 28, 2021 · 8f26fe5 · 8f26fe5
1 parent 25dda61
commit 8f26fe5
Show file tree

Hide file tree

Showing 77 changed files with 3,324 additions and 8,076 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,9 +7,17 @@
 #### Improvements
 
 #### Dependency Upgrade
+* Fix #2684: Upgrade Kubernetes Model to v1.20.2
 
 #### New Features
 
+_**Note**_: Breaking changes in the API
+- `client.settings()` DSL has been removed since PodPreset v1alpha1 API is no longer present in Kubernetes 1.20.x
+- Classes in `io.fabric8.kubernetes.api.model.scheduling` have been moved to `io.fabric8.kubernetes.api.model.scheduling.v1` and `io.fabric8.kubernetes.api.model.scheduling.v1beta1`
+- Classes in `io.fabric8.kubernetes.api.model.admission` have been moved to `io.fabric8.kubernetes.api.model.admission.v1` and `io.fabric8.kubernetes.api.model.admission.v1beta1`
+- Classes in `io.fabric8.kubernetes.api.model.certificates` have been moved to `io.fabric8.kubernetes.api.model.certificates.v1` and `io.fabric8.kubernetes.api.model.certificates.v1beta1`
+
+
 ### 5.0.1 (2021-01-27)
 
 #### Bugs

diff --git a/kubernetes-client/pom.xml b/kubernetes-client/pom.xml
@@ -122,10 +122,6 @@
       <groupId>io.fabric8</groupId>
       <artifactId>kubernetes-model-scheduling</artifactId>
     </dependency>
-    <dependency>
-      <groupId>io.fabric8</groupId>
-      <artifactId>kubernetes-model-settings</artifactId>
-    </dependency>
     <dependency>
       <groupId>io.fabric8</groupId>
       <artifactId>kubernetes-model-storageclass</artifactId>

diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/CodeGen.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/CodeGen.java
@@ -43,7 +43,6 @@
     @ResourceSelector("metrics.properties"),
     @ResourceSelector("policy.properties"),
     @ResourceSelector("scheduling.properties"),
-    @ResourceSelector("settings.properties"),
     @ResourceSelector("storage.properties"),
   }
 

diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/DefaultKubernetesClient.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/DefaultKubernetesClient.java
@@ -54,8 +54,8 @@
 import io.fabric8.kubernetes.api.model.ServiceList;
 import io.fabric8.kubernetes.api.model.ServiceAccount;
 import io.fabric8.kubernetes.api.model.ServiceAccountList;
-import io.fabric8.kubernetes.api.model.certificates.CertificateSigningRequest;
-import io.fabric8.kubernetes.api.model.certificates.CertificateSigningRequestList;
+import io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequest;
+import io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestList;
 import io.fabric8.kubernetes.api.model.authentication.TokenReview;
 import io.fabric8.kubernetes.api.model.coordination.v1.Lease;
 import io.fabric8.kubernetes.api.model.coordination.v1.LeaseList;
@@ -557,12 +557,6 @@ public AutoscalingAPIGroupDSL autoscaling() {
   @Override
   public RbacAPIGroupDSL rbac() { return adapt(RbacAPIGroupClient.class); }
 
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-  public SettingsAPIGroupDSL settings() { return adapt(SettingsAPIGroupClient.class); }
-
   /**
    * {@inheritDoc}
    */

diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/KubernetesClient.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/KubernetesClient.java
@@ -51,8 +51,8 @@
 import io.fabric8.kubernetes.api.model.ServiceList;
 import io.fabric8.kubernetes.api.model.ServiceAccount;
 import io.fabric8.kubernetes.api.model.ServiceAccountList;
-import io.fabric8.kubernetes.api.model.certificates.CertificateSigningRequest;
-import io.fabric8.kubernetes.api.model.certificates.CertificateSigningRequestList;
+import io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequest;
+import io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestList;
 import io.fabric8.kubernetes.api.model.authentication.TokenReview;
 import io.fabric8.kubernetes.api.model.coordination.v1.Lease;
 import io.fabric8.kubernetes.api.model.coordination.v1.LeaseList;
@@ -271,13 +271,6 @@ public interface KubernetesClient extends Client {
    */
   StorageAPIGroupDSL storage();
 
-  /**
-   * API entrypoint for kubernetes resources with APIGroup settings/v1alpha1
-   *
-   * @return SettingsAPIGroupDSL which offers entrypoint to specific resources in this APIGroup
-   */
-  SettingsAPIGroupDSL settings();
-
   /**
    * API entrypoint for kubernetes resources with APIGroup batch/v1beta1
    *

diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/SchedulingAPIGroupClient.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/SchedulingAPIGroupClient.java
@@ -15,8 +15,8 @@
  */
 package io.fabric8.kubernetes.client;
 
-import io.fabric8.kubernetes.api.model.scheduling.PriorityClass;
-import io.fabric8.kubernetes.api.model.scheduling.PriorityClassList;
+import io.fabric8.kubernetes.api.model.scheduling.v1beta1.PriorityClass;
+import io.fabric8.kubernetes.api.model.scheduling.v1beta1.PriorityClassList;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.kubernetes.client.dsl.SchedulingAPIGroupDSL;

diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/SettingsAPIGroupClient.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/SettingsAPIGroupClient.java
diff --git a/...s-client/src/main/java/io/fabric8/kubernetes/client/SettingsAPIGroupExtensionAdapter.java b/...s-client/src/main/java/io/fabric8/kubernetes/client/SettingsAPIGroupExtensionAdapter.java
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/SchedulingAPIGroupDSL.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/SchedulingAPIGroupDSL.java
@@ -15,8 +15,8 @@
  */
 package io.fabric8.kubernetes.client.dsl;
 
-import io.fabric8.kubernetes.api.model.scheduling.PriorityClass;
-import io.fabric8.kubernetes.api.model.scheduling.PriorityClassList;
+import io.fabric8.kubernetes.api.model.scheduling.v1beta1.PriorityClass;
+import io.fabric8.kubernetes.api.model.scheduling.v1beta1.PriorityClassList;
 import io.fabric8.kubernetes.client.Client;
 
 public interface SchedulingAPIGroupDSL extends Client {

diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/SettingsAPIGroupDSL.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/SettingsAPIGroupDSL.java
diff --git a/...netes-client/src/main/java/io/fabric8/kubernetes/client/osgi/ManagedKubernetesClient.java b/...netes-client/src/main/java/io/fabric8/kubernetes/client/osgi/ManagedKubernetesClient.java
@@ -53,8 +53,8 @@
 import io.fabric8.kubernetes.api.model.ServiceList;
 import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition;
 import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionList;
-import io.fabric8.kubernetes.api.model.certificates.CertificateSigningRequest;
-import io.fabric8.kubernetes.api.model.certificates.CertificateSigningRequestList;
+import io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequest;
+import io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestList;
 import io.fabric8.kubernetes.api.model.authentication.TokenReview;
 import io.fabric8.kubernetes.api.model.coordination.v1.Lease;
 import io.fabric8.kubernetes.api.model.coordination.v1.LeaseList;
@@ -98,7 +98,6 @@
 import io.fabric8.kubernetes.client.dsl.RollableScalableResource;
 import io.fabric8.kubernetes.client.dsl.SchedulingAPIGroupDSL;
 import io.fabric8.kubernetes.client.dsl.ServiceResource;
-import io.fabric8.kubernetes.client.dsl.SettingsAPIGroupDSL;
 import io.fabric8.kubernetes.client.dsl.StorageAPIGroupDSL;
 import io.fabric8.kubernetes.client.dsl.V1APIGroupDSL;
 import io.fabric8.kubernetes.client.dsl.base.CustomResourceDefinitionContext;
@@ -390,9 +389,6 @@ public AutoscalingAPIGroupDSL autoscaling() {
   @Override
   public StorageAPIGroupDSL storage() { return delegate.storage(); }
 
-  @Override
-  public SettingsAPIGroupDSL settings() { return delegate.settings(); }
-
   @Override
   public BatchAPIGroupDSL batch() { return delegate.batch(); }
 

diff --git a/...client/src/main/resources/META-INF/services/io.fabric8.kubernetes.client.ExtensionAdapter b/...client/src/main/resources/META-INF/services/io.fabric8.kubernetes.client.ExtensionAdapter
@@ -31,7 +31,6 @@ io.fabric8.kubernetes.client.NetworkAPIGroupExtensionAdapter
 io.fabric8.kubernetes.client.PolicyAPIGroupExtensionAdapter
 io.fabric8.kubernetes.client.RbacAPIGroupExtensionAdapter
 io.fabric8.kubernetes.client.SchedulingAPIGroupExtensionAdapter
-io.fabric8.kubernetes.client.SettingsAPIGroupExtensionAdapter
 io.fabric8.kubernetes.client.StorageAPIGroupExtensionAdapter
 io.fabric8.kubernetes.client.V1APIGroupExtensionAdapter
 io.fabric8.kubernetes.client.V1ApiextensionsAPIGroupExtensionAdapter

diff --git a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/internal/UtilsTest.java b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/internal/UtilsTest.java
@@ -48,7 +48,7 @@
 import io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReview;
 import io.fabric8.kubernetes.api.model.batch.CronJob;
 import io.fabric8.kubernetes.api.model.batch.Job;
-import io.fabric8.kubernetes.api.model.certificates.CertificateSigningRequest;
+import io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequest;
 import io.fabric8.kubernetes.api.model.coordination.v1.Lease;
 import io.fabric8.kubernetes.api.model.discovery.EndpointSlice;
 import io.fabric8.kubernetes.api.model.extensions.Ingress;
@@ -59,7 +59,7 @@
 import io.fabric8.kubernetes.api.model.rbac.ClusterRoleBinding;
 import io.fabric8.kubernetes.api.model.rbac.Role;
 import io.fabric8.kubernetes.api.model.rbac.RoleBinding;
-import io.fabric8.kubernetes.api.model.scheduling.PriorityClass;
+import io.fabric8.kubernetes.api.model.scheduling.v1beta1.PriorityClass;
 import io.fabric8.kubernetes.api.model.storage.StorageClass;
 import io.fabric8.kubernetes.api.model.storage.VolumeAttachment;
 import io.fabric8.kubernetes.api.model.storage.v1beta1.CSIDriver;

diff --git a/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/PodPresetExamples.java b/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/PodPresetExamples.java
diff --git a/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/PodPriorityExample.java b/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/PodPriorityExample.java
@@ -17,8 +17,8 @@
 
 import io.fabric8.kubernetes.api.model.ContainerBuilder;
 import io.fabric8.kubernetes.api.model.PodBuilder;
-import io.fabric8.kubernetes.api.model.scheduling.PriorityClass;
-import io.fabric8.kubernetes.api.model.scheduling.PriorityClassBuilder;
+import io.fabric8.kubernetes.api.model.scheduling.v1beta1.PriorityClass;
+import io.fabric8.kubernetes.api.model.scheduling.v1beta1.PriorityClassBuilder;
 import io.fabric8.kubernetes.client.ConfigBuilder;
 import io.fabric8.kubernetes.client.DefaultKubernetesClient;
 import io.fabric8.kubernetes.client.KubernetesClient;

diff --git a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/CertificateSigningRequestIT.java b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/CertificateSigningRequestIT.java
@@ -16,9 +16,9 @@
 package io.fabric8.kubernetes;
 
 import io.fabric8.commons.ClusterEntity;
-import io.fabric8.kubernetes.api.model.certificates.CertificateSigningRequest;
-import io.fabric8.kubernetes.api.model.certificates.CertificateSigningRequestBuilder;
-import io.fabric8.kubernetes.api.model.certificates.CertificateSigningRequestList;
+import io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequest;
+import io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestBuilder;
+import io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestList;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import org.arquillian.cube.kubernetes.impl.requirement.RequiresKubernetes;
 import org.arquillian.cube.requirement.ArquillianConditionalRunner;

diff --git a/kubernetes-model-generator/README.md b/kubernetes-model-generator/README.md
@@ -32,8 +32,6 @@
 [![javadoc](https://javadoc.io/badge2/io.fabric8/kubernetes-model-rbac/javadoc.svg)](https://javadoc.io/doc/io.fabric8/kubernetes-model-rbac)
 * kubernetes-model-scheduling: [![Maven Central](https://img.shields.io/maven-central/v/io.fabric8/kubernetes-model-scheduling.svg?maxAge=2592000)](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aio.fabric8%20a%3Akubernetes-model-scheduling)
 [![javadoc](https://javadoc.io/badge2/io.fabric8/kubernetes-model-scheduling/javadoc.svg)](https://javadoc.io/doc/io.fabric8/kubernetes-model-scheduling)
-* kubernetes-model-settings: [![Maven Central](https://img.shields.io/maven-central/v/io.fabric8/kubernetes-model-settings.svg?maxAge=2592000)](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aio.fabric8%20a%3Akubernetes-model-settings)
-[![javadoc](https://javadoc.io/badge2/io.fabric8/kubernetes-model-settings/javadoc.svg)](https://javadoc.io/doc/io.fabric8/kubernetes-model-settings)
 * kubernetes-model-storageclass: [![Maven Central](https://img.shields.io/maven-central/v/io.fabric8/kubernetes-model-storageclass.svg?maxAge=2592000)](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aio.fabric8%20a%3Akubernetes-model-storageclass)
 [![javadoc](https://javadoc.io/badge2/io.fabric8/kubernetes-model-storageclass/javadoc.svg)](https://javadoc.io/doc/io.fabric8/kubernetes-model-storageclass)
 * kubernetes-model-node: [![Maven Central](https://img.shields.io/maven-central/v/io.fabric8/kubernetes-model-node.svg?maxAge=2592000)](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aio.fabric8%20a%3Akubernetes-model-node)

diff --git a/kubernetes-model-generator/generateModel.sh b/kubernetes-model-generator/generateModel.sh
@@ -35,7 +35,6 @@ declare -a modules=(
     "kubernetes-model-node"
     "kubernetes-model-policy"
     "kubernetes-model-scheduling"
-    "kubernetes-model-settings"
     "kubernetes-model-storageclass"
     "openshift-model"
     "openshift-model-operator"