bump kubernetes-client to 6.10 (redhat-developer#713)

Signed-off-by: Andre Dietisheim <[email protected]>

Author: adietish

build.gradle

@@ -59,13 +59,15 @@ dependencies {
             "io.fabric8:kubernetes-model-common:${kubernetesClientVersion}",
             "io.fabric8:openshift-client:${kubernetesClientVersion}",
             "io.fabric8:kubernetes-httpclient-okhttp:${kubernetesClientVersion}",
+            "com.fasterxml.jackson.core:jackson-core:2.16.2",
             "org.apache.commons:commons-lang3:3.12.0"
     )
     testImplementation(
             "org.assertj:assertj-core:3.22.0",
             "org.mockito:mockito-inline:4.5.1",
             "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0",
             "org.jetbrains.kotlin:kotlin-test-junit:${kotlinVersion}",
+            "com.fasterxml.jackson.core:jackson-core:2.16.2", /* IC-2022.1 provides an incompatible version */
             "org.yaml:snakeyaml:1.33" /* IC-2023.2 provides incompatible 2.0 */
     )
     integrationTestImplementation(

gradle.properties

@@ -12,5 +12,5 @@ telemetryPluginVersion=1.1.0.52
 kotlin.stdlib.default.dependency = false
 kotlinVersionIdea221=1.6.21
 kotlinVersionIdea211=1.4.32
-kubernetesClientVersion=6.4.0
+kubernetesClientVersion=6.10.0
 fixturesVersion=1.1.18

src/main/kotlin/com/redhat/devtools/intellij/kubernetes/model/resource/NamespacedResourceOperator.kt

@@ -117,7 +117,7 @@ abstract class NamespacedResourceOperator<R : HasMetadata, C: Client>(
             client.adapt(KubernetesClient::class.java)
                 .resource(toReplace)
                 .inNamespace(inNamespace)
-                .replace()
+                .patch()
         }
     }
 

src/main/kotlin/com/redhat/devtools/intellij/kubernetes/model/resource/NonNamespacedResourceOperator.kt

@@ -87,7 +87,7 @@ abstract class NonNamespacedResourceOperator<R : HasMetadata, C : Client>(
         return runWithoutServerSetProperties(toReplace) {
             client.adapt(KubernetesClient::class.java)
                 .resource(toReplace)
-                .replace()
+                .patch()
         }
     }
 

src/main/kotlin/com/redhat/devtools/intellij/kubernetes/model/resource/kubernetes/custom/NamespacedCustomResourceOperator.kt

@@ -86,7 +86,7 @@ open class NamespacedCustomResourceOperator(
 			getOperation()
 				?.inNamespace(inNamespace)
 				?.resource(toReplace)
-				?.createOrReplace()
+				?.patch()
 		}
 	}
 

src/main/kotlin/com/redhat/devtools/intellij/kubernetes/model/resource/kubernetes/custom/NonNamespacedCustomResourceOperator.kt

@@ -72,7 +72,10 @@ class NonNamespacedCustomResourceOperator(
         return runWithoutServerSetProperties(toReplace) {
             getOperation()
                 ?.resource(resource)
-                ?.createOrReplace()
+                /**
+                 * See: https://github.com/fabric8io/kubernetes-client/blob/main/doc/FAQ.md#alternatives-to-createOrReplace-and-replace
+                 */
+                ?.patch()
         }
     }
 

src/main/kotlin/com/redhat/devtools/intellij/kubernetes/model/util/ResourceUtils.kt

@@ -16,9 +16,6 @@ import io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinition
 import io.fabric8.kubernetes.client.utils.ApiVersionUtil
 import io.fabric8.kubernetes.client.utils.KubernetesVersionPriority
 import io.fabric8.kubernetes.client.utils.Serialization
-import io.fabric8.kubernetes.model.annotation.Group
-import io.fabric8.kubernetes.model.annotation.Version
-import io.fabric8.kubernetes.model.util.Helper
 import java.util.stream.Collectors
 
 const val MARKER_WILL_BE_DELETED = "willBeDeleted"
@@ -128,13 +125,13 @@ fun String.isGreaterIntThan(other: String?): Boolean {
  * @see io.fabric8.kubernetes.model.annotation.Group (annotation)
  */
 fun getApiVersion(clazz: Class<out HasMetadata>): String {
-	val apiVersion = Helper.getAnnotationValue(clazz, Version::class.java)
-	return if (!apiVersion.isNullOrBlank()) {
-		val apiGroup = Helper.getAnnotationValue(clazz, Group::class.java)
-		if (!apiGroup.isNullOrBlank()) {
-			getApiVersion(apiGroup, apiVersion)
+	val version = HasMetadata.getVersion(clazz)
+	return if (!version.isNullOrBlank()) {
+		val group = HasMetadata.getGroup(clazz)
+		if (!group.isNullOrBlank()) {
+			getApiVersion(group, version)
 		} else {
-			apiVersion
+			version
 		}
 	} else {
 		clazz.simpleName

src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/mocks/ClientMocks.kt

@@ -130,15 +130,15 @@ object ClientMocks {
     ) {
         val inNamespaceOp: Resource<HasMetadata> = mock {
             on { delete() } doReturn statusDetails
-            on { replace() } doReturn resource
+            on { patch() } doReturn resource
             on { create() } doReturn resource
             on { get() } doReturn resource
         }
         /** [KubernetesClient.resource] */
         val resourceOperation: NamespaceableResource<HasMetadata> = mock {
             on { inNamespace(any()) } doReturn inNamespaceOp
             on { delete() } doReturn statusDetails
-            on { replace() } doReturn resource
+            on { patch() } doReturn resource
         }
 
         doReturn(resourceOperation)

src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/resource/kubernetes/NamespacedPodsOperatorTest.kt

@@ -381,7 +381,7 @@ class NamespacedPodsOperatorTest {
         verify(client.get().adapt(KubernetesClient::class.java)
             .resource(toReplace)
             .inNamespace(toReplace.metadata.namespace))
-            .replace()
+            .patch()
     }
 
     @Test
@@ -424,7 +424,7 @@ class NamespacedPodsOperatorTest {
         verify(client.get().adapt(KubernetesClient::class.java)
             .resource(toReplace)
             .inNamespace(toReplace.metadata.namespace))
-            .replace()
+            .patch()
     }
 
     @Test
@@ -436,7 +436,7 @@ class NamespacedPodsOperatorTest {
         whenever(client.get().adapt(KubernetesClient::class.java)
             .resource(toReplace)
             .inNamespace(toReplace.metadata.namespace)
-            .replace())
+            .patch())
             .thenReturn(POD3)
         // when
         val newPod = operator.replace(toReplace)