From 68ac72f4868d9a056e0a35a5ee69b19819a1576d Mon Sep 17 00:00:00 2001
From: Achyut Madhusudan <amadhusu@redhat.com>
Date: Mon, 29 Jan 2024 16:28:19 +0530
Subject: [PATCH] Remove kind/resource type mentions from metadata.name in
 resources

Signed-off-by: Achyut Madhusudan <amadhusu@redhat.com>
---
 config/v2/cache/clusterrole.yaml                              | 4 ++--
 config/v2/exithandler/clusterrole.leaderelection.yaml         | 2 +-
 .../v2/exithandler/controller/clusterrole.clusteraccess.yaml  | 2 +-
 .../v2/exithandler/controller/clusterrole.tenantaccess.yaml   | 2 +-
 config/v2/kfptask/clusterrole.leaderelection.yaml             | 2 +-
 config/v2/kfptask/webhook/clusterrole.clusteraccess.yaml      | 2 +-
 config/v2/pipelineloop/clusterrole.leaderelection.yaml        | 2 +-
 .../v2/pipelineloop/controller/clusterrole.tenantaccess.yaml  | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/config/v2/cache/clusterrole.yaml b/config/v2/cache/clusterrole.yaml
index cf977bcc..4ecb868a 100644
--- a/config/v2/cache/clusterrole.yaml
+++ b/config/v2/cache/clusterrole.yaml
@@ -2,8 +2,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    app: cache-deployer-clusterrole
-  name: cache-deployer-clusterrole
+    app: cache-deployer
+  name: cache-deployer
 rules:
 - apiGroups:
   - certificates.k8s.io
diff --git a/config/v2/exithandler/clusterrole.leaderelection.yaml b/config/v2/exithandler/clusterrole.leaderelection.yaml
index b4fc8822..6a620995 100644
--- a/config/v2/exithandler/clusterrole.leaderelection.yaml
+++ b/config/v2/exithandler/clusterrole.leaderelection.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/instance: default
     app.kubernetes.io/part-of: kfp-tekton
-  name: exithandler-leader-election-clusterrole
+  name: exithandler-leader-election
 rules:
 - apiGroups:
   - coordination.k8s.io
diff --git a/config/v2/exithandler/controller/clusterrole.clusteraccess.yaml b/config/v2/exithandler/controller/clusterrole.clusteraccess.yaml
index e8c8a9ea..efcb8bdf 100644
--- a/config/v2/exithandler/controller/clusterrole.clusteraccess.yaml
+++ b/config/v2/exithandler/controller/clusterrole.clusteraccess.yaml
@@ -5,7 +5,7 @@ metadata:
     app.kubernetes.io/component: controller
     app.kubernetes.io/instance: default
     app.kubernetes.io/part-of: kfp-tekton
-  name: exithandler-controller-cluster-access-clusterrole
+  name: exithandler-controller-cluster-access
 rules:
 - apiGroups:
   - tekton.dev
diff --git a/config/v2/exithandler/controller/clusterrole.tenantaccess.yaml b/config/v2/exithandler/controller/clusterrole.tenantaccess.yaml
index 7cbe237f..f0090f30 100644
--- a/config/v2/exithandler/controller/clusterrole.tenantaccess.yaml
+++ b/config/v2/exithandler/controller/clusterrole.tenantaccess.yaml
@@ -5,7 +5,7 @@ metadata:
     app.kubernetes.io/component: controller
     app.kubernetes.io/instance: default
     app.kubernetes.io/part-of: kfp-tekton
-  name: exithandler-controller-tenant-access-clusterrole
+  name: exithandler-controller-tenant-access
 rules:
 - apiGroups:
   - ""
diff --git a/config/v2/kfptask/clusterrole.leaderelection.yaml b/config/v2/kfptask/clusterrole.leaderelection.yaml
index 55a6a866..ef9689d6 100644
--- a/config/v2/kfptask/clusterrole.leaderelection.yaml
+++ b/config/v2/kfptask/clusterrole.leaderelection.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/instance: default
     app.kubernetes.io/part-of: kfp-tekton
-  name: leader-election-clusterrole
+  name: leader-election
 rules:
 - apiGroups:
   - coordination.k8s.io
diff --git a/config/v2/kfptask/webhook/clusterrole.clusteraccess.yaml b/config/v2/kfptask/webhook/clusterrole.clusteraccess.yaml
index 8555624b..9d32b310 100644
--- a/config/v2/kfptask/webhook/clusterrole.clusteraccess.yaml
+++ b/config/v2/kfptask/webhook/clusterrole.clusteraccess.yaml
@@ -5,7 +5,7 @@ metadata:
     app.kubernetes.io/component: webhook
     app.kubernetes.io/instance: default
     app.kubernetes.io/part-of: kfp-tekton
-  name: webhook-cluster-access-clusterrole
+  name: webhook-cluster-access
 rules:
 - apiGroups:
   - apiextensions.k8s.io
diff --git a/config/v2/pipelineloop/clusterrole.leaderelection.yaml b/config/v2/pipelineloop/clusterrole.leaderelection.yaml
index 7412e4c7..341c80e1 100644
--- a/config/v2/pipelineloop/clusterrole.leaderelection.yaml
+++ b/config/v2/pipelineloop/clusterrole.leaderelection.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/instance: default
     app.kubernetes.io/part-of: tekton-pipeline-loops
-  name: pipelineloop-leader-election-clusterrole
+  name: pipelineloop-leader-election
 rules:
 - apiGroups:
   - coordination.k8s.io
diff --git a/config/v2/pipelineloop/controller/clusterrole.tenantaccess.yaml b/config/v2/pipelineloop/controller/clusterrole.tenantaccess.yaml
index f194db42..e16c0e29 100644
--- a/config/v2/pipelineloop/controller/clusterrole.tenantaccess.yaml
+++ b/config/v2/pipelineloop/controller/clusterrole.tenantaccess.yaml
@@ -5,7 +5,7 @@ metadata:
     app.kubernetes.io/component: controller
     app.kubernetes.io/instance: default
     app.kubernetes.io/part-of: tekton-pipeline-loops
-  name: pipelineloop-controller-tenant-access-clusterrole
+  name: pipelineloop-controller-tenant-access
 rules:
 - apiGroups:
   - ""