From 33f134a87980242404cb254c8e173dc42bc9123d Mon Sep 17 00:00:00 2001
From: Marcin Owsiany <porridge@redhat.com>
Date: Wed, 4 Mar 2026 09:57:43 +0100
Subject: [PATCH] chore(operator): simplify deploy-via-chart

---
 operator/Makefile | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/operator/Makefile b/operator/Makefile
index f5b4598179a83..17d24743f49ae 100644
--- a/operator/Makefile
+++ b/operator/Makefile
@@ -412,17 +412,6 @@ deploy-previous-via-olm: kuttl bundle-post-process ## Deploy replaced version of
 .PHONY: deploy-via-installer
 deploy-via-installer: ## Deploy current version of operator via distribution manifest file.
 	./hack/retry-kubectl.sh </dev/null apply -f dist/install.yaml
-	$(MAKE) babysit-deployment
-
-.PHONY: deploy-via-chart
-deploy-via-chart: ## Deploy current version of operator via helm chart produced by the chart target.
-	helm install --create-namespace --namespace $(TEST_NAMESPACE) rhacs-operator ./dist/chart
-# It would be nice to be able to just use `--wait --set manager.env.NO_PROXY=127.1.2.3/8' rather than the below,
-# but https://github.com/kubernetes-sigs/kubebuilder/issues/5485#issuecomment-3919321648 prevents that at the moment.
-	$(MAKE) babysit-deployment
-
-.PHONY: babysit-deployment
-babysit-deployment: ## Patch operator controller deployment as needed for the tests to pass, and wait until it's healthy.
 # A hack for the NO_PROXY assertions in the e2e tests.
 	./hack/retry-kubectl.sh </dev/null set env -n $(TEST_NAMESPACE) deployment/rhacs-operator-controller-manager NO_PROXY=127.1.2.3/8
 # Need to hardcode the deployment name here and above, since kubectl barfs on the CRDs in the manifest when working on deployment:
@@ -432,6 +421,12 @@ babysit-deployment: ## Patch operator controller deployment as needed for the te
 # TODO(ROX-11901): work this around somehow to make it possible to deploy and e2e-test the community build
 	./hack/retry-kubectl.sh </dev/null rollout status deployment -n $(TEST_NAMESPACE) rhacs-operator-controller-manager --timeout=300s
 
+.PHONY: deploy-via-chart
+deploy-via-chart: ## Deploy current version of operator via helm chart produced by the chart target.
+	helm install --create-namespace --namespace $(TEST_NAMESPACE) --wait \
+		--set manager.envOverrides.NO_PROXY=127.1.2.3/8 `# A hack for the NO_PROXY assertions in the e2e tests.` \
+		rhacs-operator ./dist/chart
+
 .PHONY: upgrade-via-olm
 upgrade-via-olm: kuttl
 	KUTTL=$(KUTTL) PATH="$(PROJECT_DIR)/hack:$${PATH}" ./hack/olm-operator-upgrade.sh $(TEST_NAMESPACE) $(INSTALL_VERSION)