refactor: cleanup and decoupling of openshift-gitops and op1st-gitops

Signed-off-by: Christoph Görn <[email protected]>
goern · May 6, 2024 · 9ebcf1e · 9ebcf1e
1 parent f582bb8
commit 9ebcf1e
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 0 deletions.
diff --git a/manifests/applications/gitops/argocd.yaml b/manifests/applications/gitops/argocd.yaml
@@ -89,6 +89,7 @@ spec:
   tls:
     ca: {}
   redis:
+    autotls: openshift
     resources:
       limits:
         cpu: 500m

diff --git a/manifests/applications/gitops/kustomization.yaml b/manifests/applications/gitops/kustomization.yaml
@@ -4,6 +4,7 @@ kind: Kustomization
 resources:
   - namespace.yaml
   - argocd.yaml
+  - redis-fix.yaml
 
   - clusters/
   - projects/

diff --git a/manifests/applications/gitops/redis-fix.yaml b/manifests/applications/gitops/redis-fix.yaml
@@ -0,0 +1,27 @@
+# this is based on https://github.com/argoproj/argo-cd/pull/4660
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: argocd-redis
+rules:
+  - apiGroups:
+      - security.openshift.io
+    resourceNames:
+      - nonroot
+    resources:
+      - securitycontextconstraints
+    verbs:
+      - use
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: argocd-redis
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: argocd-redis
+subjects:
+  - kind: ServiceAccount
+    name: argocd-argocd-redis
-Original file line number
+Diff line change
@@ Expand Up / @@ -89,6 +89,7 @@ spec: @@
       tls:
         ca: {}
       redis:
+        autotls: openshift
         resources:
           limits:
             cpu: 500m
@@ Expand Down @@