Set service account name only to the generated deployment

This change is related to this comment: quarkusio#25750 (comment)
gsmet · Jul 5, 2022 · 2521138 · 2521138
1 parent 7c5db92
commit 2521138
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/...lla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesCommonHelper.java b/...lla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesCommonHelper.java
@@ -183,7 +183,7 @@ public static List<DecoratorBuildItem> createDecorators(Optional<Project> projec
 
         //Handle RBAC
         if (!roleBindings.isEmpty()) {
-            result.add(new DecoratorBuildItem(target, new ApplyServiceAccountNameDecorator(name)));
+            result.add(new DecoratorBuildItem(target, new ApplyServiceAccountNameDecorator(name, name)));
             result.add(new DecoratorBuildItem(target, new AddServiceAccountResourceDecorator(name)));
             roles.forEach(r -> result.add(new DecoratorBuildItem(target, new AddRoleResourceDecorator(name, r))));
             roleBindings.forEach(rb -> {

diff --git a/.../src/test/java/io/quarkus/it/kubernetes/WithKubernetesClientAndExistingResourcesTest.java b/.../src/test/java/io/quarkus/it/kubernetes/WithKubernetesClientAndExistingResourcesTest.java
@@ -51,7 +51,12 @@ public void assertGeneratedResources() throws IOException {
 
         assertThat(kubernetesList).filteredOn(h -> "Deployment".equals(h.getKind())).allSatisfy(h -> {
             Deployment deployment = (Deployment) h;
-            assertThat(deployment.getSpec().getTemplate().getSpec().getServiceAccountName()).isEqualTo(APPLICATION_NAME);
+            String serviceAccountName = deployment.getSpec().getTemplate().getSpec().getServiceAccountName();
+            if (h.getMetadata().getName().equals(APPLICATION_NAME)) {
+                assertThat(serviceAccountName).isEqualTo(APPLICATION_NAME);
+            } else {
+                assertThat(serviceAccountName).isNull();
+            }
         });
 
         assertThat(kubernetesList).filteredOn(h -> "ServiceAccount".equals(h.getKind())).singleElement().satisfies(h -> {