chore: Remove specification of user id for the Redis workload (argopr…

…oj#5863) * fix: avoid specifying redis user Signed-off-by: Shoubhik Bose <shbose@redhat.com> * fix: generate manifests Signed-off-by: Shoubhik Bose <shbose@redhat.com> * chore: one less manifest Signed-off-by: Shoubhik Bose <shbose@redhat.com>
abc-dp · Apr 2, 2021 · dc4eaff · dc4eaff
1 parent 8eeb9a0
commit dc4eaff
Show file tree

Hide file tree

Showing 11 changed files with 2 additions and 151 deletions.
diff --git a/manifests/base/redis/argocd-redis-deployment.yaml b/manifests/base/redis/argocd-redis-deployment.yaml
@@ -16,9 +16,6 @@ spec:
         app.kubernetes.io/name: argocd-redis
     spec:
       securityContext:
-        runAsUser: 1000
-        runAsGroup: 1000
-        fsGroup: 1000
         runAsNonRoot: true
       serviceAccountName: argocd-redis        
       containers:

diff --git a/manifests/base/redis/argocd-redis-role.yaml b/manifests/base/redis/argocd-redis-role.yaml
diff --git a/manifests/base/redis/kustomization.yaml b/manifests/base/redis/kustomization.yaml
@@ -3,7 +3,6 @@ kind: Kustomization
 
 resources:
 - argocd-redis-deployment.yaml
-- argocd-redis-role.yaml
 - argocd-redis-rolebinding.yaml
 - argocd-redis-sa.yaml
 - argocd-redis-service.yaml

diff --git a/manifests/ha/base/redis-ha/kustomization.yaml b/manifests/ha/base/redis-ha/kustomization.yaml
@@ -11,21 +11,7 @@ patchesJson6902:
     kind: ConfigMap
     name: argocd-redis-ha-configmap
     namespace: argocd
-  path: overlays/remove-namespace.yaml
-- target:
-    group: rbac.authorization.k8s.io
-    version: v1
-    kind: Role
-    name: argocd-redis-ha
-    namespace: argocd
-  path: overlays/add-openshift-nonroot-scc.yaml  
-- target:
-    group: rbac.authorization.k8s.io
-    version: v1
-    kind: Role
-    name: argocd-redis-ha-haproxy
-    namespace: argocd
-  path: overlays/add-openshift-nonroot-scc.yaml     
+  path: overlays/remove-namespace.yaml  
 - target:
     version: v1
     group: ""

diff --git a/manifests/ha/base/redis-ha/overlays/add-openshift-nonroot-scc.yaml b/manifests/ha/base/redis-ha/overlays/add-openshift-nonroot-scc.yaml
diff --git a/manifests/ha/base/redis-ha/overlays/redis-ha-haproxy.yaml b/manifests/ha/base/redis-ha/overlays/redis-ha-haproxy.yaml
diff --git a/manifests/ha/install.yaml b/manifests/ha/install.yaml
@@ -2136,14 +2136,6 @@ rules:
   - endpoints
   verbs:
   - get
-- apiGroups:
-  - security.openshift.io
-  resourceNames:
-  - nonroot
-  resources:
-  - securitycontextconstraints
-  verbs:
-  - use
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
@@ -2162,14 +2154,6 @@ rules:
   - endpoints
   verbs:
   - get
-- apiGroups:
-  - security.openshift.io
-  resourceNames:
-  - nonroot
-  resources:
-  - securitycontextconstraints
-  verbs:
-  - use
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role

diff --git a/manifests/ha/namespace-install.yaml b/manifests/ha/namespace-install.yaml
@@ -2136,14 +2136,6 @@ rules:
   - endpoints
   verbs:
   - get
-- apiGroups:
-  - security.openshift.io
-  resourceNames:
-  - nonroot
-  resources:
-  - securitycontextconstraints
-  verbs:
-  - use
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
@@ -2162,14 +2154,6 @@ rules:
   - endpoints
   verbs:
   - get
-- apiGroups:
-  - security.openshift.io
-  resourceNames:
-  - nonroot
-  resources:
-  - securitycontextconstraints
-  verbs:
-  - use
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role

diff --git a/manifests/install.yaml b/manifests/install.yaml
@@ -2114,24 +2114,6 @@ rules:
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
-metadata:
-  labels:
-    app.kubernetes.io/component: redis
-    app.kubernetes.io/name: argocd-redis
-    app.kubernetes.io/part-of: argocd
-  name: argocd-redis
-rules:
-- apiGroups:
-  - security.openshift.io
-  resourceNames:
-  - nonroot
-  resources:
-  - securitycontextconstraints
-  verbs:
-  - use
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
 metadata:
   labels:
     app.kubernetes.io/component: server
@@ -2599,10 +2581,7 @@ spec:
         ports:
         - containerPort: 6379
       securityContext:
-        fsGroup: 1000
-        runAsGroup: 1000
         runAsNonRoot: true
-        runAsUser: 1000
       serviceAccountName: argocd-redis
 ---
 apiVersion: apps/v1

diff --git a/manifests/namespace-install.yaml b/manifests/namespace-install.yaml
@@ -2114,24 +2114,6 @@ rules:
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
-metadata:
-  labels:
-    app.kubernetes.io/component: redis
-    app.kubernetes.io/name: argocd-redis
-    app.kubernetes.io/part-of: argocd
-  name: argocd-redis
-rules:
-- apiGroups:
-  - security.openshift.io
-  resourceNames:
-  - nonroot
-  resources:
-  - securitycontextconstraints
-  verbs:
-  - use
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
 metadata:
   labels:
     app.kubernetes.io/component: server
@@ -2514,10 +2496,7 @@ spec:
         ports:
         - containerPort: 6379
       securityContext:
-        fsGroup: 1000
-        runAsGroup: 1000
         runAsNonRoot: true
-        runAsUser: 1000
       serviceAccountName: argocd-redis
 ---
 apiVersion: apps/v1

diff --git a/reposerver/repository/repository_test.go b/reposerver/repository/repository_test.go
@@ -129,7 +129,7 @@ func TestGenerateYamlManifestInDir(t *testing.T) {
 	q := apiclient.ManifestRequest{Repo: &argoappv1.Repository{}, ApplicationSource: &src}
 
 	// update this value if we add/remove manifests
-	const countOfManifests = 29
+	const countOfManifests = 28
 
 	res1, err := service.GenerateManifest(context.Background(), &q)