diff --git a/pkg/operator/controllers/muo/muo_controller_test.go b/pkg/operator/controllers/muo/muo_controller_test.go index 55c435f42bc..65378aea751 100644 --- a/pkg/operator/controllers/muo/muo_controller_test.go +++ b/pkg/operator/controllers/muo/muo_controller_test.go @@ -65,7 +65,7 @@ func TestMUOReconciler(t *testing.T) { }, mocks: func(md *mock_deployer.MockDeployer, cluster *arov1alpha1.Cluster) { expectedConfig := &config.MUODeploymentConfig{ - Pullspec: "acrtest.example.com/managed-upgrade-operator:aro-b4", + Pullspec: "acrtest.example.com/app-sre/managed-upgrade-operator:v0.1.952-44b631a", EnableConnected: false, } md.EXPECT().CreateOrUpdate(gomock.Any(), cluster, expectedConfig).Return(nil) diff --git a/pkg/util/version/const.go b/pkg/util/version/const.go index 5873769f764..ddf8eb3fe72 100644 --- a/pkg/util/version/const.go +++ b/pkg/util/version/const.go @@ -89,7 +89,7 @@ func MdsdImage(acrDomain string) string { // MUOImage contains the location of the Managed Upgrade Operator container image func MUOImage(acrDomain string) string { - return acrDomain + "/managed-upgrade-operator:aro-b4" + return acrDomain + "/app-sre/managed-upgrade-operator:v0.1.952-44b631a" } // GateKeeperImage contains the location of the GateKeeper container image diff --git a/test/e2e/operator.go b/test/e2e/operator.go index 7f74a6e167d..22bf2d1ea34 100644 --- a/test/e2e/operator.go +++ b/test/e2e/operator.go @@ -399,9 +399,9 @@ var _ = Describe("ARO Operator - MUO Deployment", func() { b, err := clients.Kubernetes.CoreV1().Pods(managedUpgradeOperatorNamespace).GetLogs(pods.Items[0].Name, &corev1.PodLogOptions{}).DoRaw(ctx) g.Expect(err).NotTo(HaveOccurred()) - g.Expect(string(b)).To(ContainSubstring(`msg="FIPS crypto mandated: true"`)) + g.Expect(string(b)).To(ContainSubstring(`X:boringcrypto,strictfipsruntime`)) }).WithContext(ctx).Should(Succeed()) - }) + }, SpecTimeout(2*time.Minute)) It("must be restored if deleted", func(ctx context.Context) { deleteMUODeployment := func(ctx context.Context) error { @@ -428,7 +428,7 @@ var _ = Describe("ARO Operator - MUO Deployment", func() { By("waiting for the MUO deployment to be reconciled") Eventually(muoDeploymentExists).WithContext(ctx).Should(Succeed()) - }) + }, SpecTimeout(2*time.Minute)) }) var _ = Describe("ARO Operator - ImageConfig Reconciler", func() {