Address comments from review

Author: hongkailiu

pkg/cli/admin/upgrade/accept/accept.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/google/go-cmp/cmp"
 	"strings"
 
+	"github.com/google/go-cmp/cmp"
 	configv1 "github.com/openshift/api/config/v1"
 	configv1client "github.com/openshift/client-go/config/clientset/versioned"
 	"github.com/spf13/cobra"
@@ -59,7 +59,7 @@ func New(f kcmdutil.Factory, streams genericiooptions.IOStreams) *cobra.Command
 		Example: acceptExample,
 		Run: func(cmd *cobra.Command, args []string) {
 			kcmdutil.CheckErr(o.Complete(f, cmd, args))
-			kcmdutil.CheckErr(o.Run(cmd.Context()))
+			kcmdutil.CheckErr(o.Run())
 		},
 	}
 
@@ -135,7 +135,8 @@ func (o *options) Complete(f kcmdutil.Factory, cmd *cobra.Command, args []string
 	return nil
 }
 
-func (o *options) Run(ctx context.Context) error {
+func (o *options) Run() error {
+	ctx := context.TODO()
 	cv, err := o.Client.ConfigV1().ClusterVersions().Get(ctx, "version", metav1.GetOptions{})
 	if err != nil {
 		if apierrors.IsNotFound(err) {
@@ -158,9 +159,9 @@ func (o *options) Run(ctx context.Context) error {
 		for _, risk := range acceptRisks {
 			names = append(names, risk.Name)
 		}
-		_, _ = fmt.Fprintf(o.Out, "info: Accept risks are [%s]\n", strings.Join(names, ", "))
+		fmt.Fprintf(o.Out, "info: Accept risks are [%s]\n", strings.Join(names, ", ")) //nolint:errcheck
 	} else {
-		_, _ = fmt.Fprintf(o.Out, "info: Accept risks are not changed\n")
+		fmt.Fprintf(o.Out, "info: Accept risks are not changed\n") //nolint:errcheck
 	}
 
 	return nil

pkg/cli/admin/upgrade/rollback/rollback.go

@@ -27,8 +27,9 @@ func newOptions(streams genericiooptions.IOStreams) *options {
 func New(f kcmdutil.Factory, streams genericiooptions.IOStreams) *cobra.Command {
 	o := newOptions(streams)
 	cmd := &cobra.Command{
-		Use:   "rollback",
-		Short: "Rollback the cluster to the previous release.",
+		Use:    "rollback",
+		Hidden: true,
+		Short:  "Rollback the cluster to the previous release.",
 		Long: templates.LongDesc(`
 			Rollback the cluster to the previous release.
 

test/e2e/accept.go

@@ -4,6 +4,7 @@ import (
 	"context"
 
 	g "github.com/onsi/ginkgo/v2"
+	"github.com/onsi/ginkgo/v2/types"
 	o "github.com/onsi/gomega"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -14,7 +15,7 @@ import (
 	configv1client "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1"
 )
 
-var _ = g.Describe("[sig-cli] oc", g.Label("cluster-version-operator"), func() {
+var _ = g.Describe("[sig-cli][OCPFeatureGate:ClusterUpdateAcceptRisks] oc", g.Label("cluster-version-operator"), func() {
 
 	var (
 		ctx            = context.TODO()
@@ -29,6 +30,9 @@ var _ = g.Describe("[sig-cli] oc", g.Label("cluster-version-operator"), func() {
 		configClient, err = configv1client.NewForConfig(config)
 		o.Expect(err).NotTo(o.HaveOccurred())
 
+		skipIfMicroShift(oc)
+		SkipIfNotTechPreviewNoUpgrade(ctx, configClient)
+
 		cv, err := configClient.ClusterVersions().Get(ctx, "version", metav1.GetOptions{})
 		o.Expect(err).NotTo(o.HaveOccurred())
 		if cv.Spec.DesiredUpdate != nil {
@@ -37,6 +41,13 @@ var _ = g.Describe("[sig-cli] oc", g.Label("cluster-version-operator"), func() {
 	})
 
 	g.AfterEach(func() {
+		// No need to recover if the test is skipped.
+		// In case it is skipped up to disabled TP, we must not recover as the API might not be available.
+		// We could use patch instead but this guard should work too.
+		report := g.CurrentSpecReport()
+		if report.State.Is(types.SpecStateSkipped) {
+			return
+		}
 		cv, err := configClient.ClusterVersions().Get(ctx, "version", metav1.GetOptions{})
 		o.Expect(err).NotTo(o.HaveOccurred())
 		if cv.Spec.DesiredUpdate != nil && len(cv.Spec.DesiredUpdate.AcceptRisks) > 0 {
@@ -48,8 +59,6 @@ var _ = g.Describe("[sig-cli] oc", g.Label("cluster-version-operator"), func() {
 	})
 
 	g.It("can operate accept risks [Serial]", g.Label("tech-preview"), oteginkgo.Informing(), func() {
-		skipIfMicroShift(oc)
-		SkipIfNotTechPreviewNoUpgrade(ctx, configClient)
 
 		g.By("accepting some risks")
 		out, err := oc.Run("adm").Args("upgrade", "accept", "RiskA,RiskB").WithoutNamespace().Output()