Ref #28363: update k8s client

Author: LEDfan

pom.xml

@@ -16,7 +16,7 @@
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.release>11</maven.compiler.release>
         <maven.compiler.target>11</maven.compiler.target>
-        <version.fabric8.client>5.12.2</version.fabric8.client>
+        <version.fabric8.client>6.1.1</version.fabric8.client>
         <kotlin.version>1.5.20</kotlin.version>
         <kotlin.compiler.incremental>true</kotlin.compiler.incremental>
         <junit.jupiter.version>5.6.0</junit.jupiter.version>
@@ -290,4 +290,3 @@
 
 
 </project>
-

src/main/kotlin/eu/openanalytics/shinyproxyoperator/components/ConfigMapFactory.kt

@@ -49,7 +49,7 @@ class ConfigMapFactory(private val kubeClient: KubernetesClient) {
                         .withKind("ShinyProxy")
                         .withApiVersion("openanalytics.eu/v1")
                         .withName(shinyProxy.metadata.name)
-                        .withNewUid(shinyProxy.metadata.uid)
+                        .withUid(shinyProxy.metadata.uid)
                     .endOwnerReference()
                 .endMetadata()
                 .addToData("application.yml", shinyProxy.specAsYaml)

src/main/kotlin/eu/openanalytics/shinyproxyoperator/components/ReplicaSetFactory.kt

@@ -45,7 +45,7 @@ class ReplicaSetFactory(private val kubeClient: KubernetesClient) {
                         .withKind("ShinyProxy")
                         .withApiVersion("openanalytics.eu/v1")
                         .withName(shinyProxy.metadata.name)
-                        .withNewUid(shinyProxy.metadata.uid)
+                        .withUid(shinyProxy.metadata.uid)
                     .endOwnerReference()
                 .endMetadata()
                 .withNewSpec()

src/main/kotlin/eu/openanalytics/shinyproxyoperator/components/ServiceFactory.kt

@@ -44,7 +44,7 @@ class ServiceFactory(private val kubeClient: KubernetesClient) {
                         .withKind("ShinyProxy")
                         .withApiVersion("openanalytics.eu/v1")
                         .withName(shinyProxy.metadata.name)
-                        .withNewUid(shinyProxy.metadata.uid)
+                        .withUid(shinyProxy.metadata.uid)
                     .endOwnerReference()
                 .endMetadata()
                 .withNewSpec()

src/main/kotlin/eu/openanalytics/shinyproxyoperator/ingress/skipper/IngressController.kt

@@ -36,7 +36,7 @@ import io.fabric8.kubernetes.client.dsl.MixedOperation
 import io.fabric8.kubernetes.client.dsl.Resource
 import io.fabric8.kubernetes.client.informers.cache.Indexer
 import io.fabric8.kubernetes.client.informers.cache.Lister
-import io.fabric8.kubernetes.client.internal.readiness.Readiness
+import io.fabric8.kubernetes.client.readiness.Readiness
 import kotlinx.coroutines.channels.SendChannel
 import mu.KotlinLogging
 

src/main/kotlin/eu/openanalytics/shinyproxyoperator/ingress/skipper/IngressFactory.kt

@@ -59,7 +59,7 @@ class IngressFactory(private val kubeClient: KubernetesClient) {
                             .withKind("ReplicaSet")
                             .withApiVersion("apps/v1")
                             .withName(ResourceNameFactory.createNameForReplicaSet(shinyProxy, shinyProxyInstance))
-                            .withNewUid(replicaSet.metadata.uid)
+                            .withUid(replicaSet.metadata.uid)
                         .endOwnerReference()
                         .withAnnotations<String, String>(routeAnnotations)
                     .endMetadata()

src/test/kotlin/eu/openanalytics/shinyproxyoperator/MainIntegrationTest.kt

@@ -29,7 +29,7 @@ import eu.openanalytics.shinyproxyoperator.helpers.ShinyProxyTestInstance
 import eu.openanalytics.shinyproxyoperator.helpers.isStartupProbesSupported
 import io.fabric8.kubernetes.api.model.IntOrString
 import io.fabric8.kubernetes.client.NamespacedKubernetesClient
-import io.fabric8.kubernetes.client.internal.readiness.Readiness
+import io.fabric8.kubernetes.client.readiness.Readiness
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch