Merge pull request #20098 from ioforks/rbac-labels

RoleBinding is now properly labelled / annotated
quarkusio · Sep 13, 2021 · 1d94761 · 1d94761
2 parents 2d8e7bb + c0590e8
commit 1d94761
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 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
@@ -186,10 +186,15 @@ public static List<DecoratorBuildItem> createDecorators(Optional<Project> projec
             result.add(new DecoratorBuildItem(new ApplyServiceAccountNamedDecorator()));
             result.add(new DecoratorBuildItem(new AddServiceAccountResourceDecorator()));
             roles.forEach(r -> result.add(new DecoratorBuildItem(new AddRoleResourceDecorator(r))));
-            roleBindings.forEach(rb -> result.add(new DecoratorBuildItem(
-                    new AddRoleBindingResourceDecorator(rb.getName(), null, rb.getRole(), rb.isClusterWide()
-                            ? AddRoleBindingResourceDecorator.RoleKind.ClusterRole
-                            : AddRoleBindingResourceDecorator.RoleKind.Role))));
+            roleBindings.forEach(rb -> {
+                result.add(new DecoratorBuildItem(new AddRoleBindingResourceDecorator(rb.getName(), null, rb.getRole(),
+                        rb.isClusterWide() ? AddRoleBindingResourceDecorator.RoleKind.ClusterRole
+                                : AddRoleBindingResourceDecorator.RoleKind.Role)));
+                labels.forEach(l -> {
+                    result.add(new DecoratorBuildItem(
+                            new AddLabelDecorator(rb.getName(), l.getKey(), l.getValue(), "RoleBinding")));
+                });
+            });
         }
 
         return result;

diff --git a/...andard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithRbacAndNamespaceTest.java b/...andard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithRbacAndNamespaceTest.java
@@ -2,6 +2,7 @@
 package io.quarkus.it.kubernetes;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.entry;
 
 import java.io.IOException;
 import java.nio.file.Path;
@@ -50,6 +51,7 @@ public void assertGeneratedResources() throws IOException {
 
         assertThat(kubernetesList.get(0)).isInstanceOfSatisfying(Deployment.class, d -> {
             assertThat(d.getMetadata()).satisfies(m -> {
+                assertThat(m.getLabels()).contains(entry("foo", "bar"));
                 assertThat(m.getName()).isEqualTo("kubernetes-with-rbac-and-namespace");
             });
 

diff --git a/...tes/quarkus-standard-way/src/test/resources/kubernetes-with-rbac-and-namespace.properties b/...tes/quarkus-standard-way/src/test/resources/kubernetes-with-rbac-and-namespace.properties
@@ -1 +1,2 @@
-quarkus.kubernetes.namespace=my-namespace
+quarkus.kubernetes.namespace=my-namespace
+quarkus.kubernetes.labels.foo=bar