From 68083942315093fd4d45db23cf3ce6a292940a1f Mon Sep 17 00:00:00 2001
From: Wen Zhou <wenzhou@redhat.com>
Date: Fri, 15 Mar 2024 10:55:23 +0100
Subject: [PATCH] chore: remove trusty RBAC, fix indentatin for serving in
 "init-resource" (#220)

Signed-off-by: Wen Zhou <wenzhou@redhat.com>
---
 .../rhods-operator.clusterserviceversion.yaml | 26 -------------------
 .../rhods-operator.clusterserviceversion.yaml | 18 ++++++-------
 config/rbac/role.yaml                         | 26 -------------------
 .../datasciencecluster/kubebuilder_rbac.go    |  4 ---
 4 files changed, 9 insertions(+), 65 deletions(-)

diff --git a/bundle/manifests/rhods-operator.clusterserviceversion.yaml b/bundle/manifests/rhods-operator.clusterserviceversion.yaml
index 7a4a4c9666a..a42603a4395 100644
--- a/bundle/manifests/rhods-operator.clusterserviceversion.yaml
+++ b/bundle/manifests/rhods-operator.clusterserviceversion.yaml
@@ -1670,32 +1670,6 @@ spec:
           - templates
           verbs:
           - '*'
-        - apiGroups:
-          - trustyai.opendatahub.io
-          resources:
-          - trustyaiservices
-          verbs:
-          - create
-          - delete
-          - get
-          - list
-          - patch
-          - update
-          - watch
-        - apiGroups:
-          - trustyai.opendatahub.io
-          resources:
-          - trustyaiservices/finalizers
-          verbs:
-          - update
-        - apiGroups:
-          - trustyai.opendatahub.io
-          resources:
-          - trustyaiservices/status
-          verbs:
-          - get
-          - patch
-          - update
         - apiGroups:
           - user.openshift.io
           resources:
diff --git a/config/manifests/bases/rhods-operator.clusterserviceversion.yaml b/config/manifests/bases/rhods-operator.clusterserviceversion.yaml
index c1b51f64ac4..159f47bd1a8 100644
--- a/config/manifests/bases/rhods-operator.clusterserviceversion.yaml
+++ b/config/manifests/bases/rhods-operator.clusterserviceversion.yaml
@@ -36,15 +36,15 @@ metadata:
             },
             "kserve": {
               "managementState": "Managed",
-                "serving": {
-                  "ingressGateway": {
-                    "certificate": {
-                      "type": "SelfSigned"
-                    }
-                  },
-                  "managementState": "Managed",
-                  "name": "knative-serving"
-                }
+              "serving": {
+                "ingressGateway": {
+                  "certificate": {
+                    "type": "SelfSigned"
+                  }
+                },
+                "managementState": "Managed",
+                "name": "knative-serving"
+              }
             },
             "kueue": {
               "managementState": "Removed"
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
index e41820991f6..c8b64e57f42 100644
--- a/config/rbac/role.yaml
+++ b/config/rbac/role.yaml
@@ -1428,32 +1428,6 @@ rules:
   - templates
   verbs:
   - '*'
-- apiGroups:
-  - trustyai.opendatahub.io
-  resources:
-  - trustyaiservices
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - trustyai.opendatahub.io
-  resources:
-  - trustyaiservices/finalizers
-  verbs:
-  - update
-- apiGroups:
-  - trustyai.opendatahub.io
-  resources:
-  - trustyaiservices/status
-  verbs:
-  - get
-  - patch
-  - update
 - apiGroups:
   - user.openshift.io
   resources:
diff --git a/controllers/datasciencecluster/kubebuilder_rbac.go b/controllers/datasciencecluster/kubebuilder_rbac.go
index 8749296cbeb..260e9bfb746 100644
--- a/controllers/datasciencecluster/kubebuilder_rbac.go
+++ b/controllers/datasciencecluster/kubebuilder_rbac.go
@@ -121,10 +121,6 @@ package datasciencecluster
 // +kubebuilder:rbac:groups="monitoring.coreos.com",resources=probes,verbs=get;create;patch;delete;deletecollection
 // +kubebuilder:rbac:groups="monitoring.coreos.com",resources=prometheusrules,verbs=get;create;patch;delete;deletecollection
 
-//+kubebuilder:rbac:groups=trustyai.opendatahub.io,resources=trustyaiservices,verbs=get;list;watch;create;update;patch;delete
-//+kubebuilder:rbac:groups=trustyai.opendatahub.io,resources=trustyaiservices/status,verbs=get;update;patch
-//+kubebuilder:rbac:groups=trustyai.opendatahub.io,resources=trustyaiservices/finalizers,verbs=update
-
 // +kubebuilder:rbac:groups="monitoring.coreos.com",resources=prometheuses/finalizers,verbs=get;create;patch;delete;deletecollection
 // +kubebuilder:rbac:groups="monitoring.coreos.com",resources=prometheuses/status,verbs=get;create;patch;delete;deletecollection