Merge branch 'main' into refactor/split-file

zarf-dev · Jul 10, 2024 · 6f6dee2 · 6f6dee2
2 parents f5ed02c + ecdac0b
commit 6f6dee2
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 26 deletions.
diff --git a/src/pkg/cluster/namespace.go b/src/pkg/cluster/namespace.go
@@ -67,6 +67,5 @@ func AdoptZarfManagedLabels(labels map[string]string) map[string]string {
 		labels = make(map[string]string)
 	}
 	labels[ZarfManagedByLabel] = "zarf"
-	delete(labels, AgentLabel)
 	return labels
 }
diff --git a/src/pkg/cluster/namespace_test.go b/src/pkg/cluster/namespace_test.go
diff --git a/src/test/e2e/main_test.go b/src/test/e2e/main_test.go
@@ -38,6 +38,7 @@ func TestMain(m *testing.M) {
 	e2e.ZarfBinPath = filepath.Join("build", test.GetCLIName())
 	e2e.ApplianceMode = os.Getenv(applianceModeEnvVar) == "true"
 	e2e.ApplianceModeKeep = os.Getenv(applianceModeKeepEnvVar) == "true"
+	e2e.RunClusterTests = true
 
 	message.SetLogLevel(message.TraceLevel)