pkg/cli/admin/upgrade/channel: Add 'oc adm upgrade channel ...' #576
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| // Package channel contains a command for setting a cluster's update channel. | ||
| package channel | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "strings" | ||
|
|
||
| configv1client "github.com/openshift/client-go/config/clientset/versioned" | ||
| "github.com/spf13/cobra" | ||
| "k8s.io/apimachinery/pkg/api/errors" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/cli-runtime/pkg/genericclioptions" | ||
| kcmdutil "k8s.io/kubectl/pkg/cmd/util" | ||
| "k8s.io/kubectl/pkg/util/templates" | ||
| ) | ||
|
|
||
| func NewOptions(streams genericclioptions.IOStreams) *Options { | ||
| return &Options{ | ||
| IOStreams: streams, | ||
| } | ||
| } | ||
|
|
||
| func New(f kcmdutil.Factory, streams genericclioptions.IOStreams) *cobra.Command { | ||
| o := NewOptions(streams) | ||
| cmd := &cobra.Command{ | ||
| Use: "channel CHANNEL", | ||
| Short: "Set or clear the update channel", | ||
| Long: templates.LongDesc(` | ||
| Set or clear the update channel. | ||
| This command will set or clear the update channel, which impacts the list of updates | ||
| recommended for the cluster. | ||
| If there is a list of acceptable channels and the desired channel is not in that list, | ||
| you must pass --allow-explicit-channel to allow channel change to proceed. | ||
| `), | ||
| Run: func(cmd *cobra.Command, args []string) { | ||
| kcmdutil.CheckErr(o.Complete(f, cmd, args)) | ||
| kcmdutil.CheckErr(o.Run()) | ||
| }, | ||
| } | ||
| flags := cmd.Flags() | ||
| flags.BoolVar(&o.AllowExplicitChannel, "allow-explicit-channel", o.AllowExplicitChannel, "Change the channel, even if there is a list of acceptable channels and the desired channel is not in that list.") | ||
| return cmd | ||
| } | ||
|
|
||
| type Options struct { | ||
| genericclioptions.IOStreams | ||
|
|
||
| Channel string | ||
|
|
||
| AllowExplicitChannel bool | ||
|
|
||
| Client configv1client.Interface | ||
| } | ||
|
|
||
| func (o *Options) Complete(f kcmdutil.Factory, cmd *cobra.Command, args []string) error { | ||
| if len(args) > 1 { | ||
| return kcmdutil.UsageErrorf(cmd, "multiple positional arguments given") | ||
| } else if len(args) == 1 { | ||
| o.Channel = args[0] | ||
| } | ||
|
|
||
| cfg, err := f.ToRESTConfig() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| client, err := configv1client.NewForConfig(cfg) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| o.Client = client | ||
| return nil | ||
| } | ||
|
|
||
| func (o *Options) Run() error { | ||
| ctx := context.TODO() | ||
| cv, err := o.Client.ConfigV1().ClusterVersions().Get(ctx, "version", metav1.GetOptions{}) | ||
| if err != nil { | ||
| if errors.IsNotFound(err) { | ||
| return fmt.Errorf("no cluster version information available - you must be connected to an OpenShift version 4 server to fetch the current version") | ||
| } | ||
| return err | ||
| } | ||
|
|
||
| if o.Channel == cv.Spec.Channel { | ||
| if cv.Spec.Channel == "" { | ||
| fmt.Fprint(o.Out, "info: Cluster channel is already clear\n") | ||
| } else { | ||
| fmt.Fprintf(o.Out, "info: Cluster is already in %s\n", cv.Spec.Channel) | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| if len(cv.Status.Desired.Channels) > 0 { | ||
| found := false | ||
| for _, channel := range cv.Status.Desired.Channels { | ||
| if channel == o.Channel { | ||
| found = true | ||
| break | ||
| } | ||
| } | ||
| if !found { | ||
| if !o.AllowExplicitChannel { | ||
| return fmt.Errorf("the requested channel %q is not one of the available channels (%s), you must pass --allow-explicit-channel to continue\n", o.Channel, strings.Join(cv.Status.Desired.Channels, ", ")) | ||
| } | ||
| if o.Channel != "" { | ||
| fmt.Fprintf(o.ErrOut, "warning: The requested channel %q is not one of the available channels (%s). You have used --allow-explicit-channel to proceed anyway.\n", o.Channel, strings.Join(cv.Status.Desired.Channels, ", ")) | ||
| } | ||
| } | ||
| } else if o.Channel != "" { | ||
| fmt.Fprintf(o.ErrOut, "warning: No channels known to be compatible with the current version %q; unable to validate %q.\n", cv.Status.Desired.Version, o.Channel) | ||
| } | ||
|
|
||
| if o.Channel == "" { | ||
| fmt.Fprintf(o.ErrOut, "warning: Clearing channel %q; cluster will no longer request available update recommendations.\n", cv.Spec.Channel) | ||
| } | ||
|
|
||
| cv.Spec.Channel = o.Channel | ||
|
|
||
| if _, err = o.Client.ConfigV1().ClusterVersions().Update(ctx, cv, metav1.UpdateOptions{}); err != nil { | ||
| return fmt.Errorf("unable to set channel: %w", err) | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is not intuitive IMO. We need a verb or flag to make it intuitive e.g.
oc adm upgrade channel --to candidate-4.6Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I was trying to compile this PR to test the user experience but getting in to some error because I am using go 1.15.2
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Rebased onto master, and it compiles in the CI presubmits. What error were you seeing?
/remove-lifecycle stale
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I can compile the PR successfully now.