Merge pull request #32208 from Sgitario/32193

Ensure RoleBinding resource is generated after Role/ClusterRole/ServiceAccount resources
quarkusio · Mar 31, 2023 · c8cacd0 · c8cacd0
2 parents 68a26b1 + f3d8aaf
commit c8cacd0
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 3 deletions.
diff --git a/...yment/src/main/java/io/quarkus/kubernetes/deployment/AddClusterRoleResourceDecorator.java b/...yment/src/main/java/io/quarkus/kubernetes/deployment/AddClusterRoleResourceDecorator.java
@@ -7,6 +7,7 @@
 import java.util.List;
 import java.util.Map;
 
+import io.dekorate.kubernetes.decorator.Decorator;
 import io.dekorate.kubernetes.decorator.ResourceProvidingDecorator;
 import io.fabric8.kubernetes.api.model.KubernetesListBuilder;
 import io.fabric8.kubernetes.api.model.ObjectMeta;
@@ -45,4 +46,9 @@ public void visit(KubernetesListBuilder list) {
                 .endMetadata()
                 .withRules(rules));
     }
+
+    @Override
+    public Class<? extends Decorator>[] before() {
+        return new Class[] { AddRoleBindingResourceDecorator.class };
+    }
 }
diff --git a/...a/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddRoleResourceDecorator.java b/...a/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddRoleResourceDecorator.java
@@ -7,6 +7,7 @@
 import java.util.List;
 import java.util.Map;
 
+import io.dekorate.kubernetes.decorator.Decorator;
 import io.dekorate.kubernetes.decorator.ResourceProvidingDecorator;
 import io.fabric8.kubernetes.api.model.KubernetesListBuilder;
 import io.fabric8.kubernetes.api.model.ObjectMeta;
@@ -48,4 +49,9 @@ public void visit(KubernetesListBuilder list) {
                 .endMetadata()
                 .withRules(rules));
     }
+
+    @Override
+    public Class<? extends Decorator>[] before() {
+        return new Class[] { AddRoleBindingResourceDecorator.class };
+    }
 }
diff --git a/...nt/src/main/java/io/quarkus/kubernetes/deployment/AddServiceAccountResourceDecorator.java b/...nt/src/main/java/io/quarkus/kubernetes/deployment/AddServiceAccountResourceDecorator.java
@@ -5,6 +5,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import io.dekorate.kubernetes.decorator.Decorator;
 import io.dekorate.kubernetes.decorator.ResourceProvidingDecorator;
 import io.fabric8.kubernetes.api.model.KubernetesListBuilder;
 import io.fabric8.kubernetes.api.model.ObjectMeta;
@@ -43,4 +44,9 @@ public void visit(KubernetesListBuilder list) {
                 .endMetadata()
                 .endServiceAccountItem();
     }
+
+    @Override
+    public Class<? extends Decorator>[] before() {
+        return new Class[] { AddRoleBindingResourceDecorator.class };
+    }
 }
diff --git a/...arkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithRbacFullTest.java b/...arkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithRbacFullTest.java
@@ -5,9 +5,12 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -40,9 +43,16 @@ public class KubernetesWithRbacFullTest {
 
     @Test
     public void assertGeneratedResources() throws IOException {
-        final Path kubernetesDir = prodModeTestResults.getBuildDir().resolve("kubernetes");
-        List<HasMetadata> kubernetesList = DeserializationUtil
-                .deserializeAsList(kubernetesDir.resolve("kubernetes.yml"));
+        final Path kubernetesFile = prodModeTestResults.getBuildDir().resolve("kubernetes").resolve("kubernetes.yml");
+
+        // ensure rbac resources are generated in order: having the RoleBinding resource at the end:
+        String kubernetesFileContent = Files.readString(kubernetesFile);
+        int lastIndexOfRoleRefKind = lastIndexOfKind(kubernetesFileContent, "Role", "ClusterRole", "ServiceAccount");
+        int firstIndexOfRoleBinding = kubernetesFileContent.indexOf("kind: RoleBinding");
+        assertTrue(lastIndexOfRoleRefKind < firstIndexOfRoleBinding, "RoleBinding resource is created before "
+                + "the Role/ClusterRole/ServiceAccount resource!");
+
+        List<HasMetadata> kubernetesList = DeserializationUtil.deserializeAsList(kubernetesFile);
 
         Deployment deployment = getDeploymentByName(kubernetesList, APP_NAME);
         assertEquals(APP_NAMESPACE, deployment.getMetadata().getNamespace());
@@ -84,6 +94,21 @@ public void assertGeneratedResources() throws IOException {
         assertEquals("projectc", subject.getNamespace());
     }
 
+    private int lastIndexOfKind(String content, String... kinds) {
+        int index = Integer.MIN_VALUE;
+        for (String kind : kinds) {
+            Matcher matcher = Pattern.compile("(?m)^kind: " + kind).matcher(content);
+            if (matcher.find()) {
+                int lastIndexOfKind = matcher.end();
+                if (lastIndexOfKind > index) {
+                    index = lastIndexOfKind;
+                }
+            }
+        }
+
+        return index;
+    }
+
     private Deployment getDeploymentByName(List<HasMetadata> kubernetesList, String name) {
         return getResourceByName(kubernetesList, Deployment.class, name);
     }