Fixes needed for the new API version.

brendandburns · brendandburns · commit 48c6c0189653 · 2022-09-21T19:10:20.000Z
diff --git a/extended/src/main/java/io/kubernetes/client/extended/event/v1/EventSink.java b/extended/src/main/java/io/kubernetes/client/extended/event/v1/EventSink.java
@@ -10,19 +10,19 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-package io.kubernetes.client.extended.event.v1beta1;
+package io.kubernetes.client.extended.event.v1;
 
 import io.kubernetes.client.custom.V1Patch;
 import io.kubernetes.client.openapi.ApiException;
 import io.kubernetes.client.openapi.models.CoreV1Event;
-import io.kubernetes.client.openapi.models.V1beta1Event;
+import io.kubernetes.client.openapi.models.EventsV1Event;
 
-// placeholder interface for event v1beta1 api
+// placeholder interface for event v1 api
 public interface EventSink {
 
-  CoreV1Event create(V1beta1Event event) throws ApiException;
+  CoreV1Event create(EventsV1Event event) throws ApiException;
 
-  CoreV1Event update(V1beta1Event event) throws ApiException;
+  CoreV1Event update(EventsV1Event event) throws ApiException;
 
-  CoreV1Event patch(V1beta1Event event, V1Patch patch) throws ApiException;
+  CoreV1Event patch(EventsV1Event event, V1Patch patch) throws ApiException;
 }
diff --git a/util/src/main/java/io/kubernetes/client/util/conversion/Jobs.java b/util/src/main/java/io/kubernetes/client/util/conversion/Jobs.java
@@ -16,8 +16,8 @@
 import io.kubernetes.client.openapi.models.V1JobSpec;
 import io.kubernetes.client.openapi.models.V1ObjectMeta;
 import io.kubernetes.client.openapi.models.V1OwnerReference;
-import io.kubernetes.client.openapi.models.V1beta1CronJob;
-import io.kubernetes.client.openapi.models.V1beta1CronJobSpec;
+import io.kubernetes.client.openapi.models.V1CronJob;
+import io.kubernetes.client.openapi.models.V1CronJobSpec;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
@@ -32,13 +32,13 @@ public class Jobs {
    * @param jobName cronJob name
    * @return V1Job object
    */
-  public static V1Job cronJobToJob(V1beta1CronJob cronJob, String jobName) {
+  public static V1Job cronJobToJob(V1CronJob cronJob, String jobName) {
 
     Map<String, String> annotations = new HashMap<>();
     Map<String, String> labels = new HashMap<>();
     V1JobSpec jobSpec = null;
 
-    V1beta1CronJobSpec cronJobSpec = cronJob.getSpec();
+    V1CronJobSpec cronJobSpec = cronJob.getSpec();
 
     if (cronJobSpec != null && cronJobSpec.getJobTemplate() != null) {
       V1ObjectMeta metadata = cronJobSpec.getJobTemplate().getMetadata();
diff --git a/util/src/test/java/io/kubernetes/client/informer/cache/CacheTest.java b/util/src/test/java/io/kubernetes/client/informer/cache/CacheTest.java
@@ -121,17 +121,17 @@ public void testCacheStore() {
     V1Pod pod = ((V1Pod) this.obj);
     List indexedObjectList = cache.byIndex(mockIndexName, this.index);
     assertEquals(0, indexedObjectList.size());
-    assertEquals(null, pod.getMetadata().getClusterName());
+    assertEquals(null, pod.getMetadata().getResourceVersion());
 
     cache.add(this.obj);
 
     // replace cached object w/ null value
     String newClusterName = "test_cluster";
-    pod.getMetadata().setClusterName(newClusterName);
+    pod.getMetadata().setResourceVersion(newClusterName);
     cache.update(this.obj);
 
     assertEquals(1, cache.list().size());
-    assertEquals(newClusterName, pod.getMetadata().getClusterName());
+    assertEquals(newClusterName, pod.getMetadata().getResourceVersion());
   }
 
   @Test
@@ -162,7 +162,6 @@ public void testAddIndexers() {
     Cache<V1Pod> podCache = new Cache<>();
 
     String nodeIndex = "node-index";
-    String clusterIndex = "cluster-index";
 
     Map<String, Function<V1Pod, List<String>>> indexers = new HashMap<>();
 
@@ -172,17 +171,11 @@ public void testAddIndexers() {
           return Arrays.asList(pod.getSpec().getNodeName());
         });
 
-    indexers.put(
-        clusterIndex,
-        (V1Pod pod) -> {
-          return Arrays.asList(pod.getMetadata().getClusterName());
-        });
-
     podCache.addIndexers(indexers);
 
     V1Pod testPod =
         new V1Pod()
-            .metadata(new V1ObjectMeta().namespace("ns").name("n").clusterName("cluster1"))
+            .metadata(new V1ObjectMeta().namespace("ns").name("n"))
             .spec(new V1PodSpec().nodeName("node1"));
 
     podCache.add(testPod);
@@ -193,7 +186,5 @@ public void testAddIndexers() {
     List<V1Pod> nodeNameIndexedPods = podCache.byIndex(nodeIndex, "node1");
     assertEquals(1, nodeNameIndexedPods.size());
 
-    List<V1Pod> clusterNameIndexedPods = podCache.byIndex(clusterIndex, "cluster1");
-    assertEquals(1, clusterNameIndexedPods.size());
   }
 }
