fix(adm-upgrade): switched to checking for CVO in alerts(). Wrote unit test for new functions

Signed-off-by: Nick Bottari <nbottari9@gmail.com>

fix(alerts): prevent duplication of warnings by disabling client-side alert checking if the server is already doing it.

Signed-off-by: Nick Bottari <nbottari@nbottari-thinkpadp1gen4i.boston.csb>

fix(adm-upgrade): changed method of detecting if CVO is already checking alerts

Signed-off-by: Nick Bottari <nbottari9@gmail.com>

fix(adm-upgrade): add check for hypershift and improve error checking

Signed-off-by: Nick Bottari <nbottari9@gmail.com>

fix(adm-upgrade): switched to checking for CVO in alerts(). Wrote unit test for new functions

Signed-off-by: Nick Bottari <nbottari9@gmail.com>

cv != nil

Signed-off-by: Nick Bottari <nbottari9@gmail.com>

Author: nbottari9

pkg/cli/admin/upgrade/recommend/alerts.go

@@ -6,6 +6,8 @@ import (
 	"fmt"
 	"strings"
 
+	configv1 "github.com/openshift/api/config/v1"
+	"github.com/openshift/api/features"
 	routev1 "github.com/openshift/api/route/v1"
 	routev1client "github.com/openshift/client-go/route/clientset/versioned/typed/route/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -20,6 +22,19 @@ import (
 // and Unknown when we do not have enough information to make a
 // happy-or-sad determination.
 func (o *options) alerts(ctx context.Context) ([]acceptableCondition, error) {
+
+	if o.Client != nil {
+		featureGates, _ := o.Client.ConfigV1().FeatureGates().Get(ctx, "cluster", metav1.GetOptions{})
+		infrastructure, _ := o.Client.ConfigV1().Infrastructures().Get(ctx, "cluster", metav1.GetOptions{})
+		cv, _ := o.Client.ConfigV1().ClusterVersions().Get(ctx, "version", metav1.GetOptions{})
+
+		// if the AcceptRisks feature gate AND hypershift is not enabled,
+		// the CVO is handling alerts and will generate the Recommended condition if needed
+		if cv != nil && isAcceptRisksEnabled(featureGates, cv.Status.Desired.Version) && !isHypershiftEnabled(infrastructure) {
+			return nil, nil
+		}
+	}
+
 	var alertsBytes []byte
 	if o.mockData.alertsPath != "" {
 		if len(o.mockData.alerts) == 0 {
@@ -251,3 +266,30 @@ func (o *options) alerts(ctx context.Context) ([]acceptableCondition, error) {
 
 	return conditions, nil
 }
+
+// isAcceptRisksEnabled checks to see if the 'ClusterUpdateAcceptRisks' feature gate is enabled
+// if so, return true to skip client-side alert checking
+func isAcceptRisksEnabled(featureGate *configv1.FeatureGate, clusterVersion string) bool {
+	if featureGate == nil {
+		return false
+	}
+
+	for _, versionedGates := range featureGate.Status.FeatureGates {
+		if versionedGates.Version == clusterVersion {
+			for _, enabledGate := range versionedGates.Enabled {
+				if enabledGate.Name == features.FeatureGateClusterUpdateAcceptRisks {
+					return true
+				}
+			}
+		}
+	}
+	return false
+}
+
+func isHypershiftEnabled(i *configv1.Infrastructure) bool {
+	if i == nil {
+		return false
+	}
+
+	return i.Status.ControlPlaneTopology == configv1.ExternalTopologyMode
+}

pkg/cli/admin/upgrade/recommend/recommend.go

@@ -132,7 +132,6 @@ func (o *options) Complete(f kcmdutil.Factory, cmd *cobra.Command, args []string
 			o.version = &version
 		}
 	}
-
 	return nil
 }
 

pkg/cli/admin/upgrade/recommend/recommend_test.go

@@ -6,6 +6,7 @@ import (
 	"testing"
 
 	configv1 "github.com/openshift/api/config/v1"
+	"github.com/openshift/api/features"
 )
 
 func TestSortConditionalUpdatesBySemanticVersions(t *testing.T) {
@@ -29,3 +30,38 @@ func TestSortConditionalUpdatesBySemanticVersions(t *testing.T) {
 		t.Errorf("%v != %v", actual, expected)
 	}
 }
+
+func TestIsAcceptRisksEnabled(t *testing.T) {
+	featureGate := &configv1.FeatureGate{
+		Status: configv1.FeatureGateStatus{
+			FeatureGates: []configv1.FeatureGateDetails{
+				{
+					Version: "4.22.0",
+					Enabled: []configv1.FeatureGateAttributes{
+						{
+							Name: features.FeatureGateClusterUpdateAcceptRisks,
+						},
+					},
+				},
+			},
+		},
+	}
+
+	result := isAcceptRisksEnabled(featureGate, "4.22.0")
+	if result != true {
+		t.Errorf("ClusterUpdateAcceptRisks feature gate should report as enabled")
+	}
+}
+
+func TestIsHypershiftEnabled(t *testing.T) {
+	infra := &configv1.Infrastructure{
+		Status: configv1.InfrastructureStatus{
+			ControlPlaneTopology: configv1.ExternalTopologyMode,
+		},
+	}
+
+	result := isHypershiftEnabled(infra)
+	if result != true {
+		t.Errorf("Hypershift should report as enabled")
+	}
+}