AddNamespaceDecorator doesn't override already set namespaces

Fixes quarkusio#29809
metacosm · Dec 13, 2022 · 4291255 · 4291255
1 parent 78397f4
commit 4291255
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 8 deletions.
diff --git a/...illa/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddNamespaceDecorator.java b/...illa/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddNamespaceDecorator.java
@@ -19,7 +19,9 @@ public AddNamespaceDecorator(String namespace) {
 
     @Override
     public void andThenVisit(ObjectMetaBuilder builder, ObjectMeta resourceMeta) {
-        builder.withNamespace(namespace);
+        if (!builder.hasNamespace()) {
+            builder.withNamespace(namespace);
+        }
     }
 
     @Override

diff --git a/.../src/test/java/io/quarkus/it/kubernetes/WithKubernetesClientAndExistingResourcesTest.java b/.../src/test/java/io/quarkus/it/kubernetes/WithKubernetesClientAndExistingResourcesTest.java
@@ -2,6 +2,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import io.fabric8.kubernetes.api.model.ObjectMeta;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Collections;
@@ -30,7 +31,7 @@ public class WithKubernetesClientAndExistingResourcesTest {
             .withConfigurationResource("kubernetes-with-" + APPLICATION_NAME + ".properties")
             .addCustomResourceEntry(Path.of("src", "main", "kubernetes", "kubernetes.yml"),
                     "manifests/kubernetes-with-" + APPLICATION_NAME + "/kubernetes.yml")
-            .setForcedDependencies(List.of(Dependency.of("io.quarkus", "quarkus-kubernetes-client", Version.getVersion())))
+            .setForcedDependencies(List.of(Dependency.of("io.quarkus", "quarkus-kubernetes-client", Version.getVersion()), Dependency.of("io.quarkus", "quarkus-kubernetes", Version.getVersion())))
             .addBuildChainCustomizerEntries(
                     new QuarkusProdModeTest.BuildChainCustomizerEntry(
                             KubernetesWithCustomResourcesTest.CustomProjectRootBuildItemProducerProdMode.class,
@@ -58,12 +59,17 @@ public void assertGeneratedResources() throws IOException {
             }
         });
 
-        assertThat(kubernetesList).filteredOn(h -> "ServiceAccount".equals(h.getKind())).singleElement().satisfies(h -> {
-            assertThat(h.getMetadata().getName()).isEqualTo(APPLICATION_NAME);
-        });
+        assertThat(kubernetesList).filteredOn(h -> "ServiceAccount".equals(h.getKind())).singleElement()
+                .satisfies(h -> assertThat(h.getMetadata().getName()).isEqualTo(APPLICATION_NAME));
+
+        assertThat(kubernetesList).filteredOn(h -> "RoleBinding".equals(h.getKind())).singleElement()
+                .satisfies(h -> assertThat(h.getMetadata().getName()).isEqualTo(APPLICATION_NAME + "-view"));
 
-        assertThat(kubernetesList).filteredOn(h -> "RoleBinding".equals(h.getKind())).singleElement().satisfies(h -> {
-            assertThat(h.getMetadata().getName()).isEqualTo(APPLICATION_NAME + "-view");
+        // check that if quarkus.kubernetes.namespace is set, "manually" set namespaces are not overwritten
+        assertThat(kubernetesList).filteredOn(h -> "ConfigMap".equals(h.getKind())).singleElement().satisfies(h -> {
+            final var metadata = h.getMetadata();
+            assertThat(metadata.getName()).isEqualTo("foo");
+            assertThat(metadata.getNamespace()).isEqualTo("foo");
         });
     }
 }
diff --git a/...rkus-standard-way/src/test/resources/kubernetes-with-client-existing-resources.properties b/...rkus-standard-way/src/test/resources/kubernetes-with-client-existing-resources.properties
@@ -0,0 +1 @@
+quarkus.kubernetes.namespace=bar
diff --git a/...way/src/test/resources/manifests/kubernetes-with-client-existing-resources/kubernetes.yml b/...way/src/test/resources/manifests/kubernetes-with-client-existing-resources/kubernetes.yml
@@ -30,4 +30,11 @@ spec:
       targetPort: 27017
   selector:
     name: my-service
-  type: ClusterIP
+  type: ClusterIP
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: foo
+  namespace: foo
+---