Fixes for compilation after regeneration.

brendanburns · brendanburns · commit 4141ea491874 · 2021-10-20T19:52:11.000-07:00
diff --git a/e2e/src/test/groovy/io/kubernetes/client/e2e/util/ModelMapperTest.groovy b/e2e/src/test/groovy/io/kubernetes/client/e2e/util/ModelMapperTest.groovy
@@ -17,7 +17,7 @@ import io.kubernetes.client.apimachinery.GroupVersionKind
 import io.kubernetes.client.apimachinery.GroupVersionResource
 import io.kubernetes.client.openapi.models.V1Deployment
 import io.kubernetes.client.openapi.models.V1Pod
-import io.kubernetes.client.openapi.models.V1beta1CustomResourceDefinition
+import io.kubernetes.client.openapi.models.V1CustomResourceDefinition
 import io.kubernetes.client.util.ClientBuilder
 import io.kubernetes.client.util.ModelMapper
 import spock.lang.Specification
@@ -39,8 +39,8 @@ class ModelMapperTest extends Specification {
 		new GroupVersionResource("apps", "v1", "deployments") == ModelMapper.getGroupVersionResourceByClass(V1Deployment.class)
 		ModelMapper.isNamespaced(V1Deployment.class)
 
-		new GroupVersionKind("apiextensions.k8s.io", "v1beta1", "CustomResourceDefinition") == ModelMapper.getGroupVersionKindByClass(V1beta1CustomResourceDefinition.class)
-		new GroupVersionResource("apiextensions.k8s.io", "v1beta1", "customresourcedefinitions") == ModelMapper.getGroupVersionResourceByClass(V1beta1CustomResourceDefinition.class)
+		new GroupVersionKind("apiextensions.k8s.io", "v1", "CustomResourceDefinition") == ModelMapper.getGroupVersionKindByClass(V1beta1CustomResourceDefinition.class)
+		new GroupVersionResource("apiextensions.k8s.io", "v1", "customresourcedefinitions") == ModelMapper.getGroupVersionResourceByClass(V1beta1CustomResourceDefinition.class)
 		!ModelMapper.isNamespaced(V1beta1CustomResourceDefinition.class)
 	}
 }
diff --git a/examples/examples-release-13/src/main/java/io/kubernetes/client/examples/PrometheusExample.java b/examples/examples-release-13/src/main/java/io/kubernetes/client/examples/PrometheusExample.java
@@ -50,7 +50,7 @@ public static void main(String[] args) throws IOException, ApiException {
           api.listPodForAllNamespaces(null, null, null, null, null, null, null, null, null, null);
       // A request that should return 404
       try {
-        V1Pod pod = api.readNamespacedPod("foo", "bar", null, null, null);
+        V1Pod pod = api.readNamespacedPod("foo", "bar", null);
       } catch (ApiException ex) {
         if (ex.getCode() != 404) {
           throw ex;
diff --git a/examples/examples-release-13/src/test/java/io/kubernetes/client/examples/ExampleTest.java b/examples/examples-release-13/src/test/java/io/kubernetes/client/examples/ExampleTest.java
@@ -49,7 +49,7 @@ public void exactUrlOnly() throws IOException, ApiException {
                     .withBody(client.getJSON().serialize(ns1))));
 
     CoreV1Api api = new CoreV1Api();
-    V1Namespace ns2 = api.readNamespace("name", null, null, null);
+    V1Namespace ns2 = api.readNamespace("name", null);
     assertEquals(ns1, ns2);
   }
 }
