From 5ea03f5b70b4e208856f1d40902e10847387940d Mon Sep 17 00:00:00 2001 From: Jordan Keister Date: Tue, 12 Nov 2024 16:09:32 -0600 Subject: [PATCH] =?UTF-8?q?this=20fixes=20two=20issues=20made=20manifest?= =?UTF-8?q?=20in=20testing=20the=20upgrade-e2e=20case=20subsequent=20to=20?= =?UTF-8?q?cutting=20the=20new=20RC.=201.=20[here](https://github.com/oper?= =?UTF-8?q?ator-framework/catalogd/commit/2f96c573d5a8e5197c53f8219f1e32a2?= =?UTF-8?q?4d8d4b8a#diff-b104edd120983248771684630cd3f66af28359c829df801a5?= =?UTF-8?q?eea77845d459aa0R33)=20an=20accidental=20label=20change=20in=20t?= =?UTF-8?q?he=20v1=20api=20promotion=202.=20[here](https://github.com/oper?= =?UTF-8?q?ator-framework/catalogd/commit/2f96c573d5a8e5197c53f8219f1e32a2?= =?UTF-8?q?4d8d4b8a#diff-b104edd120983248771684630cd3f66af28359c829df801a5?= =?UTF-8?q?eea77845d459aa0R69)=20a=20location=20which=20I=20failed=20to=20?= =?UTF-8?q?update=20for=20the=20new=20Progressing=3D=3DTrue=20logic=20for?= =?UTF-8?q?=20happy=20path=20clustercatalog=20unpacking.=20=20This=20was?= =?UTF-8?q?=20masked=20due=20to=20the=20fact=20that=20we=20knew=20we=20wer?= =?UTF-8?q?e=20making=20breaking=20changes,=20and=20the=20upgrade-e2e=20te?= =?UTF-8?q?st=20will=20fail=20until=20we=20have=20cut=20a=20new=20release.?= =?UTF-8?q?=20=20=F0=9F=98=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jordan Keister --- test/upgrade/unpack_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/upgrade/unpack_test.go b/test/upgrade/unpack_test.go index 39f37df2..150d0f9f 100644 --- a/test/upgrade/unpack_test.go +++ b/test/upgrade/unpack_test.go @@ -30,7 +30,7 @@ var _ = Describe("ClusterCatalog Unpacking", func() { ctx := context.Background() var managerDeployment appsv1.Deployment - managerLabelSelector := labels.Set{"control-plane": "catalogdv1-controller-manager"} + managerLabelSelector := labels.Set{"control-plane": "catalogd-controller-manager"} By("Checking that the controller-manager deployment is updated") Eventually(func(g Gomega) { var managerDeployments appsv1.DeploymentList @@ -66,13 +66,13 @@ var _ = Describe("ClusterCatalog Unpacking", func() { Expect(found).To(BeTrue()) catalog := &catalogdv1.ClusterCatalog{} - By("Ensuring ClusterCatalog has Status.Condition of Progressing with a status == False, reason == Succeeded") + By("Ensuring ClusterCatalog has Status.Condition of Progressing with a status == True, reason == Succeeded") Eventually(func(g Gomega) { err := c.Get(ctx, types.NamespacedName{Name: testClusterCatalogName}, catalog) g.Expect(err).ToNot(HaveOccurred()) cond := meta.FindStatusCondition(catalog.Status.Conditions, catalogdv1.TypeProgressing) g.Expect(cond).ToNot(BeNil()) - g.Expect(cond.Status).To(Equal(metav1.ConditionFalse)) + g.Expect(cond.Status).To(Equal(metav1.ConditionTrue)) g.Expect(cond.Reason).To(Equal(catalogdv1.ReasonSucceeded)) }).Should(Succeed())