Fix bug w/ disabling controllers + fix test + clean up

Signed-off-by: Carlisia <carlisia@vmware.com>

config/samples/rbac/role.yaml

@@ -0,0 +1,28 @@
+
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  creationTimestamp: null
+  name: manager-role
+rules:
+- apiGroups:
+  - velero.io
+  resources:
+  - backupstoragelocations
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - velero.io
+  resources:
+  - backupstoragelocations/status
+  verbs:
+  - get
+  - patch
+  - update

internal/velero/serverstatusrequest.go

@@ -29,6 +29,8 @@ import (
 	"github.com/vmware-tanzu/velero/pkg/plugin/framework"
 )
 
+// ServerStatus holds information for retrieving installed
+// plugins and for updating the ServerStatusRequest timestamp.
 type ServerStatus struct {
 	PluginRegistry PluginLister
 	Clock          clock.Clock
@@ -41,7 +43,7 @@ func (s *ServerStatus) PatchStatusProcessed(kbClient client.Client, req *velerov
 	req.Status.ServerVersion = buildinfo.Version
 	req.Status.Phase = velerov1api.ServerStatusRequestPhaseProcessed
 	req.Status.ProcessedTimestamp = &metav1.Time{Time: s.Clock.Now()}
-	req.Status.Plugins = loadPlugins(s.PluginRegistry)
+	req.Status.Plugins = getInstalledPluginInfo(s.PluginRegistry)
 
 	if err := kbClient.Status().Patch(ctx, req, statusPatch); err != nil {
 		return errors.WithStack(err)
@@ -55,7 +57,7 @@ type PluginLister interface {
 	List(kind framework.PluginKind) []framework.PluginIdentifier
 }
 
-func loadPlugins(pluginLister PluginLister) []velerov1api.PluginInfo {
+func getInstalledPluginInfo(pluginLister PluginLister) []velerov1api.PluginInfo {
 	var plugins []velerov1api.PluginInfo
 	for _, v := range framework.AllPluginKinds() {
 		list := pluginLister.List(v)

pkg/cmd/server/server.go

@@ -808,14 +808,13 @@ func (s *server) runControllers(defaultVolumeSnapshotLocations map[string]string
 			s.logger.Infof("Disabling controller: %s", controllerName)
 			delete(enabledControllers, controllerName)
 		} else {
-			s.logger.Fatalf("Invalid value for --disable-controllers flag provided: %s. Valid values are: %s", controllerName, strings.Join(disableControllerList, ","))
-		}
-	}
-	// remove disabled runtime type controllers
-	for _, controllerName := range s.config.disabledControllers {
-		if _, ok := enabledRuntimeControllers[controllerName]; ok {
-			s.logger.Infof("Disabling controller: %s", controllerName)
-			delete(enabledRuntimeControllers, controllerName)
+			// maybe it is a runtime type controllers, so attempt to remove that
+			if _, ok := enabledRuntimeControllers[controllerName]; ok {
+				s.logger.Infof("Disabling controller: %s", controllerName)
+				delete(enabledRuntimeControllers, controllerName)
+			} else {
+				s.logger.Fatalf("Invalid value for --disable-controllers flag provided: %s. Valid values are: %s", controllerName, strings.Join(disableControllerList, ","))
+			}
 		}
 	}
 

pkg/controller/server_status_controller_test.go

@@ -206,7 +206,7 @@ var _ = Describe("Server Status Request Reconciler", func() {
 						},
 					},
 				},
-				expectedErrMsg:  "unexpected ServerStatusRequest phase \"an-invalid-phase\"",
+				expectedErrMsg:  "unexpected ServerStatusRequest phase",
 				expectedRequeue: ctrl.Result{Requeue: false, RequeueAfter: 0},
 			},
 		}