Clean-up old v3 config

This is no longer used nor supported. All this information is still avaliable on the v3 branch.
aneagoe · Nov 25, 2021 · 8e03830 · 8e03830
1 parent 4e6f4c3
commit 8e03830
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 336 deletions.
diff --git a/Makefile b/Makefile
@@ -160,17 +160,6 @@ code/check: fmt vet
 code/golangci-lint:
 	golangci-lint run ./...
 
-.PHONY: cluster/prepare/local/file
-cluster/prepare/local/file:
-	@sed -i "s/__NAMESPACE__/${NAMESPACE}/g" deploy/cluster_roles/cluster_role_binding_grafana_operator.yaml
-
-.PHONY: cluster/prepare/local
-cluster/prepare/local: cluster/prepare/local/file
-	-kubectl create namespace ${NAMESPACE}
-	kubectl apply -f deploy/roles -n ${NAMESPACE}
-	kubectl apply -f deploy/cluster_roles
-	kubectl apply -f deploy/examples/Grafana.yaml -n ${NAMESPACE}
-
 # Find or download gen-crd-api-reference-docs
 gen-crd-api-reference-docs:
 ifeq (, $(shell which crdoc))

diff --git a/deploy/cluster_roles/README.md b/deploy/cluster_roles/README.md
@@ -10,7 +10,7 @@ To grant those permissions the following ClusterRole and ClusterRoleBinding need
 Create the `ClusterRole`
 
 ```shell
-kubectl create -f cluster_role_grafana_operator.yaml
+kubectl create -f deploy/cluster_roles/cluster_role_grafana_operator.yaml
 ```
 
 Create the `ClusterRoleBinding` for the `ServiceAccount/grafana-operator` in the given namespace
@@ -26,5 +26,6 @@ For a cluster administrator to allow other users to be able to deploy Grafana op
 
 ```shell
 kubectl create -f cluster_role_aggregate_grafana_admin_edit.yaml
-kubectl create -f cluster_role_aggregate_grafana_view.yaml
+kubectl create -f deploy/cluster_roles/cluster_role_aggregate_grafana_admin_edit.yaml
+kubectl create -f deploy/cluster_roles/cluster_role_aggregate_grafana_view.yaml
 ```
diff --git a/deploy/cluster_roles/cluster_role_grafana_operator.yaml b/deploy/cluster_roles/cluster_role_grafana_operator.yaml
@@ -4,25 +4,6 @@ metadata:
   creationTimestamp: null
   name: grafana-operator
 rules:
-  - apiGroups:
-      - ""
-    resources:
-      - pods
-      - services
-      - endpoints
-      - persistentvolumeclaims
-      - configmaps
-      - secrets
-      - serviceaccounts
-      - configmaps
-    verbs:
-      - get
-      - list
-      - create
-      - update
-      - delete
-      - deletecollection
-      - watch
   - apiGroups:
       - ""
     resources:
@@ -35,54 +16,9 @@ rules:
       - delete
       - update
       - patch
-  - apiGroups:
-      - apps
-    resources:
-      - deployments
-      - deployments/finalizers
-      - daemonsets
-      - replicasets
-      - statefulsets
-    verbs:
-      - get
-      - list
-      - create
-      - update
-      - delete
-      - deletecollection
-      - watch
-  - apiGroups:
-      - route.openshift.io
-    resources:
-      - routes
-      - routes/custom-host
-    verbs:
-      - get
-      - list
-      - create
-      - update
-      - delete
-      - deletecollection
-      - watch
-      - create
-  - apiGroups:
-      - extensions
-    resources:
-      - ingresses
-    verbs:
-      - get
-      - list
-      - create
-      - update
-      - delete
-      - deletecollection
-      - watch
   - apiGroups:
       - integreatly.org
     resources:
-      - grafanas
-      - grafanas/status
-      - grafanas/finalizers
       - grafanadashboards
       - grafanadatasources
       - grafanadatasources/status
@@ -94,16 +30,3 @@ rules:
       - delete
       - deletecollection
       - watch
-  - apiGroups:
-      - networking.k8s.io
-    resources:
-        - ingresses
-    verbs:
-       - get
-       - list
-       - create
-       - update
-       - delete
-       - deletecollection
-       - watch
-       - create
diff --git a/deploy/operator.yaml b/deploy/operator.yaml
diff --git a/deploy/role.yaml b/deploy/role.yaml
diff --git a/deploy/roles/role.yaml b/deploy/roles/role.yaml
diff --git a/deploy/roles/role_binding.yaml b/deploy/roles/role_binding.yaml
diff --git a/deploy/roles/service_account.yaml b/deploy/roles/service_account.yaml
diff --git a/documentation/dashboards.md b/documentation/dashboards.md
@@ -36,6 +36,9 @@ To create a dashboard in the `grafana` namespace run:
 kubectl create -f deploy/examples/dashboards/SimpleDashboard.yaml -n grafana
 ```
 
+For more information about the RBAC config needed to
+be able to run `--scan-all` read [deploy/cluster_roles/README.md](deploy/cluster_roles/README.md).
+
 ## Dashboard UIDs
 
 Grafana allows users to define the UIDs of dashboards. If an uid is present on a dashbaord, the operator will use it and