diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/EnvConverter.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/EnvConverter.java index 2c46fcc763b14..f7cf920ee72aa 100644 --- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/EnvConverter.java +++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/EnvConverter.java @@ -41,6 +41,6 @@ public static List convert(EnvVarsConfig e) { } public static String convertName(String name) { - return name != null ? name.toUpperCase().replace("-", "_") : null; + return name != null ? name.toUpperCase().replace('-', '_').replace('.', '_') : null; } } diff --git a/integration-tests/kubernetes/quarkus-standard-way/pom.xml b/integration-tests/kubernetes/quarkus-standard-way/pom.xml index bf29811dccd39..7e092e99e28d1 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/pom.xml +++ b/integration-tests/kubernetes/quarkus-standard-way/pom.xml @@ -17,7 +17,7 @@ io.quarkus - quarkus-resteasy + quarkus-resteasy-reactive io.quarkus @@ -115,7 +115,7 @@ io.quarkus - quarkus-resteasy-deployment + quarkus-resteasy-reactive-deployment ${project.version} pom test diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithNewStyleEnvTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithNewStyleEnvTest.java index 83014993aed29..c446745ef4749 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithNewStyleEnvTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithNewStyleEnvTest.java @@ -57,6 +57,9 @@ public void assertGeneratedResources() throws IOException { assertThat(container.getEnv()) .filteredOn(env -> "ENVVAR".equals(env.getName())) .singleElement().satisfies(env -> assertThat(env.getValue()).isEqualTo("value")); + assertThat(container.getEnv()) + .filteredOn(env -> "QUARKUS_KUBERNETES_CONFIG_ENABLED".equals(env.getName())) + .singleElement().satisfies(env -> assertThat(env.getValue()).isEqualTo("true")); final List envFrom = container.getEnvFrom(); assertThat(envFrom).hasSize(2); assertThat(envFrom) diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-new-style-env.properties b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-new-style-env.properties index 660b6f89691d4..2ce8ad4bb0d16 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-new-style-env.properties +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-new-style-env.properties @@ -1,4 +1,5 @@ quarkus.kubernetes.env.fields.fromfield=metadata.name quarkus.kubernetes.env.vars.envvar=value +quarkus.kubernetes.env.vars."quarkus.kubernetes-config.enabled"=true quarkus.kubernetes.env.configmaps=configName quarkus.kubernetes.env.secrets=secretName