From 73a5a246182fcb2c5db241817b4a474becb9d67d Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Thu, 4 Nov 2021 21:49:34 +0100 Subject: [PATCH 1/4] fix: date format has changed in fabric8 5.9 --- .../event/internal/CustomResourceSelectorTest.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/internal/CustomResourceSelectorTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/internal/CustomResourceSelectorTest.java index b6094a0ffe..1d8aaa2497 100644 --- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/internal/CustomResourceSelectorTest.java +++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/internal/CustomResourceSelectorTest.java @@ -1,8 +1,7 @@ package io.javaoperatorsdk.operator.processing.event.internal; import java.text.ParseException; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; +import java.text.SimpleDateFormat; import java.util.Date; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; @@ -17,6 +16,7 @@ import io.fabric8.kubernetes.api.model.ObjectMetaBuilder; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.VersionInfo; +import io.fabric8.kubernetes.client.VersionInfo.VersionKeys; import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.javaoperatorsdk.operator.Operator; @@ -50,9 +50,7 @@ public class CustomResourceSelectorTest { @SuppressWarnings("unchecked") @BeforeEach void setUpResources() throws ParseException { - String buildDate = - DateTimeFormatter.ofPattern(VersionInfo.VersionKeys.BUILD_DATE_FORMAT) - .format(LocalDateTime.now()); + String buildDate = new SimpleDateFormat(VersionKeys.BUILD_DATE_FORMAT).format(new Date()); server .expect() From 8f131df212043626ff349239c1c6f9948f6ccef9 Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Mon, 8 Nov 2021 12:05:34 +0100 Subject: [PATCH 2/4] fix: mocking the version isn't needed anymore in 5.10 --- .../internal/CustomResourceSelectorTest.java | 21 +------------------ 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/internal/CustomResourceSelectorTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/internal/CustomResourceSelectorTest.java index 1d8aaa2497..428540ca1e 100644 --- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/internal/CustomResourceSelectorTest.java +++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/internal/CustomResourceSelectorTest.java @@ -1,7 +1,5 @@ package io.javaoperatorsdk.operator.processing.event.internal; -import java.text.ParseException; -import java.text.SimpleDateFormat; import java.util.Date; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; @@ -15,8 +13,6 @@ import io.fabric8.kubernetes.api.model.ObjectMetaBuilder; import io.fabric8.kubernetes.client.KubernetesClient; -import io.fabric8.kubernetes.client.VersionInfo; -import io.fabric8.kubernetes.client.VersionInfo.VersionKeys; import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.javaoperatorsdk.operator.Operator; @@ -49,22 +45,7 @@ public class CustomResourceSelectorTest { @SuppressWarnings("unchecked") @BeforeEach - void setUpResources() throws ParseException { - String buildDate = new SimpleDateFormat(VersionKeys.BUILD_DATE_FORMAT).format(new Date()); - - server - .expect() - .get() - .withPath("/version") - .andReturn( - 200, - new VersionInfo.Builder() - .withBuildDate(buildDate) - .withMajor("1") - .withMinor("21") - .build()) - .always(); - + void setUpResources() { configurationService = spy(ConfigurationService.class); when(configurationService.checkCRDAndValidateLocalModel()).thenReturn(false); when(configurationService.getVersion()).thenReturn(new Version("1", "1", new Date())); From d5b946a7befa3cbebc732ddce196b577f32b2b01 Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Thu, 11 Nov 2021 16:09:05 +0100 Subject: [PATCH 3/4] chore: update to Fabric8 client 5.10.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f7aaaa90ec..a0e72e447c 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ ${java.version} 5.8.1 - 5.8.0 + 5.10.0 1.7.32 2.14.1 4.0.0 From 299382629b627a6d6b10f3d767b2f1126f11ea92 Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Fri, 12 Nov 2021 15:55:07 +0100 Subject: [PATCH 4/4] chore(deps): update to Fabric8 client 5.10.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a0e72e447c..c0f21cb936 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ ${java.version} 5.8.1 - 5.10.0 + 5.10.1 1.7.32 2.14.1 4.0.0