Minor fixes for OpenShift and multi-tenancy (#307)

* add recent changes for upstream contribution

* resolve issue caused by incorrect diff application

* Update argocd/argocd/operator/argocd.ftl.yaml

Co-authored-by: Niklas Hußmann <niklas.hussmann-extern@cloudogu.com>

* Update argocd/argocd/operator/argocd.ftl.yaml

Co-authored-by: Niklas Hußmann <niklas.hussmann-extern@cloudogu.com>

---------

Co-authored-by: Thomas <thomas@thomasmichael.de>
Co-authored-by: Niklas Hußmann <niklas.hussmann-extern@cloudogu.com>

Author: 3 people

argocd/cluster-resources/argocd/misc.ftl.yaml

@@ -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>

src/main/groovy/com/cloudogu/gitops/features/PrometheusStack.groovy

@@ -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}")

templates/kubernetes/rbac/argocd-role.ftl.yaml

@@ -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",
@@ -74,4 +77,5 @@ rules:
       "podmonitors",
       "probes"
     ]
-    verbs: [ "create", "delete", "get", "list", "patch", "update", "watch" ]
+    verbs: [ "create", "delete", "get", "list", "patch", "update", "watch" ]
+  </#if>