add selector

Author: azych

internal/cmd/internal/olmv1/operator_update.go

@@ -11,7 +11,7 @@ import (
 
 // NewOperatorUpdateCmd allows updating a selected operator
 func NewOperatorUpdateCmd(cfg *action.Configuration) *cobra.Command {
-	i := v1action.NewOperatorUpdate(cfg.Client)
+	i := v1action.NewOperatorUpdate(cfg)
 	i.Logf = log.Printf
 
 	cmd := &cobra.Command{
@@ -33,8 +33,9 @@ func NewOperatorUpdateCmd(cfg *action.Configuration) *cobra.Command {
 }
 
 func bindOperatorUpdateFlags(fs *pflag.FlagSet, i *v1action.OperatorUpdate) {
-	fs.StringVar(&i.Version, "version", "", "desired operator version (single or range) in semver format. AND operation with channels")
-	fs.StringArrayVar(&i.Channels, "channels", []string{}, "desired channels for operator versions. AND operation with version. Empty list means all available channels will be taken into consideration.")
+	fs.StringVar(&i.Version, "version", "", "desired operator version (single or range) in semVer format. AND operation with channels")
+	fs.StringVar(&i.Selector, "selector", "", "filters the set of catalogs used in the bundle selection process. Empty means that all catalogs will be used in the bundle selection process")
+	fs.StringArrayVar(&i.Channels, "channels", []string{}, "desired channels for operator versions. AND operation with version. Empty list means all available channels will be taken into consideration")
 	fs.StringVar(&i.UpgradeConstraintPolicy, "upgrade-constraint-policy", "", "controls whether the upgrade path(s) defined in the catalog are enforced. One of CatalogProvided|SelfCertified), Default: CatalogProvided")
 	fs.StringToStringVar(&i.Labels, "labels", map[string]string{}, "labels that will be set on the operator")
 	fs.BoolVar(&i.OverrideUnset, "override-unset-with-current", false, "when enabled, any unset flag value will be overridden with value already set in current operator")

internal/pkg/v1/action/interfaces.go

@@ -10,10 +10,6 @@ type creator interface {
 	Create(ctx context.Context, obj client.Object, opts ...client.CreateOption) error
 }
 
-type updater interface {
-	Update(ctx context.Context, obj client.Object, opts ...client.UpdateOption) error
-}
-
 type deleter interface {
 	Delete(ctx context.Context, obj client.Object, opts ...client.DeleteOption) error
 }

internal/pkg/v1/action/operator_update.go

@@ -12,20 +12,18 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 
 	olmv1 "github.com/operator-framework/operator-controller/api/v1"
-)
 
-type updateClient interface {
-	updater
-	getter
-}
+	"github.com/operator-framework/kubectl-operator/pkg/action"
+)
 
 type OperatorUpdate struct {
-	client updateClient
+	cfg *action.Configuration
 
 	Package string
 
 	Version                 string
 	Channels                []string
+	Selector                string
 	UpgradeConstraintPolicy string
 	Labels                  map[string]string
 	OverrideUnset           bool
@@ -35,18 +33,18 @@ type OperatorUpdate struct {
 	Logf func(string, ...interface{})
 }
 
-func NewOperatorUpdate(client updateClient) *OperatorUpdate {
+func NewOperatorUpdate(cfg *action.Configuration) *OperatorUpdate {
 	return &OperatorUpdate{
-		client: client,
-		Logf:   func(string, ...interface{}) {},
+		cfg:  cfg,
+		Logf: func(string, ...interface{}) {},
 	}
 }
 
 func (ou *OperatorUpdate) Run(ctx context.Context) (*olmv1.ClusterExtension, error) {
 	var ext olmv1.ClusterExtension
 
 	opKey := types.NamespacedName{Name: ou.Package}
-	if err := ou.client.Get(ctx, opKey, &ext); err != nil {
+	if err := ou.cfg.Client.Get(ctx, opKey, &ext); err != nil {
 		return nil, err
 	}
 
@@ -60,60 +58,90 @@ func (ou *OperatorUpdate) Run(ctx context.Context) (*olmv1.ClusterExtension, err
 		return nil, ErrNoChange
 	}
 
-	if ou.Version != "" {
-		if _, err := semver.ParseRange(ou.Version); err != nil {
-			return nil, fmt.Errorf("failed parsing version: %w", err)
-		}
+	if err := ou.prepareUpdatedExtension(&ext, constraintPolicy); err != nil {
+		return nil, err
 	}
 
-	ext.SetLabels(ou.Labels)
-	ext.Spec.Source.Catalog.Version = ou.Version
-	ext.Spec.Source.Catalog.Channels = ou.Channels
-	ext.Spec.Source.Catalog.UpgradeConstraintPolicy = constraintPolicy
-	if err := ou.client.Update(ctx, &ext); err != nil {
+	if err := ou.cfg.Client.Update(ctx, &ext); err != nil {
 		return nil, err
 	}
 
-	if err := waitUntilOperatorStatusCondition(ctx, ou.client, &ext, olmv1.TypeInstalled, metav1.ConditionTrue); err != nil {
+	if err := waitUntilOperatorStatusCondition(ctx, ou.cfg.Client, &ext, olmv1.TypeInstalled, metav1.ConditionTrue); err != nil {
 		return nil, fmt.Errorf("timed out waiting for operator: %w", err)
 	}
 
 	return &ext, nil
 }
 
 func (ou *OperatorUpdate) setDefaults(ext olmv1.ClusterExtension) {
-	catalogSrc := ext.Spec.Source.Catalog
-	if ou.OverrideUnset {
-		if ou.Version == "" {
-			ou.Version = catalogSrc.Version
-		}
-		if len(ou.Channels) == 0 {
-			ou.Channels = catalogSrc.Channels
-		}
+	if !ou.OverrideUnset {
 		if ou.UpgradeConstraintPolicy == "" {
-			ou.UpgradeConstraintPolicy = string(catalogSrc.UpgradeConstraintPolicy)
-		}
-		if len(ou.Labels) == 0 {
-			ou.Labels = ext.Labels
+			ou.UpgradeConstraintPolicy = string(olmv1.UpgradeConstraintPolicyCatalogProvided)
 		}
 
 		return
 	}
 
+	// OverrideUnset is enabled
+	// set all unset values to what they are on the current object
+	catalogSrc := ext.Spec.Source.Catalog
+	if ou.Version == "" {
+		ou.Version = catalogSrc.Version
+	}
+	if len(ou.Channels) == 0 {
+		ou.Channels = catalogSrc.Channels
+	}
 	if ou.UpgradeConstraintPolicy == "" {
-		ou.UpgradeConstraintPolicy = string(olmv1.UpgradeConstraintPolicyCatalogProvided)
+		ou.UpgradeConstraintPolicy = string(catalogSrc.UpgradeConstraintPolicy)
+	}
+	if len(ou.Labels) == 0 {
+		ou.Labels = ext.Labels
+	}
+	if ou.Selector == "" && catalogSrc.Selector != nil {
+		ou.Selector = catalogSrc.Selector.String()
 	}
 }
 
 func (ou *OperatorUpdate) needsUpdate(ext olmv1.ClusterExtension, constraintPolicy olmv1.UpgradeConstraintPolicy) bool {
 	catalogSrc := ext.Spec.Source.Catalog
 
+	var currentSelector string
+	if catalogSrc.Selector != nil {
+		currentSelector = catalogSrc.Selector.String()
+	}
+
 	if catalogSrc.Version == ou.Version &&
 		slices.Equal(catalogSrc.Channels, ou.Channels) &&
 		catalogSrc.UpgradeConstraintPolicy == constraintPolicy &&
-		maps.Equal(ext.Labels, ou.Labels) {
+		maps.Equal(ext.Labels, ou.Labels) &&
+		currentSelector == ou.Selector {
 		return false
 	}
 
 	return true
 }
+
+func (ou *OperatorUpdate) prepareUpdatedExtension(ext *olmv1.ClusterExtension, constraintPolicy olmv1.UpgradeConstraintPolicy) error {
+	var err error
+	var selector *metav1.LabelSelector
+
+	if ou.Version != "" {
+		if _, err = semver.ParseRange(ou.Version); err != nil {
+			return fmt.Errorf("failed parsing version: %w", err)
+		}
+	}
+	if ou.Selector != "" {
+		selector, err = metav1.ParseToLabelSelector(ou.Selector)
+		if err != nil {
+			return fmt.Errorf("failed parsing selector: %w", err)
+		}
+	}
+
+	ext.SetLabels(ou.Labels)
+	ext.Spec.Source.Catalog.Version = ou.Version
+	ext.Spec.Source.Catalog.Selector = selector
+	ext.Spec.Source.Catalog.Channels = ou.Channels
+	ext.Spec.Source.Catalog.UpgradeConstraintPolicy = constraintPolicy
+
+	return nil
+}

internal/pkg/v1/action/operator_update_test.go

@@ -38,7 +38,7 @@ var _ = Describe("OperatorUpdate", func() {
 	It("fails finding existing operator", func() {
 		cfg := setupEnv()
 
-		updater := internalaction.NewOperatorUpdate(cfg.Client)
+		updater := internalaction.NewOperatorUpdate(&cfg)
 		updater.Package = "does-not-exist"
 		ext, err := updater.Run(context.TODO())
 
@@ -50,7 +50,7 @@ var _ = Describe("OperatorUpdate", func() {
 	It("fails to handle operator with non-catalog source type", func() {
 		cfg := setupEnv(buildExtension("test", withSourceType("unknown")))
 
-		updater := internalaction.NewOperatorUpdate(cfg.Client)
+		updater := internalaction.NewOperatorUpdate(&cfg)
 		updater.Package = "test"
 		ext, err := updater.Run(context.TODO())
 
@@ -66,7 +66,7 @@ var _ = Describe("OperatorUpdate", func() {
 			withConstraintPolicy(string(olmv1.UpgradeConstraintPolicyCatalogProvided))),
 		)
 
-		updater := internalaction.NewOperatorUpdate(cfg.Client)
+		updater := internalaction.NewOperatorUpdate(&cfg)
 		updater.Package = "test"
 		ext, err := updater.Run(context.TODO())
 
@@ -85,7 +85,7 @@ var _ = Describe("OperatorUpdate", func() {
 			withVersion("10.0.4"),
 		))
 
-		updater := internalaction.NewOperatorUpdate(cfg.Client)
+		updater := internalaction.NewOperatorUpdate(&cfg)
 		updater.Package = "test"
 		updater.OverrideUnset = true
 		ext, err := updater.Run(context.TODO())
@@ -102,7 +102,7 @@ var _ = Describe("OperatorUpdate", func() {
 			withConstraintPolicy(string(olmv1.UpgradeConstraintPolicyCatalogProvided))),
 		)
 
-		updater := internalaction.NewOperatorUpdate(cfg.Client)
+		updater := internalaction.NewOperatorUpdate(&cfg)
 		updater.Package = "test"
 		updater.Version = "10-4"
 		ext, err := updater.Run(context.TODO())
@@ -123,7 +123,7 @@ var _ = Describe("OperatorUpdate", func() {
 		ctx, cancel := context.WithCancel(context.TODO())
 		cancel()
 
-		updater := internalaction.NewOperatorUpdate(cfg.Client)
+		updater := internalaction.NewOperatorUpdate(&cfg)
 		updater.Package = "test"
 		updater.Version = "10.0.4"
 		updater.Channels = []string{"a", "b"}
@@ -150,7 +150,7 @@ var _ = Describe("OperatorUpdate", func() {
 				Should(Succeed())
 		}()
 
-		updater := internalaction.NewOperatorUpdate(cfg.Client)
+		updater := internalaction.NewOperatorUpdate(&cfg)
 		updater.Package = "test"
 		updater.Version = "10.0.4"
 		updater.Channels = []string{"a", "b"}