From baae96c4fa83a70a37c272199375ef6eea46e84f Mon Sep 17 00:00:00 2001
From: Yuma Ogami <yuma-ogami@cybozu.co.jp>
Date: Wed, 13 Mar 2024 02:50:24 +0000
Subject: [PATCH] Revert "update"

This reverts commit dd0fd600669d1db6df21509a034d77db36da2ac2.
---
 e2e/Makefile                                         | 1 +
 e2e/suite_test.go                                    | 8 --------
 e2e/testdata/{toolbox-template.yaml => toolbox.yaml} | 2 +-
 3 files changed, 2 insertions(+), 9 deletions(-)
 rename e2e/testdata/{toolbox-template.yaml => toolbox.yaml} (98%)

diff --git a/e2e/Makefile b/e2e/Makefile
index 0dda4d89..d90cea23 100644
--- a/e2e/Makefile
+++ b/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:
diff --git a/e2e/suite_test.go b/e2e/suite_test.go
index e90c9e03..a92e69a0 100644
--- a/e2e/suite_test.go
+++ b/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")
diff --git a/e2e/testdata/toolbox-template.yaml b/e2e/testdata/toolbox.yaml
similarity index 98%
rename from e2e/testdata/toolbox-template.yaml
rename to e2e/testdata/toolbox.yaml
index 811f1ac8..d90bb52c 100644
--- a/e2e/testdata/toolbox-template.yaml
+++ b/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: