Skip to content

Minor fixes for OpenShift and multi-tenancy #307

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 4 commits into from
Oct 6, 2025
Merged

Minor fixes for OpenShift and multi-tenancy #307

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e716b76
add recent changes for upstream contribution
mdroll Oct 1, 2025
dc7f59f
resolve issue caused by incorrect diff application
mdroll Oct 2, 2025
3fe13e8
Update argocd/argocd/operator/argocd.ftl.yaml
ThomasMichael1811 Oct 6, 2025
8de9d75
Update argocd/argocd/operator/argocd.ftl.yaml
ThomasMichael1811 Oct 6, 2025
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
4 changes: 2 additions & 2 deletions argocd/argocd/operator/argocd.ftl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
enabled: true
resources:
limits:
cpu: '2'
cpu: 500m
Copy link
Contributor

@nihussmann nihussmann Oct 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we should keep these limits?

memory: 1Gi
requests:
cpu: 250m
Expand Down Expand Up @@ -39,7 +39,7 @@ spec:
controller:
resources:
limits:
cpu: "2000m"
cpu: "500m"
memory: "2048Mi"
requests:
cpu: "250m"
Expand Down
2 changes: 1 addition & 1 deletion argocd/cluster-resources/argocd/misc.ftl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ spec:
project: <#if config.multiTenant.useDedicatedInstance>${tenantName}<#else>cluster-resources</#if>
destination:
server: https://kubernetes.default.svc
namespace: <#if config.multiTenant.useDedicatedInstance>argocd<#else>${config.application.namePrefix}argocd</#if>
namespace: <#if config.multiTenant.useDedicatedInstance>${config.multiTenant.centralArgocdNamespace}<#else>${config.application.namePrefix}argocd</#if>
source:
path: misc/
<#if config.multiTenant.useDedicatedInstance>
Expand Down
2 changes: 1 addition & 1 deletion src/main/groovy/com/cloudogu/gitops/features/PrometheusStack.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ class PrometheusStack extends Feature implements FeatureWithImage {
}

private String findValidOpenShiftUid() {
String uidRange = k8sClient.getAnnotation('namespace', 'monitoring', 'openshift.io/sa.scc.uid-range')
String uidRange = k8sClient.getAnnotation('namespace', namespace, 'openshift.io/sa.scc.uid-range')

if (uidRange) {
log.debug("found UID=${uidRange}")
Expand Down
8 changes: 6 additions & 2 deletions templates/kubernetes/rbac/argocd-role.ftl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,13 @@ rules:
resources: ["roles", "rolebindings"]
verbs: ["create", "delete", "get", "list", "patch", "update", "watch"]

<#if config.features.secrets.active == true>
- apiGroups: ["external-secrets.io"]
resources: ["secretstores", "externalsecrets"]
verbs: ["create", "delete", "get", "list", "patch", "update", "watch"]

</#if>

<#if config.features.monitoring.active == true>
- apiGroups: [ "monitoring.coreos.com" ]
resources: [
"alertmanagers",
Expand All @@ -74,4 +77,5 @@ rules:
"podmonitors",
"probes"
]
verbs: [ "create", "delete", "get", "list", "patch", "update", "watch" ]
verbs: [ "create", "delete", "get", "list", "patch", "update", "watch" ]
</#if>