fix: RoleRef should be cluster-wide when referencing cluster roles

Signed-off-by: Chris Laprun <[email protected]>
quarkiverse · Jan 13, 2025 · 38f0aa3 · 38f0aa3
1 parent 66c59b6
commit 38f0aa3
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/.../deployment/src/main/java/io/quarkiverse/operatorsdk/deployment/RBACAugmentationStep.java b/.../deployment/src/main/java/io/quarkiverse/operatorsdk/deployment/RBACAugmentationStep.java
@@ -70,7 +70,7 @@ void augmentRBACForResources(BuildTimeOperatorConfiguration buildTimeConfigurati
     }
 
     private KubernetesRoleBindingBuildItem roleBindingItemFor(RoleBinding binding) {
-        final var roleRef = convertToQuarkusRoleRef(binding.getRoleRef(), false); // todo: fix
+        final var roleRef = convertToQuarkusRoleRef(binding.getRoleRef());
         final var subjects = binding.getSubjects().stream()
                 .map(RBACAugmentationStep::convertToQuarkusSubject)
                 .toArray(Subject[]::new);
@@ -81,7 +81,7 @@ private KubernetesRoleBindingBuildItem roleBindingItemFor(RoleBinding binding) {
     }
 
     private KubernetesClusterRoleBindingBuildItem clusterRoleBindingFor(ClusterRoleBinding binding) {
-        final var roleRef = convertToQuarkusRoleRef(binding.getRoleRef(), true); // todo: fix
+        final var roleRef = convertToQuarkusRoleRef(binding.getRoleRef());
         final var subjects = binding.getSubjects().stream()
                 .map(RBACAugmentationStep::convertToQuarkusSubject)
                 .toArray(Subject[]::new);
@@ -94,8 +94,8 @@ private static Subject convertToQuarkusSubject(io.fabric8.kubernetes.api.model.r
         return new Subject(subject.getApiGroup(), subject.getKind(), subject.getName(), subject.getNamespace());
     }
 
-    private static RoleRef convertToQuarkusRoleRef(io.fabric8.kubernetes.api.model.rbac.RoleRef roleRef, boolean clusterWide) {
-        return new RoleRef(roleRef.getName(), clusterWide);
+    private static RoleRef convertToQuarkusRoleRef(io.fabric8.kubernetes.api.model.rbac.RoleRef roleRef) {
+        return new RoleRef(roleRef.getName(), AddRoleBindingsDecorator.CLUSTER_ROLE.equals(roleRef.getKind()));
     }
 
     private static KubernetesClusterRoleBuildItem clusterRoleBuildItemFrom(ClusterRole clusterRole) {