Skip to content

OCPBUGS-42609: Updates UDN tests with required NS label #29417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Jan 22, 2025
Merged

OCPBUGS-42609: Updates UDN tests with required NS label #29417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions test/extended/networking/livemigration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,10 @@ import (
)

var _ = Describe("[sig-network][OCPFeatureGate:PersistentIPsForVirtualization][Feature:Layer2LiveMigration] Kubevirt Virtual Machines", func() {
oc := exutil.NewCLIWithPodSecurityLevel("network-segmentation-e2e", admissionapi.LevelBaseline)
// disable automatic namespace creation, we need to add the required UDN label
oc := exutil.NewCLIWithoutNamespace("network-segmentation-e2e")
f := oc.KubeFramework()
f.NamespacePodSecurityLevel = admissionapi.LevelBaseline

InOVNKubernetesContext(func() {
var (
Expand Down Expand Up @@ -68,6 +70,15 @@ var _ = Describe("[sig-network][OCPFeatureGate:PersistentIPsForVirtualization][F

DescribeTable("[Suite:openshift/network/virtualization] should keep ip", func(netConfig networkAttachmentConfigParams, vmResource string, opCmd func(cli *kubevirt.Client, vmNamespace, vmName string)) {
var err error
l := map[string]string{
"e2e-framework": f.BaseName,
}
if netConfig.role == "primary" {
l[RequiredUDNNamespaceLabel] = ""
}
ns, err := f.CreateNamespace(context.TODO(), f.BaseName, l)
Copy link
Contributor

@kyrtapz kyrtapz Jan 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

origin/test/extended/util/client.go

Line 426 in 4783356

func (c *CLI) setupNamespace() string {
this does a bunch more than just creating the namespace, I am wondering if the current approach could cause significant delays in pod creation for our tests. I am ok to keep it as is and see if there are no issues in the presubmits.

Expect(err).NotTo(HaveOccurred())
f.Namespace = ns
netConfig.namespace = f.Namespace.Name
// correctCIDRFamily makes use of the ginkgo framework so it needs to be in the testcase
netConfig.cidr = correctCIDRFamily(oc, cidrIPv4, cidrIPv6)
Expand Down Expand Up @@ -240,8 +251,10 @@ var _ = Describe("[sig-network][OCPFeatureGate:PersistentIPsForVirtualization][F
})

var _ = Describe("[sig-network][Feature:Layer2LiveMigration][OCPFeatureGate:NetworkSegmentation][Suite:openshift/network/virtualization] primary UDN smoke test", func() {
oc := exutil.NewCLIWithPodSecurityLevel("network-segmentation-e2e", admissionapi.LevelBaseline)
// disable automatic namespace creation, we need to add the required UDN label
oc := exutil.NewCLIWithoutNamespace("network-segmentation-e2e")
f := oc.KubeFramework()
f.NamespacePodSecurityLevel = admissionapi.LevelBaseline

const (
nadName = "blue"
Expand All @@ -258,7 +271,11 @@ var _ = Describe("[sig-network][Feature:Layer2LiveMigration][OCPFeatureGate:Netw
BeforeEach(func() {
cs = f.ClientSet

var err error
ns, err := f.CreateNamespace(context.TODO(), f.BaseName, map[string]string{
"e2e-framework": f.BaseName,
RequiredUDNNamespaceLabel: "",
})
f.Namespace = ns
nadClient, err = nadclient.NewForConfig(f.ClientConfig())
Expect(err).NotTo(HaveOccurred())
})
Expand Down
112 changes: 100 additions & 12 deletions test/extended/networking/network_segmentation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import (
)

const openDefaultPortsAnnotation = "k8s.ovn.org/open-default-ports"
const RequiredUDNNamespaceLabel = "k8s.ovn.org/primary-user-defined-network"

// NOTE: We are observing pod creation requests taking more than two minutes t
// reach the CNI for the CNI to do the necessary plumbing. This is causing tests
Expand All @@ -63,8 +64,10 @@ var _ = Describe("[sig-network][OCPFeatureGate:NetworkSegmentation][Feature:User
// TODO: so far, only the isolation tests actually require this PSA ... Feels wrong to run everything priviliged.
// I've tried to have multiple kubeframeworks (from multiple OCs) running (with different project names) but
// it didn't work.
oc := exutil.NewCLIWithPodSecurityLevel("network-segmentation-e2e", admissionapi.LevelPrivileged)
// disable automatic namespace creation, we need to add the required UDN label
oc := exutil.NewCLIWithoutNamespace("network-segmentation-e2e")
f := oc.KubeFramework()
f.NamespacePodSecurityLevel = admissionapi.LevelPrivileged

InOVNKubernetesContext(func() {
const (
Expand Down Expand Up @@ -102,6 +105,15 @@ var _ = Describe("[sig-network][OCPFeatureGate:NetworkSegmentation][Feature:User
serverPodConfig podConfiguration,
) {
var err error
l := map[string]string{
"e2e-framework": f.BaseName,
}
if netConfig.role == "primary" {
l[RequiredUDNNamespaceLabel] = ""
}
ns, err := f.CreateNamespace(context.TODO(), f.BaseName, l)
Expect(err).NotTo(HaveOccurred())
f.Namespace = ns

netConfig.namespace = f.Namespace.Name
// correctCIDRFamily makes use of the ginkgo framework so it needs to be in the testcase
Expand Down Expand Up @@ -143,7 +155,7 @@ var _ = Describe("[sig-network][OCPFeatureGate:NetworkSegmentation][Feature:User
}

By("asserting the *client* pod can contact the server pod exposed endpoint")
podShouldReach(oc, clientPodConfig.name, formatHostAndPort(net.ParseIP(serverIP), port))
namespacePodShouldReach(oc, f.Namespace.Name, clientPodConfig.name, formatHostAndPort(net.ParseIP(serverIP), port))
}
},
Entry(
Expand Down Expand Up @@ -182,9 +194,18 @@ var _ = Describe("[sig-network][OCPFeatureGate:NetworkSegmentation][Feature:User
netConfigParams *networkAttachmentConfigParams,
udnPodConfig podConfiguration,
) {
l := map[string]string{
"e2e-framework": f.BaseName,
}
if netConfigParams.role == "primary" {
l[RequiredUDNNamespaceLabel] = ""
}
ns, err := f.CreateNamespace(context.TODO(), f.BaseName, l)
Expect(err).NotTo(HaveOccurred())
f.Namespace = ns
By("Creating second namespace for default network pods")
defaultNetNamespace := f.Namespace.Name + "-default"
_, err := cs.CoreV1().Namespaces().Create(context.Background(), &v1.Namespace{
_, err = cs.CoreV1().Namespaces().Create(context.Background(), &v1.Namespace{
ObjectMeta: metav1.ObjectMeta{
Name: defaultNetNamespace,
},
Expand Down Expand Up @@ -409,7 +430,13 @@ var _ = Describe("[sig-network][OCPFeatureGate:NetworkSegmentation][Feature:User
userDefinedv6Subnet string,

) {

l := map[string]string{
"e2e-framework": f.BaseName,
RequiredUDNNamespaceLabel: "",
}
ns, err := f.CreateNamespace(context.TODO(), f.BaseName, l)
Expect(err).NotTo(HaveOccurred())
f.Namespace = ns
red := "red"
blue := "blue"

Expand All @@ -420,7 +447,8 @@ var _ = Describe("[sig-network][OCPFeatureGate:NetworkSegmentation][Feature:User
By("Creating namespace " + namespace)
_, err := cs.CoreV1().Namespaces().Create(context.Background(), &v1.Namespace{
ObjectMeta: metav1.ObjectMeta{
Name: namespace,
Name: namespace,
Labels: l,
},
}, metav1.CreateOptions{})
Expect(err).NotTo(HaveOccurred())
Expand Down Expand Up @@ -621,6 +649,12 @@ var _ = Describe("[sig-network][OCPFeatureGate:NetworkSegmentation][Feature:User
)

BeforeEach(func() {
namespace, err := f.CreateNamespace(context.TODO(), f.BaseName, map[string]string{
"e2e-framework": f.BaseName,
})
Expect(err).NotTo(HaveOccurred())
f.Namespace = namespace

By("create tests UserDefinedNetwork")
cleanup, err := createManifest(f.Namespace.Name, newUserDefinedNetworkManifest(testUdnName))
DeferCleanup(cleanup)
Expand Down Expand Up @@ -718,6 +752,14 @@ var _ = Describe("[sig-network][OCPFeatureGate:NetworkSegmentation][Feature:User
primaryUdnName = "primary-net"
)

l := map[string]string{
"e2e-framework": f.BaseName,
RequiredUDNNamespaceLabel: "",
}
ns, err := f.CreateNamespace(context.TODO(), f.BaseName, l)
Expect(err).NotTo(HaveOccurred())
f.Namespace = ns

By("create primary network NetworkAttachmentDefinition")
primaryNetNad := generateNAD(newNetworkAttachmentConfig(networkAttachmentConfigParams{
role: "primary",
Expand All @@ -726,7 +768,7 @@ var _ = Describe("[sig-network][OCPFeatureGate:NetworkSegmentation][Feature:User
networkName: primaryNadName,
cidr: correctCIDRFamily(oc, userDefinedNetworkIPv4Subnet, userDefinedNetworkIPv6Subnet),
}))
_, err := nadClient.NetworkAttachmentDefinitions(f.Namespace.Name).Create(context.Background(), primaryNetNad, metav1.CreateOptions{})
_, err = nadClient.NetworkAttachmentDefinitions(f.Namespace.Name).Create(context.Background(), primaryNetNad, metav1.CreateOptions{})
Expect(err).NotTo(HaveOccurred())

By("create primary network UserDefinedNetwork")
Expand Down Expand Up @@ -761,22 +803,43 @@ var _ = Describe("[sig-network][OCPFeatureGate:NetworkSegmentation][Feature:User
const clusterUserDefinedNetworkResource = "clusteruserdefinednetwork"

var testTenantNamespaces []string
var defaultNetNamespace *v1.Namespace

BeforeEach(func() {
namespace, err := f.CreateNamespace(context.TODO(), f.BaseName, map[string]string{
"e2e-framework": f.BaseName,
RequiredUDNNamespaceLabel: "",
})
f.Namespace = namespace
Expect(err).NotTo(HaveOccurred())
testTenantNamespaces = []string{
f.Namespace.Name + "blue",
f.Namespace.Name + "red",
}

By("Creating test tenants namespaces")
for _, nsName := range testTenantNamespaces {
_, err := cs.CoreV1().Namespaces().Create(context.Background(), &v1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: nsName}}, metav1.CreateOptions{})
_, err := cs.CoreV1().Namespaces().Create(context.Background(), &v1.Namespace{
ObjectMeta: metav1.ObjectMeta{
Name: nsName,
Labels: map[string]string{RequiredUDNNamespaceLabel: ""},
}}, metav1.CreateOptions{})
Expect(err).NotTo(HaveOccurred())
DeferCleanup(func() error {
err := cs.CoreV1().Namespaces().Delete(context.Background(), nsName, metav1.DeleteOptions{})
return err
})
}
// default cluster network namespace, for use when only testing secondary UDNs/NADs
defaultNetNamespace = &v1.Namespace{
ObjectMeta: metav1.ObjectMeta{
Name: f.Namespace.Name + "-default",
},
}
f.AddNamespacesToDelete(defaultNetNamespace)
_, err = cs.CoreV1().Namespaces().Create(context.Background(), defaultNetNamespace, metav1.CreateOptions{})
Expect(err).NotTo(HaveOccurred())
testTenantNamespaces = append(testTenantNamespaces, defaultNetNamespace.Name)
})

var testClusterUdnName string
Expand Down Expand Up @@ -841,7 +904,11 @@ var _ = Describe("[sig-network][OCPFeatureGate:NetworkSegmentation][Feature:User
1*time.Minute, 3*time.Second).Should(Succeed())

By("create the new target namespace")
_, err = cs.CoreV1().Namespaces().Create(context.Background(), &v1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: testNewNs}}, metav1.CreateOptions{})
_, err = cs.CoreV1().Namespaces().Create(context.Background(), &v1.Namespace{
ObjectMeta: metav1.ObjectMeta{
Name: testNewNs,
Labels: map[string]string{RequiredUDNNamespaceLabel: ""},
}}, metav1.CreateOptions{})
Expect(err).NotTo(HaveOccurred())
DeferCleanup(func() error {
err := cs.CoreV1().Namespaces().Delete(context.Background(), testNewNs, metav1.DeleteOptions{})
Expand All @@ -866,7 +933,11 @@ var _ = Describe("[sig-network][OCPFeatureGate:NetworkSegmentation][Feature:User
testNewNs := f.Namespace.Name + "green"

By("create new namespace")
_, err := cs.CoreV1().Namespaces().Create(context.Background(), &v1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: testNewNs}}, metav1.CreateOptions{})
_, err := cs.CoreV1().Namespaces().Create(context.Background(), &v1.Namespace{
ObjectMeta: metav1.ObjectMeta{
Name: testNewNs,
Labels: map[string]string{RequiredUDNNamespaceLabel: ""},
}}, metav1.CreateOptions{})
Expect(err).NotTo(HaveOccurred())
DeferCleanup(func() error {
err := cs.CoreV1().Namespaces().Delete(context.Background(), testNewNs, metav1.DeleteOptions{})
Expand Down Expand Up @@ -926,7 +997,7 @@ var _ = Describe("[sig-network][OCPFeatureGate:NetworkSegmentation][Feature:User
)

BeforeEach(func() {
inUseNetTestTenantNamespace = testTenantNamespaces[0]
inUseNetTestTenantNamespace = defaultNetNamespace.Name

By("create pod in one of the test tenant namespaces")
networkAttachments := []nadapi.NetworkSelectionElement{
Expand Down Expand Up @@ -982,13 +1053,23 @@ var _ = Describe("[sig-network][OCPFeatureGate:NetworkSegmentation][Feature:User
})

It("when primary network exist, ClusterUserDefinedNetwork status should report not-ready", func() {
namespace, err := f.CreateNamespace(context.TODO(), f.BaseName, map[string]string{
"e2e-framework": f.BaseName,
RequiredUDNNamespaceLabel: "",
})
Expect(err).NotTo(HaveOccurred())
f.Namespace = namespace
testTenantNamespaces := []string{
f.Namespace.Name + "blue",
f.Namespace.Name + "red",
}
By("Creating test tenants namespaces")
for _, nsName := range testTenantNamespaces {
_, err := cs.CoreV1().Namespaces().Create(context.Background(), &v1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: nsName}}, metav1.CreateOptions{})
_, err := cs.CoreV1().Namespaces().Create(context.Background(), &v1.Namespace{
ObjectMeta: metav1.ObjectMeta{
Name: nsName,
Labels: map[string]string{RequiredUDNNamespaceLabel: ""},
}}, metav1.CreateOptions{})
Expect(err).NotTo(HaveOccurred())
DeferCleanup(func() error {
err := cs.CoreV1().Namespaces().Delete(context.Background(), nsName, metav1.DeleteOptions{})
Expand All @@ -1006,7 +1087,7 @@ var _ = Describe("[sig-network][OCPFeatureGate:NetworkSegmentation][Feature:User
networkName: primaryNadName,
cidr: correctCIDRFamily(oc, userDefinedNetworkIPv4Subnet, userDefinedNetworkIPv6Subnet),
}))
_, err := nadClient.NetworkAttachmentDefinitions(primaryNetTenantNs).Create(context.Background(), primaryNetNad, metav1.CreateOptions{})
_, err = nadClient.NetworkAttachmentDefinitions(primaryNetTenantNs).Create(context.Background(), primaryNetNad, metav1.CreateOptions{})
Expect(err).NotTo(HaveOccurred())

By("create primary Cluster UDN CR")
Expand Down Expand Up @@ -1051,6 +1132,13 @@ var _ = Describe("[sig-network][OCPFeatureGate:NetworkSegmentation][Feature:User
var udnPod *v1.Pod

BeforeEach(func() {
l := map[string]string{
"e2e-framework": f.BaseName,
RequiredUDNNamespaceLabel: "",
}
ns, err := f.CreateNamespace(context.TODO(), f.BaseName, l)
Expect(err).NotTo(HaveOccurred())
f.Namespace = ns
By("create tests UserDefinedNetwork")
cleanup, err := createManifest(f.Namespace.Name, newPrimaryUserDefinedNetworkManifest(oc, testUdnName))
DeferCleanup(cleanup)
Expand Down
Loading