diff --git a/extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlDrain.java b/extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlDrain.java
@@ -113,7 +113,7 @@ private void waitForPodDelete(CoreV1Api api, String name, String namespace)
     long start = System.currentTimeMillis();
     do {
       try {
-        api.readNamespacedPod(name, namespace, null, null, null);
+        api.readNamespacedPod(name, namespace, null);
       } catch (ApiException ex) {
         if (ex.getCode() == HttpURLConnection.HTTP_NOT_FOUND) {
           return;
diff --git a/extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlRollout.java b/extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlRollout.java
@@ -74,14 +74,14 @@ public List<History> execute() throws KubectlException {
       refreshDiscovery();
       try {
         if (apiTypeClass.equals(V1Deployment.class)) {
-          V1Deployment deployment = api.readNamespacedDeployment(name, namespace, null, null, null);
+          V1Deployment deployment = api.readNamespacedDeployment(name, namespace, null);
           deploymentViewHistory(deployment, api);
         } else if (apiTypeClass.equals(V1DaemonSet.class)) {
-          V1DaemonSet daemonSet = api.readNamespacedDaemonSet(name, namespace, null, null, null);
+          V1DaemonSet daemonSet = api.readNamespacedDaemonSet(name, namespace, null);
           daemonSetViewHistory(daemonSet, api);
         } else if (apiTypeClass.equals(V1StatefulSet.class)) {
           V1StatefulSet statefulSet =
-              api.readNamespacedStatefulSet(name, namespace, null, null, null);
+              api.readNamespacedStatefulSet(name, namespace, null);
           statefulSetViewHistory(statefulSet, api);
         } else {
           throw new KubectlException("Unsupported class for rollout history: " + apiTypeClass);
diff --git a/extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlTaint.java b/extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlTaint.java
@@ -68,7 +68,7 @@ public V1Node execute() throws KubectlException {
 
   private V1Node executeInternal() throws KubectlException, ApiException, IOException {
     CoreV1Api v1 = new CoreV1Api(apiClient);
-    V1Node node = v1.readNode(name, null, null, null);
+    V1Node node = v1.readNode(name, null);
 
     TaintsBuilder builder = Taints.taints(node);
     for (Map.Entry<String, Pair<String, String>> taint : addingTaints.entrySet()) {
diff --git a/extended/src/main/java/io/kubernetes/client/extended/leaderelection/resourcelock/ConfigMapLock.java b/extended/src/main/java/io/kubernetes/client/extended/leaderelection/resourcelock/ConfigMapLock.java
@@ -58,7 +58,7 @@ public ConfigMapLock(String namespace, String name, String identity, ApiClient a
 
   @Override
   public LeaderElectionRecord get() throws ApiException {
-    V1ConfigMap configMap = coreV1Client.readNamespacedConfigMap(name, namespace, null, null, null);
+    V1ConfigMap configMap = coreV1Client.readNamespacedConfigMap(name, namespace, null);
     configMapRefer.set(configMap);
 
     Map<String, String> annotations = configMap.getMetadata().getAnnotations();
diff --git a/extended/src/main/java/io/kubernetes/client/extended/leaderelection/resourcelock/EndpointsLock.java b/extended/src/main/java/io/kubernetes/client/extended/leaderelection/resourcelock/EndpointsLock.java
@@ -58,7 +58,7 @@ public EndpointsLock(String namespace, String name, String identity, ApiClient a
 
   @Override
   public LeaderElectionRecord get() throws ApiException {
-    V1Endpoints endpoints = coreV1Client.readNamespacedEndpoints(name, namespace, null, null, null);
+    V1Endpoints endpoints = coreV1Client.readNamespacedEndpoints(name, namespace, null);
     endpointsRefer.set(endpoints);
 
     Map<String, String> annotations = endpoints.getMetadata().getAnnotations();
diff --git a/extended/src/main/java/io/kubernetes/client/extended/leaderelection/resourcelock/LeaseLock.java b/extended/src/main/java/io/kubernetes/client/extended/leaderelection/resourcelock/LeaseLock.java
@@ -58,7 +58,7 @@ public LeaseLock(String namespace, String name, String identity, ApiClient apiCl
 
   @Override
   public LeaderElectionRecord get() throws ApiException {
-    V1Lease lease = coordinationV1Api.readNamespacedLease(name, namespace, null, null, null);
+    V1Lease lease = coordinationV1Api.readNamespacedLease(name, namespace, null);
     leaseRefer.set(lease);
     return getRecordFromLease(lease.getSpec());
   }
diff --git a/extended/src/test/java/io/kubernetes/client/extended/network/EndpointsLoadBalancerTests.java b/extended/src/test/java/io/kubernetes/client/extended/network/EndpointsLoadBalancerTests.java
@@ -16,7 +16,7 @@
 
 import io.kubernetes.client.extended.network.exception.NoAvailableAddressException;
 import io.kubernetes.client.openapi.models.V1EndpointAddress;
-import io.kubernetes.client.openapi.models.V1EndpointPort;
+import io.kubernetes.client.openapi.models.CoreV1EndpointPort;
 import io.kubernetes.client.openapi.models.V1EndpointSubset;
 import io.kubernetes.client.openapi.models.V1Endpoints;
 import java.util.Arrays;
@@ -32,29 +32,29 @@ public class EndpointsLoadBalancerTests {
               new V1EndpointSubset()
                   .addAddressesItem(new V1EndpointAddress().ip("127.0.0.1"))
                   .addAddressesItem(new V1EndpointAddress().ip("127.0.0.2"))
-                  .addPortsItem(new V1EndpointPort().port(8080)));
+                  .addPortsItem(new CoreV1EndpointPort().port(8080)));
 
   private final V1Endpoints twoPortTwoHostEp =
       new V1Endpoints()
           .addSubsetsItem(
               new V1EndpointSubset()
                   .addAddressesItem(new V1EndpointAddress().ip("127.0.0.1"))
                   .addAddressesItem(new V1EndpointAddress().ip("127.0.0.2"))
-                  .addPortsItem(new V1EndpointPort().port(8080))
-                  .addPortsItem(new V1EndpointPort().port(8081)));
+                  .addPortsItem(new CoreV1EndpointPort().port(8080))
+                  .addPortsItem(new CoreV1EndpointPort().port(8081)));
 
   private final V1Endpoints twoSubsetTwoPortTwoHostEp =
       new V1Endpoints()
           .addSubsetsItem(
               new V1EndpointSubset()
                   .addAddressesItem(new V1EndpointAddress().ip("127.0.0.1"))
                   .addAddressesItem(new V1EndpointAddress().ip("127.0.0.2"))
-                  .addPortsItem(new V1EndpointPort().port(8080))
-                  .addPortsItem(new V1EndpointPort().port(8081)))
+                  .addPortsItem(new CoreV1EndpointPort().port(8080))
+                  .addPortsItem(new CoreV1EndpointPort().port(8081)))
           .addSubsetsItem(
               new V1EndpointSubset()
                   .addAddressesItem(new V1EndpointAddress().ip("127.0.0.3"))
-                  .addPortsItem(new V1EndpointPort().port(8082)));
+                  .addPortsItem(new CoreV1EndpointPort().port(8082)));
 
   @Test
   public void testGetTargetIP1() throws NoAvailableAddressException {
diff --git a/extended/src/test/java/io/kubernetes/client/extended/network/RoundRobinEndpointsLoadBalancerTests.java b/extended/src/test/java/io/kubernetes/client/extended/network/RoundRobinEndpointsLoadBalancerTests.java
@@ -16,7 +16,7 @@
 
 import io.kubernetes.client.extended.network.exception.NoAvailableAddressException;
 import io.kubernetes.client.openapi.models.V1EndpointAddress;
-import io.kubernetes.client.openapi.models.V1EndpointPort;
+import io.kubernetes.client.openapi.models.CoreV1EndpointPort;
 import io.kubernetes.client.openapi.models.V1EndpointSubset;
 import io.kubernetes.client.openapi.models.V1Endpoints;
 import java.util.ArrayList;
@@ -32,8 +32,8 @@ public class RoundRobinEndpointsLoadBalancerTests {
               new V1EndpointSubset()
                   .addAddressesItem(new V1EndpointAddress().ip("127.0.0.1"))
                   .addAddressesItem(new V1EndpointAddress().ip("127.0.0.2"))
-                  .addPortsItem(new V1EndpointPort().port(8080))
-                  .addPortsItem(new V1EndpointPort().port(8081)));
+                  .addPortsItem(new CoreV1EndpointPort().port(8080))
+                  .addPortsItem(new CoreV1EndpointPort().port(8081)));
 
   @Test
   public void testChooseIPFromNullListShouldThrowException() {
diff --git a/spring/src/main/java/io/kubernetes/client/spring/extended/manifests/configmaps/PollingConfigMapGetter.java b/spring/src/main/java/io/kubernetes/client/spring/extended/manifests/configmaps/PollingConfigMapGetter.java
@@ -36,7 +36,7 @@ public V1ConfigMap get(String namespace, String name) {
         new NamespaceName(namespace, name),
         k -> {
           try {
-            return coreV1Api.readNamespacedConfigMap(name, namespace, null, null, null);
+            return coreV1Api.readNamespacedConfigMap(name, namespace, null);
           } catch (ApiException e) {
             throw new IllegalStateException(e);
           }
diff --git a/spring/src/main/java/io/kubernetes/client/spring/extended/network/endpoints/PollingEndpointsGetter.java b/spring/src/main/java/io/kubernetes/client/spring/extended/network/endpoints/PollingEndpointsGetter.java
@@ -39,7 +39,7 @@ public V1Endpoints get(String namespace, String name) {
         new NamespaceName(namespace, name),
         k -> {
           try {
-            return coreV1Api.readNamespacedEndpoints(name, namespace, null, null, null);
+            return coreV1Api.readNamespacedEndpoints(name, namespace, null);
           } catch (ApiException e) {
             throw new IllegalStateException(e);
           }
diff --git a/spring/src/test/java/io/kubernetes/client/spring/extended/network/KubernetesEndpointsLoadBalancerCreatorTest.java b/spring/src/test/java/io/kubernetes/client/spring/extended/network/KubernetesEndpointsLoadBalancerCreatorTest.java
@@ -23,8 +23,8 @@
 import io.kubernetes.client.extended.network.exception.NoAvailableAddressException;
 import io.kubernetes.client.informer.cache.Cache;
 import io.kubernetes.client.informer.cache.Lister;
+import io.kubernetes.client.openapi.models.CoreV1EndpointPort;
 import io.kubernetes.client.openapi.models.V1EndpointAddress;
-import io.kubernetes.client.openapi.models.V1EndpointPort;
 import io.kubernetes.client.openapi.models.V1EndpointSubset;
 import io.kubernetes.client.openapi.models.V1Endpoints;
 import io.kubernetes.client.openapi.models.V1ObjectMeta;
@@ -101,7 +101,7 @@ static class MyEndpointGetter implements EndpointsGetter {
             .addSubsetsItem(
                 new V1EndpointSubset()
                     .addAddressesItem(new V1EndpointAddress().ip("127.0.0.2"))
-                    .addPortsItem(new V1EndpointPort().port(8080)));
+                    .addPortsItem(new CoreV1EndpointPort().port(8080)));
 
     @Override
     public V1Endpoints get(String namespace, String name) {
@@ -115,7 +115,7 @@ public V1Endpoints get(String namespace, String name) {
           .addSubsetsItem(
               new V1EndpointSubset()
                   .addAddressesItem(new V1EndpointAddress().ip("127.0.0.1"))
-                  .addPortsItem(new V1EndpointPort().port(8080)));
+                  .addPortsItem(new CoreV1EndpointPort().port(8080)));
 
   @Autowired private MyBean myBean;
 
diff --git a/util/src/main/java/io/kubernetes/client/Exec.java b/util/src/main/java/io/kubernetes/client/Exec.java
@@ -429,7 +429,7 @@ private String makePath() {
     public Process execute() throws ApiException, IOException {
       if (container == null) {
         CoreV1Api api = new CoreV1Api(apiClient);
-        V1Pod pod = api.readNamespacedPod(name, namespace, "false", null, null);
+        V1Pod pod = api.readNamespacedPod(name, namespace, "false");
         container = pod.getSpec().getContainers().get(0).getName();
       }
 
diff --git a/util/src/main/java/io/kubernetes/client/util/CSRUtils.java b/util/src/main/java/io/kubernetes/client/util/CSRUtils.java
@@ -64,7 +64,7 @@ public static void approve(ApiClient apiClient, String csrObjName) throws ApiExc
     CertificatesV1Api api = new CertificatesV1Api(apiClient);
     OffsetDateTime now = OffsetDateTime.now();
     V1CertificateSigningRequest current =
-        api.readCertificateSigningRequest(csrObjName, null, null, null);
+        api.readCertificateSigningRequest(csrObjName, null);
     current
         .getStatus()
         .addConditionsItem(
@@ -96,7 +96,7 @@ public static byte[] createAndWaitUntilCertificateSigned(
     if (!CSRUtils.createIfAbsent(bootstrapApiClient, csr)) {
       CertificatesV1Api api = new CertificatesV1Api(bootstrapApiClient);
       V1CertificateSigningRequest existing =
-          api.readCertificateSigningRequest(csr.getMetadata().getName(), null, null, null);
+          api.readCertificateSigningRequest(csr.getMetadata().getName(), null);
       if (!CSRUtils.isIdentical(existing, csr)) {
         LOG.error(
             "Existing CertificateSigningRequest object is conflicting with the requesting object");
@@ -172,7 +172,7 @@ public static byte[] waitUntilCertificateSigned(
               () -> {
                 try {
                   V1CertificateSigningRequest current =
-                      api.readCertificateSigningRequest(csrObjectName, null, null, null);
+                      api.readCertificateSigningRequest(csrObjectName, null);
                   CSRUtils.getCertificate(current).ifPresent(cert -> certRef.set(cert));
                   return true;
                 } catch (ApiException e) {
diff --git a/util/src/main/java/io/kubernetes/client/util/Yaml.java b/util/src/main/java/io/kubernetes/client/util/Yaml.java
@@ -17,7 +17,6 @@
 import io.kubernetes.client.custom.IntOrString;
 import io.kubernetes.client.custom.Quantity;
 import io.kubernetes.client.openapi.models.V1JSONSchemaProps;
-import io.kubernetes.client.openapi.models.V1beta1JSONSchemaProps;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
@@ -499,8 +498,7 @@ private static void registerBuiltinGsonCompatibles(
     registerCustomTypeDescriptions(
         constructor,
         representer,
-        newGsonCompatibleTypeDescription(V1JSONSchemaProps.class, crdOpenApiExtensions),
-        newGsonCompatibleTypeDescription(V1beta1JSONSchemaProps.class, crdOpenApiExtensions));
+        newGsonCompatibleTypeDescription(V1JSONSchemaProps.class, crdOpenApiExtensions));
   }
 
   private static void registerCustomTypeDescriptions(
diff --git a/util/src/main/java/io/kubernetes/client/util/generic/GenericKubernetesApi.java b/util/src/main/java/io/kubernetes/client/util/generic/GenericKubernetesApi.java
@@ -343,11 +343,13 @@ public KubernetesApiResponse<ApiListType> list(final ListOptions listOptions) {
               this.apiVersion,
               this.resourcePlural,
               null,
+              false,
               listOptions.getContinue(),
               listOptions.getFieldSelector(),
               listOptions.getLabelSelector(),
               listOptions.getLimit(),
               listOptions.getResourceVersion(),
+              null,
               listOptions.getTimeoutSeconds(),
               false,
               null);
@@ -375,11 +377,13 @@ public KubernetesApiResponse<ApiListType> list(String namespace, final ListOptio
               namespace,
               this.resourcePlural,
               null,
+              null,
               listOptions.getContinue(),
               listOptions.getFieldSelector(),
               listOptions.getLabelSelector(),
               listOptions.getLimit(),
               listOptions.getResourceVersion(),
+              null,
               listOptions.getTimeoutSeconds(),
               false,
               null);
@@ -712,11 +716,13 @@ public Watchable<ApiType> watch(final ListOptions listOptions) throws ApiExcepti
             this.apiVersion,
             this.resourcePlural,
             null,
+            null,
             listOptions.getContinue(),
             listOptions.getFieldSelector(),
             listOptions.getLabelSelector(),
             listOptions.getLimit(),
             listOptions.getResourceVersion(),
+            null,
             listOptions.getTimeoutSeconds(),
             true,
             null);
@@ -748,11 +754,13 @@ public Watchable<ApiType> watch(String namespace, final ListOptions listOptions)
             namespace,
             this.resourcePlural,
             null,
+            null,
             listOptions.getContinue(),
             listOptions.getFieldSelector(),
             listOptions.getLabelSelector(),
             listOptions.getLimit(),
             listOptions.getResourceVersion(),
+            null,
             listOptions.getTimeoutSeconds(),
             true,
             null);
diff --git a/util/src/test/java/io/kubernetes/client/util/ModelMapperTest.java b/util/src/test/java/io/kubernetes/client/util/ModelMapperTest.java
@@ -18,7 +18,7 @@
 import io.kubernetes.client.apimachinery.GroupVersionKind;
 import io.kubernetes.client.openapi.models.V1Deployment;
 import io.kubernetes.client.openapi.models.V1Pod;
-import io.kubernetes.client.openapi.models.V1beta1CustomResourceDefinition;
+import io.kubernetes.client.openapi.models.V1CustomResourceDefinition;
 import org.junit.Test;
 
 public class ModelMapperTest {
@@ -29,8 +29,8 @@ public void testPrebuiltModelMapping() {
     assertEquals(V1Pod.class, ModelMapper.getApiTypeClass("", "v1", "Pod"));
     assertEquals(V1Deployment.class, ModelMapper.getApiTypeClass("", "v1", "Deployment"));
     assertEquals(
-        V1beta1CustomResourceDefinition.class,
-        ModelMapper.getApiTypeClass("", "v1beta1", "CustomResourceDefinition"));
+        V1CustomResourceDefinition.class,
+        ModelMapper.getApiTypeClass("", "v1", "CustomResourceDefinition"));
   }
 
   @Test
@@ -65,7 +65,7 @@ public void testPreBuiltGetClassByKind() {
         new GroupVersionKind("", "v1", "Deployment"),
         ModelMapper.preBuiltGetGroupVersionKindByClass(V1Deployment.class));
     assertEquals(
-        new GroupVersionKind("", "v1beta1", "CustomResourceDefinition"),
-        ModelMapper.preBuiltGetGroupVersionKindByClass(V1beta1CustomResourceDefinition.class));
+        new GroupVersionKind("", "v1", "CustomResourceDefinition"),
+        ModelMapper.preBuiltGetGroupVersionKindByClass(V1CustomResourceDefinition.class));
   }
 }
diff --git a/util/src/test/java/io/kubernetes/client/util/YamlTest.java b/util/src/test/java/io/kubernetes/client/util/YamlTest.java
@@ -66,21 +66,21 @@ public class YamlTest {
   private static final String[] apiVersions =
       new String[] {
         "v1",
-        "batch/v2alpha1",
+        "batch/v1",
         "autoscaling/v2beta1",
         "rbac.authorization.k8s.io/v1alpha1",
         "apps/v1",
-        "apiregistration.k8s.io/v1beta1",
+        "apiregistration.k8s.io/v1",
         "apps/v1",
       };
   private static final String[] classNames =
       new String[] {
         "V1Pod",
-        "V2alpha1CronJob",
+        "V1CronJob",
         "V2beta1HorizontalPodAutoscaler",
         "V1alpha1ClusterRole",
         "V1Deployment",
-        "V1beta1APIService",
+        "V1APIService",
         "V1Scale",
       };
   private static final String input =

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public void exactUrlOnly() throws IOException, ApiException {`
`49`	`49`	`.withBody(client.getJSON().serialize(ns1))));`
`50`	`50`
`51`	`51`	`CoreV1Api api = new CoreV1Api();`
`52`		`- V1Namespace ns2 = api.readNamespace("name", null, null, null);`
	`52`	`+ V1Namespace ns2 = api.readNamespace("name", null);`
`53`	`53`	`assertEquals(ns1, ns2);`
`54`	`54`	`}`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public LeaseLock(String namespace, String name, String identity, ApiClient apiCl`
`58`	`58`
`59`	`59`	`@Override`
`60`	`60`	`public LeaderElectionRecord get() throws ApiException {`
`61`		`- V1Lease lease = coordinationV1Api.readNamespacedLease(name, namespace, null, null, null);`
	`61`	`+ V1Lease lease = coordinationV1Api.readNamespacedLease(name, namespace, null);`
`62`	`62`	`leaseRefer.set(lease);`
`63`	`63`	`return getRecordFromLease(lease.getSpec());`
`64`	`64`	`}`