From dfa80652ee089d7a3ffbe3aaad7b66bb132c543e Mon Sep 17 00:00:00 2001
From: Shoubhik Bose <shbose@redhat.com>
Date: Mon, 29 May 2023 13:09:08 -0400
Subject: [PATCH] fix: remove rolebinding for missing role (#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>
---
 .../base/redis/argocd-redis-rolebinding.yaml     | 15 ---------------
 manifests/base/redis/kustomization.yaml          |  1 -
 manifests/core-install.yaml                      | 16 ----------------
 manifests/install.yaml                           | 16 ----------------
 manifests/namespace-install.yaml                 | 16 ----------------
 reposerver/repository/repository_test.go         |  2 +-
 6 files changed, 1 insertion(+), 65 deletions(-)
 delete mode 100644 manifests/base/redis/argocd-redis-rolebinding.yaml

diff --git a/manifests/base/redis/argocd-redis-rolebinding.yaml b/manifests/base/redis/argocd-redis-rolebinding.yaml
deleted file mode 100644
index 87caaa2cd6f57..0000000000000
--- a/manifests/base/redis/argocd-redis-rolebinding.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-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
diff --git a/manifests/base/redis/kustomization.yaml b/manifests/base/redis/kustomization.yaml
index 95553fe464753..4a0b64c4da6a8 100644
--- 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
index 4b1b1a0bc48b4..ec0fb85ace9de 100644
--- 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
index 353c51b45f4db..5b7a23bca27fc 100644
--- 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
index e82dbe60eec1b..0404924961c95 100644
--- 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
index 6d4ae3127cb71..0e53aa837d3ad 100644
--- 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)