From c64cb7050bac9fdd6bd46c3ca67aacccc647a8a1 Mon Sep 17 00:00:00 2001 From: Ioannis Canellos Date: Thu, 20 Jan 2022 12:50:14 +0200 Subject: [PATCH] chore: substitute refs to deprecated methods --- .../kubernetes/deployment/KubernetesCommonHelper.java | 4 ++-- .../kubernetes/KubernetesWithQuarkusAppNameTest.java | 11 +++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesCommonHelper.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesCommonHelper.java index 34aa32d81a76e2..2be2534d6669a5 100644 --- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesCommonHelper.java +++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesCommonHelper.java @@ -330,7 +330,7 @@ private static List createAppConfigVolumeAndEnvDecorators(Op config.getAppSecret().ifPresent(s -> { result.add(new DecoratorBuildItem(target, new AddSecretVolumeDecorator(new SecretVolumeBuilder() .withSecretName(s) - .withNewVolumeName("app-secret") + .withVolumeName("app-secret") .build()))); result.add(new DecoratorBuildItem(target, new AddMountDecorator(new MountBuilder() .withName("app-secret") @@ -342,7 +342,7 @@ private static List createAppConfigVolumeAndEnvDecorators(Op config.getAppConfigMap().ifPresent(s -> { result.add(new DecoratorBuildItem(target, new AddConfigMapVolumeDecorator(new ConfigMapVolumeBuilder() .withConfigMapName(s) - .withNewVolumeName("app-config-map") + .withVolumeName("app-config-map") .build()))); result.add(new DecoratorBuildItem(target, new AddMountDecorator(new MountBuilder() .withName("app-config-map") diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithQuarkusAppNameTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithQuarkusAppNameTest.java index 515f0ae6909528..3f19f8e0051dd9 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithQuarkusAppNameTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithQuarkusAppNameTest.java @@ -5,6 +5,7 @@ import java.io.IOException; import java.nio.file.Path; +import java.util.Arrays; import java.util.List; import org.junit.jupiter.api.Test; @@ -12,6 +13,8 @@ import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.apps.Deployment; +import io.quarkus.bootstrap.model.AppArtifact; +import io.quarkus.builder.Version; import io.quarkus.test.ProdBuildResults; import io.quarkus.test.ProdModeTestResults; import io.quarkus.test.QuarkusProdModeTest; @@ -23,7 +26,11 @@ public class KubernetesWithQuarkusAppNameTest { .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) .setApplicationName("kubernetes-with-quarkus-app-name") .setApplicationVersion("0.1-SNAPSHOT") - .withConfigurationResource("kubernetes-with-quarkus-app-name.properties"); + .withConfigurationResource("kubernetes-with-quarkus-app-name.properties") + .setForcedDependencies( + Arrays.asList( + new AppArtifact("io.quarkus", "quarkus-kubernetes", Version.getVersion()), + new AppArtifact("io.quarkus", "quarkus-container-image-s2i", Version.getVersion()))); @ProdBuildResults private ProdModeTestResults prodModeTestResults; @@ -48,7 +55,7 @@ public void assertGeneratedResources() throws IOException { List openshiftList = DeserializationUtil .deserializeAsList(kubernetesDir.resolve("openshift.yml")); assertThat(openshiftList).allSatisfy(h -> { - assertThat(h.getMetadata().getName()).isIn("ofoo", "s2ifoo", "s2i-java"); + assertThat(h.getMetadata().getName()).isIn("ofoo", "foo", "openjdk-11"); assertThat(h.getMetadata().getLabels()).contains(entry("app.kubernetes.io/name", "ofoo"), entry("app.kubernetes.io/version", "1.0-openshift")); });