Merge pull request #1039 from atiratree/remove-recycler

UPSTREAM: <drop>: remove creation of openshift-infra ns and recycler SA
openshift · Nov 23, 2021 · fedcee3 · fedcee3
2 parents 8e73d6b + f85863f
commit fedcee3
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 42 deletions.
diff --git a/cmd/kube-controller-manager/app/controllermanager.go b/cmd/kube-controller-manager/app/controllermanager.go
@@ -247,10 +247,6 @@ func Run(c *config.CompletedConfig, stopCh <-chan struct{}) error {
 		}
 		controllerInitializers := initializersFunc(controllerContext.LoopMode)
 
-		if err := createPVRecyclerSA(c.OpenShiftContext.OpenShiftConfig, rootClientBuilder); err != nil {
-			klog.Fatalf("error creating recycler serviceaccount: %v", err)
-		}
-
 		if err := StartControllers(controllerContext, startSATokenController, controllerInitializers, unsecuredMux); err != nil {
 			klog.Fatalf("error starting controllers: %v", err)
 		}

diff --git a/cmd/kube-controller-manager/app/patch_recycler.go b/cmd/kube-controller-manager/app/patch_recycler.go