fix: remove rolebinding for missing role (argoproj#7510)

Signed-off-by: Shoubhik Bose <shbose@redhat.com> Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
yyzxw · Aug 9, 2023 · 33c3c6d · 33c3c6d
1 parent c5cd2da
commit 33c3c6d
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 65 deletions.
diff --git a/manifests/base/redis/argocd-redis-rolebinding.yaml b/manifests/base/redis/argocd-redis-rolebinding.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-rolebinding.yaml
 - argocd-redis-sa.yaml
 - argocd-redis-service.yaml
 - argocd-redis-network-policy.yaml
diff --git a/manifests/core-install.yaml b/manifests/core-install.yaml
@@ -16487,22 +16487,6 @@ subjects:
   name: argocd-applicationset-controller
 ---
 apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  labels:
-    app.kubernetes.io/component: redis
-    app.kubernetes.io/name: argocd-redis
-    app.kubernetes.io/part-of: argocd
-  name: argocd-redis
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: argocd-redis
-subjects:
-- kind: ServiceAccount
-  name: argocd-redis
----
-apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   labels:

diff --git a/manifests/install.yaml b/manifests/install.yaml
@@ -16694,22 +16694,6 @@ subjects:
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
-metadata:
-  labels:
-    app.kubernetes.io/component: redis
-    app.kubernetes.io/name: argocd-redis
-    app.kubernetes.io/part-of: argocd
-  name: argocd-redis
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: argocd-redis
-subjects:
-- kind: ServiceAccount
-  name: argocd-redis
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
 metadata:
   labels:
     app.kubernetes.io/component: server

diff --git a/manifests/namespace-install.yaml b/manifests/namespace-install.yaml
@@ -341,22 +341,6 @@ subjects:
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
-metadata:
-  labels:
-    app.kubernetes.io/component: redis
-    app.kubernetes.io/name: argocd-redis
-    app.kubernetes.io/part-of: argocd
-  name: argocd-redis
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: argocd-redis
-subjects:
-- kind: ServiceAccount
-  name: argocd-redis
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
 metadata:
   labels:
     app.kubernetes.io/component: server

diff --git a/reposerver/repository/repository_test.go b/reposerver/repository/repository_test.go
@@ -160,7 +160,7 @@ func TestGenerateYamlManifestInDir(t *testing.T) {
 	}
 
 	// update this value if we add/remove manifests
-	const countOfManifests = 49
+	const countOfManifests = 48
 
 	res1, err := service.GenerateManifest(context.Background(), &q)