pkg,test: Update test fixtures that are instantiated with status fields

Update the adoption controller test subscription fixture and remove the
status sub-resource block that's shared between tests. When an object is
created, it's status sub-resource is now removed, so changes are centered
around setting this resource before firing off any Update calls used
throughout this test package.

Update any test/e2e APIs that also follow a similiar pattern.

Signed-off-by: timflannagan <[email protected]>

Author: timflannagan

pkg/controller/operators/adoption_controller_test.go

@@ -80,10 +80,6 @@ var _ = Describe("Adoption Controller", func() {
 						Spec: &operatorsv1alpha1.SubscriptionSpec{
 							Package: "poultry",
 						},
-						Status: operatorsv1alpha1.SubscriptionStatus{
-							InstalledCSV: "turkey",
-							LastUpdated:  metav1.Now(),
-						},
 					}
 					sub.SetNamespace(ns.GetName())
 					sub.SetName(sub.Spec.Package)
@@ -94,13 +90,14 @@ var _ = Describe("Adoption Controller", func() {
 					created = append(created, sub)
 
 					// Set the Subscription's status separately
-					status := sub.DeepCopy().Status
 					Eventually(func() error {
 						if err := k8sClient.Get(ctx, testobj.NamespacedName(sub), sub); err != nil {
 							return err
 						}
-						sub.Status = status
-
+						sub.Status = operatorsv1alpha1.SubscriptionStatus{
+							InstalledCSV: "turkey",
+							LastUpdated:  metav1.Now(),
+						}
 						return k8sClient.Status().Update(ctx, sub)
 					}, timeout, interval).Should(Succeed())
 

test/e2e/deprecated_e2e_test.go

@@ -30,15 +30,15 @@ var _ = Describe("Not found APIs", func() {
 		// each entry is an installplan with a deprecated resource
 		type payload struct {
 			name       string
-			ip         *operatorsv1alpha1.InstallPlan
+			IP         *operatorsv1alpha1.InstallPlan
 			errMessage string
 		}
 
 		var tableEntries []table.TableEntry
 		tableEntries = []table.TableEntry{
 			table.Entry("contains an entry with a missing API not found on cluster ", payload{
 				name: "installplan contains a missing API",
-				ip: &operatorsv1alpha1.InstallPlan{
+				IP: &operatorsv1alpha1.InstallPlan{
 					ObjectMeta: metav1.ObjectMeta{
 						Namespace: *namespace, // this is necessary due to ginkgo table semantics, see https://github.com/onsi/ginkgo/issues/378
 						Name:      "test-plan-api",
@@ -48,41 +48,43 @@ var _ = Describe("Not found APIs", func() {
 						Approved:                   true,
 						ClusterServiceVersionNames: []string{},
 					},
-					Status: operatorsv1alpha1.InstallPlanStatus{
-						Phase:          operatorsv1alpha1.InstallPlanPhaseInstalling,
-						CatalogSources: []string{},
-						Plan: []*operatorsv1alpha1.Step{
-							{
-								Resolving: "test-csv",
-								Status:    operatorsv1alpha1.StepStatusUnknown,
-								Resource: operatorsv1alpha1.StepResource{
-									Name:     "my.thing",
-									Group:    "verticalpodautoscalers.autoscaling.k8s.io",
-									Version:  "v1",
-									Kind:     "VerticalPodAutoscaler",
-									Manifest: missingAPI,
-								},
-							},
-						},
-					},
 				},
 				errMessage: "api-server resource not found installing VerticalPodAutoscaler my.thing: GroupVersionKind " +
 					"verticalpodautoscalers.autoscaling.k8s.io/v1, Kind=VerticalPodAutoscaler not found on the cluster",
 			}),
 		}
 
 		table.DescribeTable("the ip enters a failed state with a helpful error message", func(tt payload) {
-			Expect(ctx.Ctx().Client().Create(context.Background(), tt.ip)).To(Succeed())
-			Expect(ctx.Ctx().Client().Status().Update(context.Background(), tt.ip)).To(Succeed())
+			Expect(ctx.Ctx().Client().Create(context.Background(), tt.IP)).To(Succeed())
+
+			tt.IP.Status = operatorsv1alpha1.InstallPlanStatus{
+				Phase:          operatorsv1alpha1.InstallPlanPhaseInstalling,
+				CatalogSources: []string{},
+				Plan: []*operatorsv1alpha1.Step{
+					{
+						Resolving: "test-csv",
+						Status:    operatorsv1alpha1.StepStatusUnknown,
+						Resource: operatorsv1alpha1.StepResource{
+							Name:     "my.thing",
+							Group:    "verticalpodautoscalers.autoscaling.k8s.io",
+							Version:  "v1",
+							Kind:     "VerticalPodAutoscaler",
+							Manifest: missingAPI,
+						},
+					},
+				},
+			}
+
+			Expect(ctx.Ctx().Client().Status().Update(context.Background(), tt.IP)).To(Succeed(), "failed to update the resource")
 
 			// The IP sits in the Installing phase with the GVK missing error
 			Eventually(func() (*operatorsv1alpha1.InstallPlan, error) {
-				return tt.ip, ctx.Ctx().Client().Get(context.Background(), client.ObjectKeyFromObject(tt.ip), tt.ip)
+				return tt.IP, ctx.Ctx().Client().Get(context.Background(), client.ObjectKeyFromObject(tt.IP), tt.IP)
 			}).Should(And(HavePhase(operatorsv1alpha1.InstallPlanPhaseInstalling)), HaveMessage(tt.errMessage))
 
 			// Eventually the IP fails with the GVK missing error, after installplan retries, which is by default 1 minute.
 			Eventually(func() (*operatorsv1alpha1.InstallPlan, error) {
-				return tt.ip, ctx.Ctx().Client().Get(context.Background(), client.ObjectKeyFromObject(tt.ip), tt.ip)
+				return tt.IP, ctx.Ctx().Client().Get(context.Background(), client.ObjectKeyFromObject(tt.IP), tt.IP)
 			}, 2*time.Minute).Should(And(HavePhase(operatorsv1alpha1.InstallPlanPhaseFailed)), HaveMessage(tt.errMessage))
 		}, tableEntries...)
 	})