ccc

Author: hongkailiu

pkg/cvo/availableupdates_test.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/openshift/cluster-version-operator/pkg/alert"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
@@ -25,6 +24,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/client-go/util/workqueue"
 
+	"github.com/openshift/cluster-version-operator/pkg/alert"
 	"github.com/openshift/cluster-version-operator/pkg/clusterconditions"
 	"github.com/openshift/cluster-version-operator/pkg/clusterconditions/always"
 	"github.com/openshift/cluster-version-operator/pkg/clusterconditions/mock"

pkg/cvo/status.go

@@ -229,13 +229,11 @@ func updateClusterVersionStatus(
 	if shouldReconcileAcceptRisks() {
 		updates := getAvailableUpdates()
 		var riskConditions map[string][]metav1.Condition
-		var alertRisks []configv1.ConditionalUpdateRisk
 		if updates != nil {
 			riskConditions = updates.RiskConditions
-			alertRisks = updates.AlertRisks
 		}
 		cvStatus.ConditionalUpdates, riskNamesForDesiredImage = conditionalUpdateWithRiskNamesAndRiskConditions(cvStatus.ConditionalUpdates, riskConditions, desired.Image)
-		cvStatus.ConditionalUpdateRisks = conditionalUpdateRisks(cvStatus.ConditionalUpdates, alertRisks)
+		cvStatus.ConditionalUpdateRisks = conditionalUpdateRisks(cvStatus.ConditionalUpdates)
 	}
 
 	risksMsg := ""
@@ -476,7 +474,7 @@ func conditionalUpdateWithRiskNamesAndRiskConditions(conditionalUpdates []config
 	return result, riskNamesForDesiredImage
 }
 
-func conditionalUpdateRisks(conditionalUpdates []configv1.ConditionalUpdate, alertRisks []configv1.ConditionalUpdateRisk) []configv1.ConditionalUpdateRisk {
+func conditionalUpdateRisks(conditionalUpdates []configv1.ConditionalUpdate) []configv1.ConditionalUpdateRisk {
 	var result []configv1.ConditionalUpdateRisk
 	riskNames := sets.New[string]()
 	for _, conditionalUpdate := range conditionalUpdates {
@@ -488,7 +486,6 @@ func conditionalUpdateRisks(conditionalUpdates []configv1.ConditionalUpdate, ale
 			result = append(result, risk)
 		}
 	}
-	result = append(result, alertRisks...)
 	sort.Slice(result, func(i, j int) bool {
 		return result[i].Name < result[j].Name
 	})

pkg/cvo/status_test.go

@@ -1098,7 +1098,6 @@ func Test_conditionalUpdateRisks(t *testing.T) {
 	tests := []struct {
 		name               string
 		conditionalUpdates []configv1.ConditionalUpdate
-		alertRisks         []configv1.ConditionalUpdateRisk
 		expected           []configv1.ConditionalUpdateRisk
 	}{
 		{
@@ -1132,28 +1131,6 @@ func Test_conditionalUpdateRisks(t *testing.T) {
 					},
 					}}},
 			}},
-			alertRisks: []configv1.ConditionalUpdateRisk{
-				{
-					Name:    "PodDisruptionBudgetAtLimit",
-					Message: "summary.",
-					URL:     "todo-url",
-					MatchingRules: []configv1.ClusterCondition{
-						{
-							Type: "PromQL",
-							PromQL: &configv1.PromQLClusterCondition{
-								PromQL: "todo-expression",
-							},
-						},
-					},
-					Conditions: []metav1.Condition{{
-						Type:               "Applies",
-						Status:             "True",
-						Reason:             "Alert:firing",
-						Message:            "severity alert PodDisruptionBudgetAtLimit firing, which might slow node drains. Namespace=namespace, PodDisruptionBudget=some-pdb. summary. The alert description is: description | message http://runbook.example.com/runbooks/bbb.md; severity alert PodDisruptionBudgetAtLimit firing, which might slow node drains. Namespace=namespace, PodDisruptionBudget=another-pdb. summary. The alert description is: description | message http://runbook.example.com/runbooks/bbb.md",
-						LastTransitionTime: metav1.NewTime(t1),
-					}},
-				},
-			},
 			expected: []configv1.ConditionalUpdateRisk{
 				{
 					Name:    "PodDisruptionBudgetAtLimit",
@@ -1195,7 +1172,7 @@ func Test_conditionalUpdateRisks(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			actual := conditionalUpdateRisks(tt.conditionalUpdates, tt.alertRisks)
+			actual := conditionalUpdateRisks(tt.conditionalUpdates)
 			if difference := cmp.Diff(tt.expected, actual, cmpopts.IgnoreFields(metav1.Condition{}, "LastTransitionTime")); difference != "" {
 				t.Errorf("actual differ from expected:\n%s", difference)
 			}