Update to io.kubernetes:client-java:23. Adapt code to the breaking changes introduced in io.kubernetes:client-java:20 (#111)

Signed-off-by: Artem Zatsarynnyi <[email protected]>

Author: azatsarynnyy

.gitignore

@@ -3,3 +3,5 @@
 .qodana
 build
 .DS_Store
+.intellijPlatform/
+.kotlin/

build.gradle.kts

@@ -43,13 +43,12 @@ dependencies {
         // Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file for plugin from JetBrains Marketplace.
         plugins(providers.gradleProperty("platformPlugins").map { it.split(',') })
 
-        instrumentationTools()
         pluginVerifier()
         zipSigner()
         testFramework(TestFrameworkType.JUnit5)
     }
 
-    implementation("io.kubernetes:client-java:18.0.1")
+    implementation("io.kubernetes:client-java:23.0.0")
 }
 
 // Configure IntelliJ Platform Gradle Plugin - read more: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-extension.html

gradle.properties

@@ -13,7 +13,7 @@ pluginUntilBuild = 243.*
 # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
 platformType = GW
 #https://www.jetbrains.com/updates/updates.xml
-platformVersion = 243.21155.27
+platformVersion = 2024.3.3
 
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.jetbrains.php:203.4449.22, org.intellij.scala:2023.3.27@EAP

src/main/kotlin/com/redhat/devtools/gateway/openshift/DevWorkspaces.kt

@@ -12,9 +12,11 @@
 package com.redhat.devtools.gateway.openshift
 
 import com.google.gson.reflect.TypeToken
+import io.kubernetes.client.custom.V1Patch
 import io.kubernetes.client.openapi.ApiClient
 import io.kubernetes.client.openapi.ApiException
 import io.kubernetes.client.openapi.apis.CustomObjectsApi
+import io.kubernetes.client.util.PatchUtils
 import io.kubernetes.client.util.Watch
 import java.io.IOException
 import java.util.concurrent.Executors
@@ -36,18 +38,8 @@ class DevWorkspaces(private val client: ApiClient) {
             "workspace.devfile.io",
             "v1alpha2",
             namespace,
-            "devworkspaces",
-            "false",
-            false,
-            "",
-            "",
-            "",
-            -1,
-            "",
-            "",
-            -1,
-            false
-        )
+            "devworkspaces"
+        ).execute()
 
         val dwItems = Utils.getValue(response, arrayOf("items")) as List<*>
         return dwItems
@@ -64,7 +56,7 @@ class DevWorkspaces(private val client: ApiClient) {
             namespace,
             "devworkspaces",
             name
-        )
+        ).execute()
         return DevWorkspace.from(dwObj)
     }
 
@@ -120,45 +112,43 @@ class DevWorkspaces(private val client: ApiClient) {
         return phaseIsDesiredState
     }
 
+    // Example:
+    // https://github.com/kubernetes-client/java/blob/master/examples/examples-release-20/src/main/java/io/kubernetes/client/examples/PatchExample.java
     @Throws(ApiException::class)
     private fun doPatch(namespace: String, name: String, body: Any) {
         val customApi = CustomObjectsApi(client)
-        customApi.patchNamespacedCustomObject(
-            "workspace.devfile.io",
-            "v1alpha2",
-            namespace,
-            "devworkspaces",
-            name,
-            body,
-            null,
-            null,
-            null
+        PatchUtils.patch(
+            DevWorkspace.javaClass,
+            {
+                customApi.patchNamespacedCustomObject(
+                    "workspace.devfile.io",
+                    "v1alpha2",
+                    namespace,
+                    "devworkspaces",
+                    name,
+                    body
+                ).buildCall(null)
+            },
+            V1Patch.PATCH_FORMAT_JSON_PATCH,
+            customApi.apiClient
         )
     }
 
     // Example:
-    // https://github.com/kubernetes-client/java/blob/master/examples/examples-release-18/src/main/java/io/kubernetes/client/examples/WatchExample.java
+    // https://github.com/kubernetes-client/java/blob/master/examples/examples-release-20/src/main/java/io/kubernetes/client/examples/WatchExample.java
     private fun createWatcher(namespace: String, fieldSelector: String = "", labelSelector: String = ""): Watch<Any> {
         val customObjectsApi = CustomObjectsApi(client)
         return Watch.createWatch(
             client,
-            customObjectsApi.listNamespacedCustomObjectCall(
+            customObjectsApi.listNamespacedCustomObject(
                 "workspace.devfile.io",
                 "v1alpha2",
                 namespace,
-                "devworkspaces",
-                "false",
-                false,
-                "",
-                fieldSelector,
-                labelSelector,
-                -1,
-                "",
-                "",
-                0,
-                true,
-                null
-            ),
+                "devworkspaces"
+            ).fieldSelector(fieldSelector)
+                .labelSelector(labelSelector)
+                .watch(true)
+                .buildCall(null),
             object : TypeToken<Watch.Response<Any>>() {}.type
         )
     }

src/main/kotlin/com/redhat/devtools/gateway/openshift/Pods.kt

@@ -28,11 +28,10 @@ import java.net.ServerSocket
 import java.net.Socket
 import java.nio.channels.*
 
-
 class Pods(private val client: ApiClient) {
 
     // Example:
-    // https://github.com/kubernetes-client/java/blob/master/examples/examples-release-18/src/main/java/io/kubernetes/client/examples/ExecExample.java
+    // https://github.com/kubernetes-client/java/blob/master/examples/examples-release-20/src/main/java/io/kubernetes/client/examples/ExecExample.java
     @Throws(IOException::class)
     fun exec(pod: V1Pod, command: Array<String>, container: String): String {
         val output = ByteArrayOutputStream()
@@ -52,7 +51,7 @@ class Pods(private val client: ApiClient) {
     }
 
     // Example:
-    // https://github.com/kubernetes-client/java/blob/master/examples/examples-release-18/src/main/java/io/kubernetes/client/examples/PortForwardExample.java
+    // https://github.com/kubernetes-client/java/blob/master/examples/examples-release-20/src/main/java/io/kubernetes/client/examples/PortForwardExample.java
     @Throws(IOException::class)
     fun forward(pod: V1Pod, localPort: Int, remotePort: Int): Closeable {
         val serverSocket = ServerSocket(localPort, 50, InetAddress.getLoopbackAddress())
@@ -121,18 +120,9 @@ class Pods(private val client: ApiClient) {
 
     @Throws(ApiException::class)
     private fun doList(namespace: String, labelSelector: String = ""): V1PodList {
-        return CoreV1Api(client).listNamespacedPod(
-            namespace,
-            "false",
-            false,
-            "",
-            "",
-            labelSelector,
-            -1,
-            "",
-            "",
-            -1,
-            false
-        )
+        return CoreV1Api(client)
+            .listNamespacedPod(namespace)
+            .labelSelector(labelSelector)
+            .execute();
     }
 }

src/main/kotlin/com/redhat/devtools/gateway/openshift/Projects.kt

@@ -22,18 +22,8 @@ class Projects(private val client: ApiClient) {
         val response = customApi.listClusterCustomObject(
             "project.openshift.io",
             "v1",
-            "projects",
-            "false",
-            false,
-            "",
-            "",
-            "",
-            -1,
-            "",
-            "",
-            -1,
-            false
-        ) as Map<*, *>
+            "projects"
+        ).execute() as Map<*, *>
 
         return response["items"] as List<*>
     }