chore(olm): remove cleanup func from operator

Author: ecordell

cmd/olm/main.go

@@ -21,10 +21,6 @@ import (
 )
 
 const (
-	envOperatorName         = "OPERATOR_NAME"
-	envOperatorNamespace    = "OPERATOR_NAMESPACE"
-	ALMManagedAnnotationKey = "alm-manager"
-
 	defaultWakeupInterval = 5 * time.Minute
 )
 
@@ -75,17 +71,6 @@ func main() {
 		os.Exit(0)
 	}
 
-	// Env Vars
-	operatorNamespace := envOrDie(
-		envOperatorNamespace, "used to set annotation indicating which ALM operator manages a namespace")
-
-	operatorName := envOrDie(
-		envOperatorName, "used to distinguish ALM operators of the same name")
-
-	annotation := map[string]string{
-		ALMManagedAnnotationKey: fmt.Sprintf("%s.%s", operatorNamespace, operatorName),
-	}
-
 	// Set log level to debug if `debug` flag set
 	if *debug {
 		log.SetLevel(log.DebugLevel)
@@ -104,12 +89,11 @@ func main() {
 	opClient := operatorclient.NewClientFromConfig(*kubeConfigPath)
 
 	// Create a new instance of the operator.
-	operator, err := olm.NewOperator(crClient, opClient, &install.StrategyResolver{}, *wakeupInterval, annotation, namespaces)
+	operator, err := olm.NewOperator(crClient, opClient, &install.StrategyResolver{}, *wakeupInterval, namespaces)
 
 	if err != nil {
 		log.Fatalf("error configuring operator: %s", err.Error())
 	}
-	defer operator.Cleanup()
 
 	// Serve a health check.
 	http.HandleFunc("/healthz", func(w http.ResponseWriter, r *http.Request) {

pkg/controller/operators/olm/operator.go

@@ -54,13 +54,10 @@ type Operator struct {
 	client   versioned.Interface
 	resolver install.StrategyResolverInterface
 	lister   operatorlister.OperatorLister
-	// csvLister           map[string]csvlister.ClusterServiceVersionLister
-	// operatorGroupLister map[string]operatorgrouplister.OperatorGroupLister
 	recorder    record.EventRecorder
-	cleanupFunc func()
 }
 
-func NewOperator(crClient versioned.Interface, opClient operatorclient.ClientInterface, resolver install.StrategyResolverInterface, wakeupInterval time.Duration, annotations map[string]string, namespaces []string) (*Operator, error) {
+func NewOperator(crClient versioned.Interface, opClient operatorclient.ClientInterface, resolver install.StrategyResolverInterface, wakeupInterval time.Duration, namespaces []string) (*Operator, error) {
 	if wakeupInterval < 0 {
 		wakeupInterval = FallbackWakeupInterval
 	}
@@ -268,11 +265,6 @@ func NewOperator(crClient versioned.Interface, opClient operatorclient.ClientInt
 	return op, nil
 }
 
-// Cleanup cleans up operator resources on the cluster
-func (a *Operator) Cleanup() {
-	a.cleanupFunc()
-}
-
 func (a *Operator) requeueCSV(name, namespace string) {
 	// we can build the key directly, will need to change if queue uses different key scheme
 	key := fmt.Sprintf("%s/%s", namespace, name)

pkg/controller/operators/olm/operator_test.go

@@ -125,7 +125,6 @@ func NewFakeOperator(clientObjs []runtime.Object, k8sObjs []runtime.Object, extO
 	k8sClientFake.Resources = apiResourcesForObjects(append(extObjs, regObjs...))
 	opClientFake := operatorclient.NewClient(k8sClientFake, apiextensionsfake.NewSimpleClientset(extObjs...), apiregistrationfake.NewSimpleClientset(regObjs...))
 
-	annotations := map[string]string{"test": "annotation"}
 	eventRecorder, err := event.NewRecorder(opClientFake.KubernetesInterface().CoreV1().Events(metav1.NamespaceAll))
 	if err != nil {
 		return nil, err
@@ -140,9 +139,6 @@ func NewFakeOperator(clientObjs []runtime.Object, k8sObjs []runtime.Object, extO
 		resolver:  resolver,
 		csvQueue:  workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "clusterserviceversions"),
 		recorder:  eventRecorder,
-		cleanupFunc: func() {
-			namespaceAnnotator.CleanNamespaceAnnotations(namespaces)
-		},
 	}
 
 	wakeupInterval := 5 * time.Second