From e1a28ebac4297187b74d2aef1f407f7b78b891e1 Mon Sep 17 00:00:00 2001 From: Marc Nuri Date: Fri, 6 Oct 2023 11:25:39 +0200 Subject: [PATCH 1/5] ci: increase native tests heap memory Signed-off-by: Marc Nuri --- .github/workflows/ci-actions-incremental.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-actions-incremental.yml b/.github/workflows/ci-actions-incremental.yml index 47fa67d932ce2..63045ac0ab9f5 100644 --- a/.github/workflows/ci-actions-incremental.yml +++ b/.github/workflows/ci-actions-incremental.yml @@ -43,7 +43,7 @@ env: # Workaround testsuite locale issue LANG: en_US.UTF-8 COMMON_MAVEN_ARGS: "-e -B --settings .github/mvn-settings.xml --fail-at-end" - NATIVE_TEST_MAVEN_ARGS: "-Dtest-containers -Dstart-containers -Dquarkus.native.native-image-xmx=5g -Dnative -Dnative.surefire.skip -Dformat.skip -Dno-descriptor-tests clean install -DskipDocs" + NATIVE_TEST_MAVEN_ARGS: "-Dtest-containers -Dstart-containers -Dquarkus.native.native-image-xmx=6g -Dnative -Dnative.surefire.skip -Dformat.skip -Dno-descriptor-tests clean install -DskipDocs" JVM_TEST_MAVEN_ARGS: "-Dtest-containers -Dstart-containers -Dformat.skip -DskipDocs -Dquarkus.test.hang-detection-timeout=60" DB_USER: hibernate_orm_test DB_PASSWORD: hibernate_orm_test From f77a865cc39a6067ae481d6f8ee585ffb34ec1d7 Mon Sep 17 00:00:00 2001 From: Marc Nuri Date: Thu, 5 Oct 2023 18:31:01 +0200 Subject: [PATCH 2/5] deps: Bump kubernetes-client-bom from 6.8.1 to 6.9.2 Signed-off-by: Marc Nuri --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f7323a0c9aa8d..9f70dec9adab9 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ 11 11 true - + ${env.GRAALVM_HOME} jdbc:postgresql:hibernate_orm_test @@ -69,7 +69,7 @@ 0.8.11 - 6.8.1 + 6.9.2 1.59.0 From e013c3dcfb77fa31e2b25bacc0b778bdf70bb87e Mon Sep 17 00:00:00 2001 From: Marc Nuri Date: Mon, 6 Nov 2023 11:33:06 +0100 Subject: [PATCH 3/5] deps: Bump dekorate from 4.0.0 to 4.0.3 Signed-off-by: Marc Nuri --- bom/application/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bom/application/pom.xml b/bom/application/pom.xml index 12ba92c88e127..9bff60d9dfac4 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -163,7 +163,7 @@ 1.7.3 0.27.0 1.6.0 - 4.0.0 + 4.0.3 3.2.0 4.2.0 3.0.2.Final @@ -3291,7 +3291,7 @@ importmap ${importmap.version} - + biz.paluch.logging From c59ee9a7ee4f75c262e1cc462820ba950407709a Mon Sep 17 00:00:00 2001 From: Marc Nuri Date: Fri, 10 Nov 2023 11:47:32 +0100 Subject: [PATCH 4/5] test: exclude large model dependencies from Kubernetes Client ITs Signed-off-by: Marc Nuri --- integration-tests/kubernetes-client/pom.xml | 10 ++++++++++ integration-tests/openshift-client/pom.xml | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/integration-tests/kubernetes-client/pom.xml b/integration-tests/kubernetes-client/pom.xml index e0d02c3760892..e42dbf9900162 100644 --- a/integration-tests/kubernetes-client/pom.xml +++ b/integration-tests/kubernetes-client/pom.xml @@ -25,6 +25,16 @@ io.quarkus quarkus-openshift-client + + + io.fabric8 + openshift-model-operator + + + io.fabric8 + openshift-model-operator-hub + + org.bouncycastle diff --git a/integration-tests/openshift-client/pom.xml b/integration-tests/openshift-client/pom.xml index a3d35c28736c7..faf03cd12a834 100644 --- a/integration-tests/openshift-client/pom.xml +++ b/integration-tests/openshift-client/pom.xml @@ -22,6 +22,16 @@ io.quarkus quarkus-openshift-client ${project.version} + + + io.fabric8 + openshift-model-operator + + + io.fabric8 + openshift-model-operator-hub + + io.quarkus From 26713dbd5c26bdc8e723bbcafe81228c50637c8b Mon Sep 17 00:00:00 2001 From: Marc Nuri Date: Fri, 10 Nov 2023 15:34:05 +0100 Subject: [PATCH 5/5] test(kubernetes-client): allow incomplete model classpath Prevent Quarkus from adding --link-at-build-time GraalVM flag Signed-off-by: Marc Nuri --- .../deployment/pom.xml | 58 +++++++++++++++++++ .../client/deployment/NativeOverrides.java | 12 ++++ .../kubernetes-client-hack-extension/pom.xml | 21 +++++++ .../runtime/pom.xml | 48 +++++++++++++++ .../resources/META-INF/quarkus-extension.yaml | 11 ++++ integration-tests/kubernetes-client/pom.xml | 18 ++++++ integration-tests/openshift-client/pom.xml | 22 +++++++ integration-tests/pom.xml | 1 + 8 files changed, 191 insertions(+) create mode 100644 integration-tests/kubernetes-client-hack-extension/deployment/pom.xml create mode 100644 integration-tests/kubernetes-client-hack-extension/deployment/src/main/java/io/quarkus/kubernetes/client/deployment/NativeOverrides.java create mode 100644 integration-tests/kubernetes-client-hack-extension/pom.xml create mode 100644 integration-tests/kubernetes-client-hack-extension/runtime/pom.xml create mode 100644 integration-tests/kubernetes-client-hack-extension/runtime/src/main/resources/META-INF/quarkus-extension.yaml diff --git a/integration-tests/kubernetes-client-hack-extension/deployment/pom.xml b/integration-tests/kubernetes-client-hack-extension/deployment/pom.xml new file mode 100644 index 0000000000000..913462707b124 --- /dev/null +++ b/integration-tests/kubernetes-client-hack-extension/deployment/pom.xml @@ -0,0 +1,58 @@ + + + 4.0.0 + + + io.quarkus + quarkus-integration-test-kubernetes-client-hack-extension-parent + 999-SNAPSHOT + + + quarkus-integration-test-kubernetes-client-hack-extension-deployment + Quarkus - Integration Tests - Kubernetes Client Hack Extension - Deployment + + + + io.quarkus + quarkus-core-deployment + ${project.version} + + + io.quarkus + quarkus-integration-test-kubernetes-client-hack-extension + ${project.version} + + + + + + + maven-compiler-plugin + + + + io.quarkus + quarkus-extension-processor + ${project.version} + + + + + + org.codehaus.mojo + templating-maven-plugin + 1.0.0 + + + filtering-java-templates + + filter-sources + + + + + + + diff --git a/integration-tests/kubernetes-client-hack-extension/deployment/src/main/java/io/quarkus/kubernetes/client/deployment/NativeOverrides.java b/integration-tests/kubernetes-client-hack-extension/deployment/src/main/java/io/quarkus/kubernetes/client/deployment/NativeOverrides.java new file mode 100644 index 0000000000000..91372ea46589e --- /dev/null +++ b/integration-tests/kubernetes-client-hack-extension/deployment/src/main/java/io/quarkus/kubernetes/client/deployment/NativeOverrides.java @@ -0,0 +1,12 @@ +package io.quarkus.kubernetes.client.deployment; + +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.nativeimage.NativeImageAllowIncompleteClasspathBuildItem; + +public class NativeOverrides { + + @BuildStep + NativeImageAllowIncompleteClasspathBuildItem incompleteModel() { + return new NativeImageAllowIncompleteClasspathBuildItem("quarkus-kubernetes-client"); + } +} diff --git a/integration-tests/kubernetes-client-hack-extension/pom.xml b/integration-tests/kubernetes-client-hack-extension/pom.xml new file mode 100644 index 0000000000000..c29e01f59239c --- /dev/null +++ b/integration-tests/kubernetes-client-hack-extension/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + + + quarkus-extensions-parent + io.quarkus + 999-SNAPSHOT + ../../extensions/pom.xml + + + quarkus-integration-test-kubernetes-client-hack-extension-parent + Quarkus - Integration Tests - Kubernetes Client Hack Extension + pom + + deployment + runtime + + diff --git a/integration-tests/kubernetes-client-hack-extension/runtime/pom.xml b/integration-tests/kubernetes-client-hack-extension/runtime/pom.xml new file mode 100644 index 0000000000000..a0278c43dafaa --- /dev/null +++ b/integration-tests/kubernetes-client-hack-extension/runtime/pom.xml @@ -0,0 +1,48 @@ + + + 4.0.0 + + + io.quarkus + quarkus-integration-test-kubernetes-client-hack-extension-parent + 999-SNAPSHOT + + + quarkus-integration-test-kubernetes-client-hack-extension + Quarkus - Integration Tests - Kubernetes Client Hack Extension - Runtime + + + + io.quarkus + quarkus-core + ${project.version} + + + + + + + io.quarkus + quarkus-extension-maven-plugin + ${project.version} + + ${project.groupId}:${project.artifactId}-deployment:${project.version} + + + + maven-compiler-plugin + + + + io.quarkus + quarkus-extension-processor + ${project.version} + + + + + + + diff --git a/integration-tests/kubernetes-client-hack-extension/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/integration-tests/kubernetes-client-hack-extension/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 0000000000000..42eda1b64d7c5 --- /dev/null +++ b/integration-tests/kubernetes-client-hack-extension/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,11 @@ +--- +artifact: ${project.groupId}:${project.artifactId}:${project.version} +name: "Kubernetes Client Hack Extension" +metadata: + keywords: + - "kubernetes-client" + guide: "https://quarkus.io/guides/kubernetes-client" + categories: + - "cloud" + status: "test" + config: diff --git a/integration-tests/kubernetes-client/pom.xml b/integration-tests/kubernetes-client/pom.xml index e42dbf9900162..a08bd4306d397 100644 --- a/integration-tests/kubernetes-client/pom.xml +++ b/integration-tests/kubernetes-client/pom.xml @@ -22,6 +22,11 @@ io.quarkus quarkus-kubernetes-config + + io.quarkus + quarkus-integration-test-kubernetes-client-hack-extension + ${project.version} + io.quarkus quarkus-openshift-client @@ -85,6 +90,19 @@ + + io.quarkus + quarkus-integration-test-kubernetes-client-hack-extension-deployment + ${project.version} + pom + test + + + * + * + + + io.quarkus quarkus-openshift-client-deployment diff --git a/integration-tests/openshift-client/pom.xml b/integration-tests/openshift-client/pom.xml index faf03cd12a834..eef764d55f5e6 100644 --- a/integration-tests/openshift-client/pom.xml +++ b/integration-tests/openshift-client/pom.xml @@ -13,11 +13,20 @@ quarkus-integration-test-openshift-client Quarkus - Integration Tests - OpenShift Client + + true + + io.quarkus quarkus-resteasy-jackson + + io.quarkus + quarkus-integration-test-kubernetes-client-hack-extension + ${project.version} + io.quarkus quarkus-openshift-client @@ -61,6 +70,19 @@ + + io.quarkus + quarkus-integration-test-kubernetes-client-hack-extension-deployment + ${project.version} + pom + test + + + * + * + + + io.quarkus quarkus-openshift-client-deployment diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index b623b32388ee6..58ff872da1abd 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -285,6 +285,7 @@ amazon-lambda-http-resteasy amazon-lambda-http-resteasy-reactive container-image + kubernetes-client-hack-extension kubernetes kubernetes-client kubernetes-client-devservices