Merge pull request #1604 from benluddy/test-csv-owned-api-retry-update

Retry update in flaky test of CSV w/owned API Service.

Author: openshift-merge-robot

test/e2e/csv_e2e_test.go

@@ -1029,11 +1029,12 @@ var _ = Describe("CSV", func() {
 		require.True(GinkgoT(), ok, "expected olm sha annotation not present on existing pod template")
 
 		// Induce a cert rotation
-		now := metav1.Now()
-		fetchedCSV.Status.CertsLastUpdated = &now
-		fetchedCSV.Status.CertsRotateAt = &now
-		fetchedCSV, err = crc.OperatorsV1alpha1().ClusterServiceVersions(testNamespace).UpdateStatus(context.TODO(), fetchedCSV, metav1.UpdateOptions{})
-		require.NoError(GinkgoT(), err)
+		Eventually(Apply(fetchedCSV, func(csv *v1alpha1.ClusterServiceVersion) error {
+			now := metav1.Now()
+			csv.Status.CertsLastUpdated = &now
+			csv.Status.CertsRotateAt = &now
+			return nil
+		})).Should(Succeed())
 
 		_, err = fetchCSV(crc, csv.Name, testNamespace, func(csv *v1alpha1.ClusterServiceVersion) bool {
 			// Should create deployment

test/e2e/subscription_e2e_test.go

@@ -22,7 +22,6 @@ import (
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/discovery"
 
@@ -962,11 +961,6 @@ var _ = Describe("Subscription", func() {
 		plan := &v1alpha1.InstallPlan{}
 		plan.SetNamespace(ref.Namespace)
 		plan.SetName(ref.Name)
-		plan.GetObjectKind().SetGroupVersionKind(schema.GroupVersionKind{
-			Group:   v1alpha1.GroupName,
-			Version: v1alpha1.GroupVersion,
-			Kind:    v1alpha1.InstallPlanKind,
-		})
 
 		// Set the InstallPlan's approval mode to Manual
 		Eventually(Apply(plan, func(p *v1alpha1.InstallPlan) error {

test/e2e/util_test.go

@@ -885,11 +885,34 @@ func toggleFeatureGates(deployment *appsv1.Deployment, toToggle ...featuregate.F
 	awaitPredicates(deadline, w, deploymentReplicas(2), deploymentAvailable, deploymentReplicas(1))
 }
 
+var gvks = map[reflect.Type]schema.GroupVersionKind{
+	reflect.TypeOf(&v1alpha1.ClusterServiceVersion{}): schema.GroupVersionKind{
+		Group:   v1alpha1.GroupName,
+		Version: v1alpha1.GroupVersion,
+		Kind:    v1alpha1.ClusterServiceVersionKind,
+	},
+	reflect.TypeOf(&v1alpha1.InstallPlan{}): schema.GroupVersionKind{
+		Group:   v1alpha1.GroupName,
+		Version: v1alpha1.GroupVersion,
+		Kind:    v1alpha1.InstallPlanKind,
+	},
+}
+
 type Object interface {
 	runtime.Object
 	metav1.Object
 }
 
+func SetDefaultGroupVersionKind(o Object) {
+	gvk := o.GetObjectKind().GroupVersionKind()
+	if !gvk.Empty() {
+		return
+	}
+	if gvk, ok := gvks[reflect.TypeOf(o)]; ok {
+		o.GetObjectKind().SetGroupVersionKind(gvk)
+	}
+}
+
 // Apply returns a function that invokes a change func on an object and performs a server-side apply patch with the result and its status subresource.
 // The given resource must be a pointer to a struct that specifies its Name, Namespace, APIVersion, and Kind at minimum.
 // The given change function must be aunary, matching the signature: "func(<obj type>) error".
@@ -948,7 +971,7 @@ func Apply(obj Object, changeFunc interface{}) func() error {
 		if err := client.Get(bg, key, cp); err != nil {
 			return err
 		}
-		cp.GetObjectKind().SetGroupVersionKind(obj.GetObjectKind().GroupVersionKind())
+		SetDefaultGroupVersionKind(cp)
 		cp.SetManagedFields(nil)
 
 		var (
@@ -970,7 +993,7 @@ func Apply(obj Object, changeFunc interface{}) func() error {
 		if err := client.Get(bg, key, cp); err != nil {
 			return err
 		}
-		cp.GetObjectKind().SetGroupVersionKind(obj.GetObjectKind().GroupVersionKind())
+		SetDefaultGroupVersionKind(cp)
 		cp.SetManagedFields(nil)
 
 		if len(out) != 1 {