drop install-operator & configure-monitoring roles (#73)

kubesaw · Sep 5, 2024 · 53a2210 · 53a2210
1 parent 43eb3db
commit 53a2210
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 202 deletions.
diff --git a/resources/roles/host.yaml b/resources/roles/host.yaml
@@ -4,26 +4,6 @@ metadata:
   name: host-roles
 objects:
 
-- kind: Role
-  apiVersion: rbac.authorization.k8s.io/v1
-  metadata:
-    name: install-operator
-    labels:
-      provider: sandbox-sre
-  rules:
-  - apiGroups:
-    - operators.coreos.com
-    resources:
-    - "catalogsources"
-    - "operatorgroups"
-    - "subscriptions"
-    verbs:
-    - "get"
-    - "list"
-    - "create"
-    - "patch"
-    - "update"
-
 - kind: Role
   apiVersion: rbac.authorization.k8s.io/v1
   metadata:
@@ -75,62 +55,6 @@ objects:
     - "update"
     - "patch"
 
-- kind: Role
-  apiVersion: rbac.authorization.k8s.io/v1
-  metadata:
-    name: configure-monitoring
-    labels:
-      provider: sandbox-sre
-  rules:
-  - apiGroups:
-    - ""
-    resources:
-    - "configmaps"
-    - "secrets"
-    - "serviceaccounts"
-    - "services"
-    verbs:
-    - "create"
-    - "update"
-    - "get"
-    - "list"
-  - apiGroups:
-    - ""
-    resources:
-    - "serviceaccounts/token"
-    verbs:
-    - "create"
-  - apiGroups:
-    - "apps"
-    resources:
-    - "deployments"
-    - "statefulsets"
-    verbs:
-    - "create"
-    - "update"
-    - "get"
-    - "list"
-  - apiGroups:
-    - "route.openshift.io"
-    resources:
-    - "routes"
-    verbs:
-    - "create"
-    - "update"
-    - "get"
-    - "list"
-  - apiGroups:
-    - "monitoring.coreos.com"
-    resources:
-    - "prometheuses"
-    - "prometheusrules"
-    - "servicemonitors"
-    verbs:
-    - "create"
-    - "update"
-    - "get"
-    - "list"
-
 - kind: Role
   apiVersion: rbac.authorization.k8s.io/v1
   metadata:

diff --git a/resources/roles/member.yaml b/resources/roles/member.yaml
@@ -4,26 +4,6 @@ metadata:
   name: member-roles
 objects:
 
-- kind: Role
-  apiVersion: rbac.authorization.k8s.io/v1
-  metadata:
-    name: install-operator
-    labels:
-      provider: sandbox-sre
-  rules:
-  - apiGroups:
-    - operators.coreos.com
-    resources:
-    - "catalogsources"
-    - "operatorgroups"
-    - "subscriptions"
-    verbs:
-    - "get"
-    - "list"
-    - "create"
-    - "patch"
-    - "update"
-
 - kind: Role
   apiVersion: rbac.authorization.k8s.io/v1
   metadata:
@@ -94,62 +74,6 @@ objects:
     - "update"
     - "patch"
 
-- kind: Role
-  apiVersion: rbac.authorization.k8s.io/v1
-  metadata:
-    name: configure-monitoring
-    labels:
-      provider: sandbox-sre
-  rules:
-  - apiGroups:
-    - ""
-    resources:
-    - "configmaps"
-    - "secrets"
-    - "serviceaccounts"
-    - "services"
-    verbs:
-    - "create"
-    - "update"
-    - "get"
-    - "list"
-  - apiGroups:
-    - ""
-    resources:
-    - "serviceaccounts/token"
-    verbs:
-    - "create"
-  - apiGroups:
-    - "apps"
-    resources:
-    - "deployments"
-    - "statefulsets"
-    verbs:
-    - "create"
-    - "update"
-    - "get"
-    - "list"
-  - apiGroups:
-    - "route.openshift.io"
-    resources:
-    - "routes"
-    verbs:
-    - "create"
-    - "update"
-    - "get"
-    - "list"
-  - apiGroups:
-    - "monitoring.coreos.com"
-    resources:
-    - "prometheuses"
-    - "prometheusrules"
-    - "servicemonitors"
-    verbs:
-    - "create"
-    - "update"
-    - "get"
-    - "list"
-
 - kind: Role
   apiVersion: rbac.authorization.k8s.io/v1
   metadata:

diff --git a/test-resources/dummy.openshiftapps.com/kubesaw-admins.yaml b/test-resources/dummy.openshiftapps.com/kubesaw-admins.yaml
@@ -17,7 +17,6 @@ serviceAccounts:
     roleBindings:
     - namespace: toolchain-host-operator
       roles:
-      - install-operator
       - restart-deployment
       - approve-user
       - view-secrets
@@ -30,50 +29,15 @@ serviceAccounts:
       - create-social-event
       - add-space-users
       clusterRoles:
-      - edit
       - view
-    - namespace: openshift-customer-monitoring
-      roles:
-      - install-operator
-      - view-secrets
-      - configure-monitoring
-      clusterRoles:
-      - edit
-    - namespace: openshift-logging
-      roles:
-      - install-operator
-      clusterRoles:
-      - edit
   member:
     roleBindings:
     - namespace: toolchain-member-operator
       roles:
-      - install-operator
       - restart-deployment
       - view-secrets
       clusterRoles:
-      - edit
       - view
-    - namespace: openshift-customer-monitoring
-      roles:
-      - install-operator
-      - view-secrets
-      - configure-monitoring
-      clusterRoles:
-      - edit
-    - namespace: openshift-logging
-      roles:
-      - install-operator
-      clusterRoles:
-      - edit
-    - namespace: openshift-config-managed
-      roles:
-      - configure-monitoring
-      clusterRoles:
-      - edit
-    clusterRoleBindings:
-      clusterRoles:
-      - manage-console-resources
 
 - name: second-admin
   host:
@@ -131,19 +95,12 @@ users:
       - view
     - namespace: openshift-customer-monitoring
       roles:
-      - install-operator
       - view-secrets
-      - configure-monitoring
       clusterRoles:
       - edit
     - namespace: openshift-logging
       clusterRoles:
       - view
-    - namespace: sandbox-sre-host
-      roles:
-      - view-secrets
-      clusterRoles:
-      - view
   member:
     roleBindings:
     - namespace: toolchain-member-operator
@@ -158,19 +115,12 @@ users:
       - view
     - namespace: openshift-customer-monitoring
       roles:
-      - install-operator
       - view-secrets
-      - configure-monitoring
       clusterRoles:
       - edit
     - namespace: openshift-logging
       clusterRoles:
       - view
-    - namespace: sandbox-sre-member
-      roles:
-      - view-secrets
-      clusterRoles:
-      - view
 
 - name: standard-viewer-crtadmin
   id: