test: Remove NodeCleanMetadata

This seems useless and only prolongs test duration

Signed-off-by: Thomas Graf <thomas@cilium.io>

test/helpers/kubectl.go

@@ -30,7 +30,6 @@ import (
 	"time"
 
 	"github.com/cilium/cilium/api/v1/models"
-	"github.com/cilium/cilium/pkg/annotation"
 	cnpv2 "github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2"
 	"github.com/cilium/cilium/test/config"
 	ginkgoext "github.com/cilium/cilium/test/ginkgo-ext"
@@ -1038,27 +1037,6 @@ func (kub *Kubectl) PprofReport() {
 	}
 }
 
-// NodeCleanMetadata annotates each node in the Kubernetes cluster with the
-// annotation.V4CIDRName and annotation.V6CIDRName annotations. It returns an
-// error if the nodes cannot be retrieved via the Kubernetes API.
-func (kub *Kubectl) NodeCleanMetadata() error {
-	metadata := []string{
-		annotation.V4CIDRName,
-		annotation.V6CIDRName,
-	}
-
-	data := kub.ExecShort(fmt.Sprintf("%s get nodes -o jsonpath='{.items[*].metadata.name}'", KubectlCmd))
-	if !data.WasSuccessful() {
-		return fmt.Errorf("could not get nodes via %s: %s", KubectlCmd, data.CombineOutput())
-	}
-	for _, node := range strings.Split(data.Output().String(), " ") {
-		for _, label := range metadata {
-			kub.ExecShort(fmt.Sprintf("%s annotate --overwrite nodes %s %s=''", KubectlCmd, node, label))
-		}
-	}
-	return nil
-}
-
 // NamespaceCreate creates a new Kubernetes namespace with the given name
 func (kub *Kubectl) NamespaceCreate(name string) *CmdRes {
 	ginkgoext.By("Creating namespace %s", name)

test/k8sT/Conformance.go

@@ -32,10 +32,6 @@ var _ = Describe("K8sConformance", func() {
 		ciliumFilename = helpers.TimestampFilename("cilium.yaml")
 	})
 
-	BeforeEach(func() {
-		kubectl.NodeCleanMetadata()
-	})
-
 	AfterEach(func() {
 		kubectl.Delete(connectivityCheckYaml)
 		kubectl.DeleteCiliumDS()

test/k8sT/DatapathConfiguration.go

@@ -50,10 +50,6 @@ var _ = Describe("K8sDatapathConfig", func() {
 		Expect(err).Should(BeNil(), "Cannot determine default iface")
 	})
 
-	BeforeEach(func() {
-		kubectl.NodeCleanMetadata()
-	})
-
 	AfterEach(func() {
 		deploymentManager.DeleteAll()
 		// FIXME(tgraf) Is this really needed?

test/k8sT/Identity.go

@@ -32,10 +32,6 @@ var _ = Describe("K8sIdentity", func() {
 		ciliumFilename = helpers.TimestampFilename("cilium.yaml")
 	})
 
-	BeforeEach(func() {
-		kubectl.NodeCleanMetadata()
-	})
-
 	AfterEach(func() {
 		kubectl.DeleteCiliumDS()
 		ExpectAllPodsTerminated(kubectl)