If multiple install plans exist for the same OSSM version, approve the most recently created one.

This is part of the fix for OCPBUGS-53424

Author: rfredette

pkg/operator/controller/gatewayclass/subscription.go

@@ -158,22 +158,32 @@ func (r *reconciler) currentInstallPlan(ctx context.Context) (bool, *operatorsv1
 	if installPlans == nil || len(installPlans.Items) == 0 {
 		return false, nil, nil
 	}
+	var currentInstallPlan *operatorsv1alpha1.InstallPlan
 	for _, installPlan := range installPlans.Items {
 		if len(installPlan.OwnerReferences) == 0 || len(installPlan.Spec.ClusterServiceVersionNames) == 0 {
 			continue
 		}
+		ownerRefMatches := false
 		for _, ownerRef := range installPlan.OwnerReferences {
 			if ownerRef.UID == subscription.UID {
-				for _, csvName := range installPlan.Spec.ClusterServiceVersionNames {
-					if csvName == r.config.GatewayAPIOperatorVersion {
-						return true, &installPlan, nil
-					}
+				ownerRefMatches = true
+				break
+			}
+		}
+		if !ownerRefMatches {
+			continue
+		}
+		for _, csvName := range installPlan.Spec.ClusterServiceVersionNames {
+			if csvName == r.config.GatewayAPIOperatorVersion {
+				// Keep the newest InstallPlan to return at the end of the loop.
+				if currentInstallPlan == nil || currentInstallPlan.ObjectMeta.CreationTimestamp.Before(&installPlan.ObjectMeta.CreationTimestamp) {
+					currentInstallPlan = &installPlan
+					break
 				}
 			}
 		}
 	}
-	// No valid InstallPlan found.
-	return false, nil, nil
+	return (currentInstallPlan != nil), currentInstallPlan, nil
 }
 
 // desiredInstallPlan returns a version of the expected InstallPlan that is approved.

pkg/operator/controller/gatewayclass/subscription_test.go

@@ -3,6 +3,7 @@ package gatewayclass
 import (
 	"context"
 	"testing"
+	"time"
 
 	configv1 "github.com/openshift/api/config/v1"
 	operatorcontroller "github.com/openshift/cluster-ingress-operator/pkg/operator/controller"
@@ -312,6 +313,110 @@ func Test_ensureServiceMeshOperatorInstallPlan(t *testing.T) {
 			expectUpdate: []client.Object{},
 			expectDelete: []client.Object{},
 		},
+		{
+			// Multiple InstallPlans exist, all with the correct cluster service version and owner reference. Expect
+			// InstallPlan.Spec.Approved = true for only the most recent InstallPlan (by creation timestamp).
+			name:    "Multiple valid InstallPlans, should approve all",
+			channel: "stable",
+			version: "servicemeshoperator.v1.0.0",
+			existingObjects: []runtime.Object{
+				&operatorsv1alpha1.Subscription{
+					ObjectMeta: metav1.ObjectMeta{
+						Namespace:         operatorcontroller.ServiceMeshOperatorSubscriptionName().Namespace,
+						Name:              operatorcontroller.ServiceMeshOperatorSubscriptionName().Name,
+						UID:               "foobar",
+						CreationTimestamp: metav1.Date(2025, 1, 1, 0, 0, 0, 0, time.UTC),
+					},
+					Spec: &operatorsv1alpha1.SubscriptionSpec{
+						Channel:                "stable",
+						InstallPlanApproval:    operatorsv1alpha1.ApprovalManual,
+						Package:                "servicemeshoperator",
+						CatalogSource:          "redhat-operators",
+						CatalogSourceNamespace: "openshift-marketplace",
+						StartingCSV:            "servicemeshoperator.v1.0.0",
+					},
+				},
+				&operatorsv1alpha1.InstallPlan{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "Install-foo",
+						Namespace: operatorcontroller.OpenshiftOperatorNamespace,
+						OwnerReferences: []metav1.OwnerReference{
+							{
+								UID: "foobar",
+							},
+						},
+					},
+					Spec: operatorsv1alpha1.InstallPlanSpec{
+						ClusterServiceVersionNames: []string{
+							"servicemeshoperator.v1.0.0",
+						},
+						Approval: operatorsv1alpha1.ApprovalManual,
+						Approved: false,
+					},
+				},
+				&operatorsv1alpha1.InstallPlan{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "Install-bar",
+						Namespace: operatorcontroller.OpenshiftOperatorNamespace,
+						OwnerReferences: []metav1.OwnerReference{
+							{
+								UID: "foobar",
+							},
+						},
+						CreationTimestamp: metav1.Date(2025, 1, 1, 2, 30, 0, 0, time.UTC),
+					},
+					Spec: operatorsv1alpha1.InstallPlanSpec{
+						ClusterServiceVersionNames: []string{
+							"servicemeshoperator.v1.0.0",
+						},
+						Approval: operatorsv1alpha1.ApprovalManual,
+						Approved: false,
+					},
+				},
+				&operatorsv1alpha1.InstallPlan{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "Install-baz",
+						Namespace: operatorcontroller.OpenshiftOperatorNamespace,
+						OwnerReferences: []metav1.OwnerReference{
+							{
+								UID: "foobar",
+							},
+						},
+						CreationTimestamp: metav1.Date(2024, 12, 31, 23, 59, 0, 0, time.UTC),
+					},
+					Spec: operatorsv1alpha1.InstallPlanSpec{
+						ClusterServiceVersionNames: []string{
+							"servicemeshoperator.v1.0.0",
+						},
+						Approval: operatorsv1alpha1.ApprovalManual,
+						Approved: false,
+					},
+				},
+			},
+			expectCreate: []client.Object{},
+			expectUpdate: []client.Object{
+				&operatorsv1alpha1.InstallPlan{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "Install-bar",
+						Namespace: operatorcontroller.OpenshiftOperatorNamespace,
+						OwnerReferences: []metav1.OwnerReference{
+							{
+								UID: "foobar",
+							},
+						},
+						CreationTimestamp: metav1.Date(2025, 1, 1, 2, 30, 0, 0, time.UTC),
+					},
+					Spec: operatorsv1alpha1.InstallPlanSpec{
+						ClusterServiceVersionNames: []string{
+							"servicemeshoperator.v1.0.0",
+						},
+						Approval: operatorsv1alpha1.ApprovalManual,
+						Approved: true,
+					},
+				},
+			},
+			expectDelete: []client.Object{},
+		},
 	}
 
 	scheme := runtime.NewScheme()