From a4695700c5b74bd65ac03b6c0408b410c5ccc6cf Mon Sep 17 00:00:00 2001 From: csviri Date: Mon, 29 May 2023 11:10:45 +0200 Subject: [PATCH 1/3] fix: same shortn name for multi version crd --- .../multiversioncrd/MultiVersionCRDTestCustomResource1.java | 2 +- .../multiversioncrd/MultiVersionCRDTestCustomResource2.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiversioncrd/MultiVersionCRDTestCustomResource1.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiversioncrd/MultiVersionCRDTestCustomResource1.java index ea06b6a12e..e050ccfb35 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiversioncrd/MultiVersionCRDTestCustomResource1.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiversioncrd/MultiVersionCRDTestCustomResource1.java @@ -10,7 +10,7 @@ @Group("sample.javaoperatorsdk") @Version("v1") @Kind("MultiVersionCRDTestCustomResource") -@ShortNames("mv1") +@ShortNames("mvc") public class MultiVersionCRDTestCustomResource1 extends CustomResource diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiversioncrd/MultiVersionCRDTestCustomResource2.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiversioncrd/MultiVersionCRDTestCustomResource2.java index ddd8ef48aa..5f29c88c51 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiversioncrd/MultiVersionCRDTestCustomResource2.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiversioncrd/MultiVersionCRDTestCustomResource2.java @@ -10,7 +10,7 @@ @Group("sample.javaoperatorsdk") @Version(value = "v2", storage = false) @Kind("MultiVersionCRDTestCustomResource") -@ShortNames("mv2") +@ShortNames("mvc") public class MultiVersionCRDTestCustomResource2 extends CustomResource From f6faac375a286a5a333fd6096556b5366a7d5302 Mon Sep 17 00:00:00 2001 From: csviri Date: Mon, 29 May 2023 11:28:23 +0200 Subject: [PATCH 2/3] logging crd in IT --- .../operator/junit/LocallyRunOperatorExtension.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/operator-framework-junit5/src/main/java/io/javaoperatorsdk/operator/junit/LocallyRunOperatorExtension.java b/operator-framework-junit5/src/main/java/io/javaoperatorsdk/operator/junit/LocallyRunOperatorExtension.java index e852455ebf..36cc9a889b 100644 --- a/operator-framework-junit5/src/main/java/io/javaoperatorsdk/operator/junit/LocallyRunOperatorExtension.java +++ b/operator-framework-junit5/src/main/java/io/javaoperatorsdk/operator/junit/LocallyRunOperatorExtension.java @@ -1,6 +1,8 @@ package io.javaoperatorsdk.operator.junit; +import java.io.ByteArrayInputStream; import java.io.InputStream; +import java.nio.charset.StandardCharsets; import java.time.Duration; import java.util.ArrayList; import java.util.HashMap; @@ -176,7 +178,9 @@ public static void applyCrd(String resourceTypeName, KubernetesClient client) { if (is == null) { throw new IllegalStateException("Cannot find CRD at " + path); } - final var crd = client.load(is); + var crdString = new String(is.readAllBytes(), StandardCharsets.UTF_8); + LOGGER.debug("Applying CRD: {}",crdString); + final var crd = client.load(new ByteArrayInputStream(crdString.getBytes())); crd.createOrReplace(); Thread.sleep(CRD_READY_WAIT); // readiness is not applicable for CRD, just wait a little LOGGER.debug("Applied CRD with path: {}", path); From b80834806d02acf6be1e9dfe1b975968876d52bc Mon Sep 17 00:00:00 2001 From: csviri Date: Mon, 29 May 2023 11:31:56 +0200 Subject: [PATCH 3/3] format --- .../operator/junit/LocallyRunOperatorExtension.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/operator-framework-junit5/src/main/java/io/javaoperatorsdk/operator/junit/LocallyRunOperatorExtension.java b/operator-framework-junit5/src/main/java/io/javaoperatorsdk/operator/junit/LocallyRunOperatorExtension.java index 36cc9a889b..a174435f20 100644 --- a/operator-framework-junit5/src/main/java/io/javaoperatorsdk/operator/junit/LocallyRunOperatorExtension.java +++ b/operator-framework-junit5/src/main/java/io/javaoperatorsdk/operator/junit/LocallyRunOperatorExtension.java @@ -179,7 +179,7 @@ public static void applyCrd(String resourceTypeName, KubernetesClient client) { throw new IllegalStateException("Cannot find CRD at " + path); } var crdString = new String(is.readAllBytes(), StandardCharsets.UTF_8); - LOGGER.debug("Applying CRD: {}",crdString); + LOGGER.debug("Applying CRD: {}", crdString); final var crd = client.load(new ByteArrayInputStream(crdString.getBytes())); crd.createOrReplace(); Thread.sleep(CRD_READY_WAIT); // readiness is not applicable for CRD, just wait a little