Revert "update"

This reverts commit dd0fd60.

e2e/Makefile

@@ -121,6 +121,7 @@ launch-rook-ceph: create-loop-dev
 	$(KUBECTL) apply -f testdata/operator.yaml
 	sed -e "s%LOOP_DEV%$(LOOP_DEV)%" -e "s%NODE_NAME%$(NODE_NAME)%" testdata/cluster-template.yaml > testdata/cluster.yaml
 	$(KUBECTL) apply -f testdata/cluster.yaml
+	$(KUBECTL) apply -f testdata/toolbox.yaml
 
 .PHONY: delete-rook-ceph
 delete-rook-ceph:

e2e/suite_test.go

@@ -20,9 +20,6 @@ import (
 )
 
 var (
-	//go:embed testdata/toolbox-template.yaml
-	testToolboxTemplate string
-
 	//go:embed testdata/pvc-template.yaml
 	testPVCTemplate string
 
@@ -81,11 +78,6 @@ func TestMtest(t *testing.T) {
 }
 
 var _ = BeforeSuite(func() {
-	By("[BeforeSuite] Deploying toolbox pod")
-	manifest := fmt.Sprintf(testToolboxTemplate, namespace)
-	_, _, err := kubectlWithInput([]byte(manifest), "apply", "-f", "-")
-	Expect(err).NotTo(HaveOccurred())
-
 	By("[BeforeSuite] Waiting for rook to get ready")
 	Eventually(func() error {
 		stdout, stderr, err := kubectl("-n", namespace, "get", "deploy", "rook-ceph-operator", "-o", "json")

e2e/testdata/toolbox-template.yaml → e2e/testdata/toolbox.yaml

@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: rook-ceph-tools
-  namespace: %s
+  namespace: rook-ceph # namespace:cluster
   labels:
     app: rook-ceph-tools
 spec: