From 0b503b1b874bfeafe032715d3da888ef38a2bd35 Mon Sep 17 00:00:00 2001
From: csviri <csviri@gmail.com>
Date: Thu, 1 Sep 2022 08:44:04 +0200
Subject: [PATCH 1/3] chore: clien to v6.1.0

---
 .../java/io/javaoperatorsdk/operator/ReconcilerUtilsTest.java   | 2 ++
 pom.xml                                                         | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/ReconcilerUtilsTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/ReconcilerUtilsTest.java
index 3cf2a4a6bc..18ef67b0b0 100644
--- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/ReconcilerUtilsTest.java
+++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/ReconcilerUtilsTest.java
@@ -1,5 +1,6 @@
 package io.javaoperatorsdk.operator;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import io.fabric8.kubernetes.api.model.ContainerBuilder;
@@ -29,6 +30,7 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+@Disabled
 class ReconcilerUtilsTest {
 
   public static final String RESOURCE_URI =
diff --git a/pom.xml b/pom.xml
index 083cbd7944..3ac20f9e29 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
 
         <junit.version>5.9.0</junit.version>
-        <fabric8-client.version>6.0.0</fabric8-client.version>
+        <fabric8-client.version>6.1.0</fabric8-client.version>
         <slf4j.version>1.7.36</slf4j.version>
         <log4j.version>2.18.0</log4j.version>
         <mokito.version>4.7.0</mokito.version>

From b69a989611594ff160d0f4e7505df08d95dd8065 Mon Sep 17 00:00:00 2001
From: csviri <csviri@gmail.com>
Date: Thu, 1 Sep 2022 09:37:19 +0200
Subject: [PATCH 2/3] test fix

---
 .../operator/ReconcilerUtilsTest.java              | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/ReconcilerUtilsTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/ReconcilerUtilsTest.java
index 18ef67b0b0..1bdad72c76 100644
--- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/ReconcilerUtilsTest.java
+++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/ReconcilerUtilsTest.java
@@ -1,6 +1,7 @@
 package io.javaoperatorsdk.operator;
 
-import org.junit.jupiter.api.Disabled;
+import java.net.URI;
+
 import org.junit.jupiter.api.Test;
 
 import io.fabric8.kubernetes.api.model.ContainerBuilder;
@@ -14,6 +15,7 @@
 import io.fabric8.kubernetes.api.model.apps.DeploymentSpec;
 import io.fabric8.kubernetes.client.CustomResource;
 import io.fabric8.kubernetes.client.KubernetesClientException;
+import io.fabric8.kubernetes.client.http.HttpRequest;
 import io.fabric8.kubernetes.model.annotation.Group;
 import io.fabric8.kubernetes.model.annotation.ShortNames;
 import io.fabric8.kubernetes.model.annotation.Version;
@@ -29,8 +31,9 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
-@Disabled
 class ReconcilerUtilsTest {
 
   public static final String RESOURCE_URI =
@@ -118,10 +121,13 @@ private Deployment createTestDeployment() {
 
   @Test
   void handleKubernetesExceptionShouldThrowMissingCRDExceptionWhenAppropriate() {
+    var request = mock(HttpRequest.class);
+    when(request.uri()).thenReturn(URI
+        .create(RESOURCE_URI));
     assertThrows(MissingCRDException.class, () -> handleKubernetesClientException(
         new KubernetesClientException(
-            "Failure executing: GET at: https://kubernetes.docker.internal:6443/apis/tomcatoperator.io/v1/tomcats. Message: Not Found.",
-            404, null),
+            "Failure executing: GET at: " + RESOURCE_URI + ". Message: Not Found.",
+            null, 404, null, request),
         HasMetadata.getFullResourceName(Tomcat.class)));
   }
 

From 02cb85b8baaab95ff00bfa27d9b9ad6bb228bc51 Mon Sep 17 00:00:00 2001
From: csviri <csviri@gmail.com>
Date: Fri, 2 Sep 2022 08:41:39 +0200
Subject: [PATCH 3/3] bump to 6.1.1

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3ac20f9e29..fac2742029 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
 
         <junit.version>5.9.0</junit.version>
-        <fabric8-client.version>6.1.0</fabric8-client.version>
+        <fabric8-client.version>6.1.1</fabric8-client.version>
         <slf4j.version>1.7.36</slf4j.version>
         <log4j.version>2.18.0</log4j.version>
         <mokito.version>4.7.0</mokito.version>