remove argument

Author: awgreene

cmd/olm/main.go

@@ -69,9 +69,6 @@ var (
 
 	namespace = pflag.String(
 		"namespace", "", "namespace where cleanup runs")
-
-	disableCopiedCSVs = pflag.Bool(
-		"disableCopiedCSVs", false, "disables copied CSVs in AllNamespace mode when enabled")
 )
 
 func init() {
@@ -165,7 +162,6 @@ func main() {
 		olm.WithOperatorClient(opClient),
 		olm.WithRestConfig(config),
 		olm.WithConfigClient(versionedConfigClient),
-		olm.WithCopiedCSVs(!*disableCopiedCSVs),
 	)
 	if err != nil {
 		logger.WithError(err).Fatalf("error configuring operator")

pkg/controller/operators/olm/config.go

@@ -21,19 +21,18 @@ import (
 type OperatorOption func(*operatorConfig)
 
 type operatorConfig struct {
-	resyncPeriod        func() time.Duration
-	operatorNamespace   string
-	watchedNamespaces   []string
-	clock               utilclock.Clock
-	logger              *logrus.Logger
-	operatorClient      operatorclient.ClientInterface
-	externalClient      versioned.Interface
-	strategyResolver    install.StrategyResolverInterface
-	apiReconciler       APIIntersectionReconciler
-	apiLabeler          labeler.Labeler
-	restConfig          *rest.Config
-	configClient        configv1client.Interface
-	isCopiedCSVsEnabled bool
+	resyncPeriod      func() time.Duration
+	operatorNamespace string
+	watchedNamespaces []string
+	clock             utilclock.Clock
+	logger            *logrus.Logger
+	operatorClient    operatorclient.ClientInterface
+	externalClient    versioned.Interface
+	strategyResolver  install.StrategyResolverInterface
+	apiReconciler     APIIntersectionReconciler
+	apiLabeler        labeler.Labeler
+	restConfig        *rest.Config
+	configClient      configv1client.Interface
 }
 
 func (o *operatorConfig) apply(options []OperatorOption) {
@@ -113,12 +112,6 @@ func WithLogger(logger *logrus.Logger) OperatorOption {
 	}
 }
 
-func WithCopiedCSVs(enabled bool) OperatorOption {
-	return func(config *operatorConfig) {
-		config.isCopiedCSVsEnabled = enabled
-	}
-}
-
 func WithClock(clock utilclock.Clock) OperatorOption {
 	return func(config *operatorConfig) {
 		config.clock = clock

pkg/controller/operators/olm/operator.go

@@ -91,7 +91,6 @@ type Operator struct {
 	clientAttenuator      *scoped.ClientAttenuator
 	serviceAccountQuerier *scoped.UserDefinedServiceAccountQuerier
 	clientFactory         clients.Factory
-	isCopiedCSVsEnabled   bool
 }
 
 func NewOperator(ctx context.Context, options ...OperatorOption) (*Operator, error) {
@@ -147,7 +146,6 @@ func newOperatorWithConfig(ctx context.Context, config *operatorConfig) (*Operat
 		clientAttenuator:      scoped.NewClientAttenuator(config.logger, config.restConfig, config.operatorClient),
 		serviceAccountQuerier: scoped.NewUserDefinedServiceAccountQuerier(config.logger, config.externalClient),
 		clientFactory:         clients.NewFactory(config.restConfig),
-		isCopiedCSVsEnabled:   config.isCopiedCSVsEnabled,
 	}
 
 	// Set up syncing for namespace-scoped resources
@@ -1247,14 +1245,14 @@ func (a *Operator) syncCopyCSV(obj interface{}) (syncError error) {
 		"targetNamespaces": strings.Join(operatorGroup.Status.Namespaces, ","),
 	}).Debug("copying csv to targets")
 
-	isCSVCopyingEnabled, err := a.isCSVCopyingEnabled()
+	copiedCSVsAreEnabled, err := a.copiedCSVsAreEnabled()
 	if err != nil {
 		return err
 	}
 
 	// Check if we need to do any copying / annotation for the operatorgroup
 	namespaceSet := NewNamespaceSet(operatorGroup.Status.Namespaces)
-	if isCSVCopyingEnabled || !namespaceSet.IsAllNamespaces() {
+	if copiedCSVsAreEnabled || !namespaceSet.IsAllNamespaces() {
 		if err := a.ensureCSVsInNamespaces(clusterServiceVersion, operatorGroup, namespaceSet); err != nil {
 			logger.WithError(err).Info("couldn't copy CSV to target namespaces")
 			syncError = err
@@ -1294,7 +1292,7 @@ func (a *Operator) syncCopyCSV(obj interface{}) (syncError error) {
 	return
 }
 
-// isCSVCopyingEnabled determines if csv copying is enabled for OLM.
+// copiedCSVsAreEnabled determines if csv copying is enabled for OLM.
 //
 // This method will first attempt to get the "cluster" olmConfig resource,
 // if any error other than "IsNotFound" is encountered, false and the error
@@ -1304,10 +1302,9 @@ func (a *Operator) syncCopyCSV(obj interface{}) (syncError error) {
 // olmConfig.spec.features.disableCopiedCSVs will be returned along with a
 // nil error.
 //
-// If the "cluster" olmConfig resource is not found, the value will match
-// the value of the disableCopiedCSVs flag provided to OLM on startup will
-// be returned along with a nil error.
-func (a *Operator) isCSVCopyingEnabled() (bool, error) {
+// If the "cluster" olmConfig resource is not found, true will be returned
+// without an error.
+func (a *Operator) copiedCSVsAreEnabled() (bool, error) {
 	olmConfig, err := a.client.OperatorsV1().OLMConfigs().Get(context.TODO(), "cluster", metav1.GetOptions{})
 	// If there was an error that wasn't an IsNotFound, return the error
 	if err != nil && !k8serrors.IsNotFound(err) {
@@ -1316,11 +1313,11 @@ func (a *Operator) isCSVCopyingEnabled() (bool, error) {
 
 	// If there was no error, return value based on olmConfig ingleton
 	if err == nil {
-		return olmConfig.IsCopiedCSVsEnabled(), nil
+		return olmConfig.CopiedCSVsAreEnabled(), nil
 	}
 
-	// Default to flag if olmConfig cannot be found
-	return a.isCopiedCSVsEnabled, nil
+	// Default to true if olmConfig cannot be found
+	return true, nil
 }
 
 func (a *Operator) getCopiedCSVDisabledEventsForCSV(csv *v1alpha1.ClusterServiceVersion) ([]corev1.Event, error) {