Skip to content

Generate Operator RBCAs During ArgoCD Repo Creation #290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 25, 2025
Merged

Generate Operator RBCAs During ArgoCD Repo Creation #290

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions src/main/groovy/com/cloudogu/gitops/features/argocd/ArgoCD.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,13 @@ class ArgoCD extends Feature {
k8sClient.patch('secret', 'argocd-default-cluster-config', namespace,
[stringData: ['namespaces': namespaceList.join(',')]])

log.debug("Apply RBAC permissions for ArgoCD in all managed namespaces imperatively")
// Apply rbac yamls from operator/rbac folder
String argocdRbacPath = Path.of(argocdRepoInitializationAction.repo.getAbsoluteLocalRepoTmpDir(), OPERATOR_RBAC_PATH)
k8sClient.applyYaml(argocdRbacPath)
}

private void generateRBACs() {
log.debug("Generate RBAC permissions for ArgoCD in all managed namespaces")
for (String ns : namespaceList) {
new RbacDefinition(Role.Variant.ARGOCD)
Expand All @@ -332,11 +339,6 @@ class ArgoCD extends Feature {
.withSubfolder(OPERATOR_RBAC_PATH)
.generate()
}

log.debug("Apply RBAC permissions for ArgoCD in all managed namespaces imperatively")
// Apply rbac yamls from operator/rbac folder
String argocdRbacPath = Path.of(argocdRepoInitializationAction.repo.getAbsoluteLocalRepoTmpDir(), OPERATOR_RBAC_PATH)
k8sClient.applyYaml(argocdRbacPath)
}

protected void createMonitoringCrd() {
Expand Down Expand Up @@ -369,6 +371,7 @@ class ArgoCD extends Feature {
deleteDir argocdRepoInitializationAction.repo.getAbsoluteLocalRepoTmpDir() + '/argocd'
log.debug("Deleting unnecessary namespaces resources from clusterResources repo: ${clusterResourcesInitializationAction.repo.getAbsoluteLocalRepoTmpDir()}")
deleteFile clusterResourcesInitializationAction.repo.getAbsoluteLocalRepoTmpDir() + '/misc/namespaces.yaml'
generateRBACs()
} else {
log.debug("Deleting unnecessary operator (argocd operator variant) folder from argocd repo: ${argocdRepoInitializationAction.repo.getAbsoluteLocalRepoTmpDir()}")
deleteDir argocdRepoInitializationAction.repo.getAbsoluteLocalRepoTmpDir() + '/operator'
Expand Down