Move the kubernetes items to its own module, import that module only …

…by metricbeat.

dev-tools/mage/gotest.go

@@ -156,8 +156,7 @@ func GoTestIntegrationForModule(ctx context.Context) error {
 		foundModule = true
 
 		// Set MODULE because only want that modules tests to run inside the testing environment.
-		os.Setenv("MODULE", fi.Name())
-		runners, err := NewIntegrationRunners(path.Join("./module", fi.Name()))
+		runners, err := NewIntegrationRunners(path.Join("./module", fi.Name()), map[string]string{"MODULE": fi.Name()})
 		if err != nil {
 			return errors.Wrapf(err, "test setup failed for module %s", fi.Name())
 		}

dev-tools/mage/integtest.go

@@ -156,7 +156,7 @@ type IntegrationRunner struct {
 type IntegrationRunners []*IntegrationRunner
 
 // NewIntegrationRunners returns the integration test runners discovered from the provided path.
-func NewIntegrationRunners(path string, passThroughEnvVars ...string) (IntegrationRunners, error) {
+func NewIntegrationRunners(path string, passInEnv map[string]string) (IntegrationRunners, error) {
 	cwd, err := os.Getwd()
 	if err != nil {
 		return nil, err
@@ -195,11 +195,12 @@ func NewIntegrationRunners(path string, passThroughEnvVars ...string) (Integrati
 			runnerSteps = append(runnerSteps, steps...)
 
 			// Create the custom env for the runner.
-			env := map[string]string{
-				insideIntegrationTestEnvVar: "true",
+			env := map[string]string{}
+			for k, v := range passInEnv {
+				env[k] = v
 			}
+			env[insideIntegrationTestEnvVar] = "true"
 			passThroughEnvs(env, defaultPassthroughEnvVars...)
-			passThroughEnvs(env, passThroughEnvVars...)
 			if mg.Verbose() {
 				env["MAGEFILE_VERBOSE"] = "1"
 			}

dev-tools/mage/integtest_kind.go → dev-tools/mage/kubernetes/kind.go

@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package mage
+package kubernetes
 
 import (
 	"fmt"