setup OTE freamwork and migration one case from openshift-tests-private repo

Signed-off-by: zhaozhanqi <zzhao@redhat.com>

Author: zhaozhanqi

Dockerfile

@@ -1,12 +1,13 @@
 FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21 AS builder
 WORKDIR /go/src/github.com/openshift/cluster-network-operator
 COPY . .
-RUN hack/build-go.sh
+RUN hack/build-go.sh && make build-e2e-tests && gzip -9 test/bin/cluster-network-operator-tests-ext
 
 FROM registry.ci.openshift.org/ocp/4.21:base-rhel9
 COPY --from=builder  /go/src/github.com/openshift/cluster-network-operator/cluster-network-operator /usr/bin/
 COPY --from=builder  /go/src/github.com/openshift/cluster-network-operator/cluster-network-check-endpoints /usr/bin/
 COPY --from=builder  /go/src/github.com/openshift/cluster-network-operator/cluster-network-check-target /usr/bin/
+COPY --from=builder  /go/src/github.com/openshift/cluster-network-operator/test/bin/cluster-network-operator-tests-ext.gz /usr/bin/cluster-network-operator-tests-ext.gz
 
 COPY manifests /manifests
 COPY bindata /bindata

Makefile

@@ -46,4 +46,10 @@ clean:
 	$(RM) cluster-network-operator cluster-network-check-endpoints cluster-network-check-target
 .PHONY: clean
 
+# Build the e2e test binary
+.PHONY: build-e2e-tests
+build-e2e-tests:
+	@echo "Building cluster-network-operator-tests-ext binary..."
+	$(MAKE) -C test build
+
 GO_TEST_PACKAGES :=./pkg/... ./cmd/...

go.mod

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.19.0
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
   name: operatorpkis.network.operator.openshift.io

go.sum

@@ -445,7 +445,6 @@ clusterNetworks:
 hostsubnetlength: 9
 kind: ClusterNetwork
 metadata:
-  creationTimestamp: null
   name: default
 mtu: 1450
 network: 10.128.0.0/15

manifests/0000_70_cluster-network-operator_01_pki_crd.yaml

@@ -0,0 +1,45 @@
+# Makefile for CNO E2E Test
+
+# Binary name
+BINARY_NAME := cluster-network-operator-tests-ext
+
+# Build directory
+BUILD_DIR := bin
+
+# Go module and package
+GO_MODULE := github.com/openshift/cluster-network-operator
+
+# Version information
+GIT_COMMIT := $(shell git rev-parse --short HEAD 2>/dev/null || echo "unknown")
+BUILD_DATE := $(shell date -u +'%Y-%m-%dT%H:%M:%SZ')
+
+# Go build flags
+LDFLAGS := -X '$(GO_MODULE)/pkg/version.commitFromGit=$(GIT_COMMIT)' \
+           -X '$(GO_MODULE)/pkg/version.buildDate=$(BUILD_DATE)' \
+           -X '$(GO_MODULE)/pkg/version.versionFromGit=$(GIT_COMMIT)'
+
+# Default target
+.PHONY: all
+all: build
+
+# Build the binary
+.PHONY: build
+build:
+	@echo "Building $(BINARY_NAME)..."
+	@mkdir -p $(BUILD_DIR)
+	cd cmd && go build -o ../$(BUILD_DIR)/$(BINARY_NAME) -ldflags="$(LDFLAGS)" .
+
+# Build for Linux (useful for container builds)
+.PHONY: build-linux
+build-linux:
+	@echo "Building $(BINARY_NAME) for Linux..."
+	@mkdir -p $(BUILD_DIR)
+	cd cmd && CGO_ENABLED=0 GOOS=linux GOARCH=amd64 \
+		go build -o ../$(BUILD_DIR)/$(BINARY_NAME)-linux-amd64 -ldflags="$(LDFLAGS)" .
+
+# Clean build artifacts
+.PHONY: clean
+clean:
+	@echo "Cleaning build artifacts..."
+	rm -rf $(BUILD_DIR)
+

pkg/network/openshift_sdn_test.go

@@ -0,0 +1,50 @@
+package main
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/openshift-eng/openshift-tests-extension/pkg/cmd"
+
+	"github.com/spf13/cobra"
+
+	e "github.com/openshift-eng/openshift-tests-extension/pkg/extension"
+	g "github.com/openshift-eng/openshift-tests-extension/pkg/ginkgo"
+
+	_ "github.com/openshift/cluster-network-operator/test/e2e"
+)
+
+func main() {
+	registry := e.NewRegistry()
+
+	// Tests should only be run as part of or via openshift-tests, running tests via the extension is not supported.
+	ext := e.NewExtension("openshift", "payload", "cluster-network-operator")
+	ext.AddSuite(e.Suite{
+		Name: "openshift/cluster-network-operator/conformance/parallel",
+		Parents: []string{
+			"openshift/conformance/parallel",
+		},
+		Qualifiers: []string{
+			"name.contains('[Suite:openshift/cluster-network-operator/conformance/parallel')",
+		},
+	})
+
+	specs, err := g.BuildExtensionTestSpecsFromOpenShiftGinkgoSuite()
+	if err != nil {
+		panic(fmt.Sprintf("couldn't build extension test specs from ginkgo: %+v", err.Error()))
+	}
+
+	ext.AddSpecs(specs)
+	registry.Register(ext)
+
+	root := &cobra.Command{
+		Long: "OpenShift Tests Extension for Cluster Network Operator",
+	}
+	root.AddCommand(cmd.DefaultExtensionCommands(registry)...)
+
+	if err := func() error {
+		return root.Execute()
+	}(); err != nil {
+		os.Exit(1)
+	}
+}

test/Makefile

@@ -0,0 +1,118 @@
+package e2e
+
+import (
+	"context"
+
+	g "github.com/onsi/ginkgo/v2"
+	o "github.com/onsi/gomega"
+
+	exutil "github.com/openshift/origin/test/extended/util"
+
+	admissionapi "k8s.io/pod-security-admission/api"
+
+	e2enode "k8s.io/kubernetes/test/e2e/framework/node"
+)
+
+var _ = g.Describe("[sig-network] CNO", func() {
+	defer g.GinkgoRecover()
+	oc := exutil.NewCLIWithPodSecurityLevel("networking-cno", admissionapi.LevelBaseline)
+
+	g.It("Author:anusaxen-High-73205-High-72817-Make sure internalJoinSubnet and internalTransitSwitchSubnet is configurable post install as a Day 2 operation [Disruptive]", func() {
+		var (
+			pod1Name          = "hello-pod1"
+			pod2Name          = "hello-pod2"
+			podLabel          = "hello-pod"
+			serviceName       = "test-service-73205"
+			servicePort       = 27017
+			serviceTargetPort = 8080
+		)
+		ipStackType := checkIPStackType(oc)
+		o.Expect(ipStackType).NotTo(o.BeEmpty())
+
+		nodeList, err := e2enode.GetReadySchedulableNodes(context.TODO(), oc.KubeFramework().ClientSet)
+		o.Expect(err).NotTo(o.HaveOccurred())
+		if len(nodeList.Items) < 2 {
+			g.Skip("This case requires 2 nodes, but the cluster has less than two nodes")
+		}
+
+		// Create hello-pod1 on the first node
+		createPingPodOnNode(oc, pod1Name, oc.Namespace(), podLabel, nodeList.Items[0].Name)
+
+		// Create hello-pod2 on the second node
+		createPingPodOnNode(oc, pod2Name, oc.Namespace(), podLabel, nodeList.Items[1].Name)
+
+		// Determine ipFamilyPolicy based on cluster type
+		var ipFamilyPolicy string
+		if ipStackType == "ipv4single" {
+			ipFamilyPolicy = "SingleStack"
+		} else {
+			ipFamilyPolicy = "PreferDualStack"
+		}
+		internalTrafficPolicy := "Cluster"
+		externalTrafficPolicy := ""
+		// Create service backing both pods
+		createGenericService(oc, serviceName, oc.Namespace(), "TCP", podLabel, "ClusterIP", ipFamilyPolicy, internalTrafficPolicy, externalTrafficPolicy, servicePort, serviceTargetPort)
+		//custom patches to test depending on type of cluster addressing
+		customPatchIPv4 := "{\"spec\":{\"defaultNetwork\":{\"ovnKubernetesConfig\":{\"ipv4\":{\"internalJoinSubnet\": \"100.99.0.0/16\",\"internalTransitSwitchSubnet\": \"100.69.0.0/16\"}}}}}"
+		customPatchIPv6 := "{\"spec\":{\"defaultNetwork\":{\"ovnKubernetesConfig\":{\"ipv6\":{\"internalJoinSubnet\": \"ab98::/64\",\"internalTransitSwitchSubnet\": \"ab97::/64\"}}}}}"
+		customPatchDualstack := "{\"spec\":{\"defaultNetwork\":{\"ovnKubernetesConfig\":{\"ipv4\":{\"internalJoinSubnet\": \"100.99.0.0/16\",\"internalTransitSwitchSubnet\": \"100.69.0.0/16\"},\"ipv6\": {\"internalJoinSubnet\": \"ab98::/64\",\"internalTransitSwitchSubnet\": \"ab97::/64\"}}}}}"
+
+		//gather original cluster values so that we can defer to them later once test done
+		currentinternalJoinSubnetIPv4Value, err := oc.AsAdmin().WithoutNamespace().Run("get").Args("Network.operator.openshift.io/cluster", "-o=jsonpath={.spec.defaultNetwork.ovnKubernetesConfig.ipv4.internalJoinSubnet}").Output()
+		o.Expect(err).NotTo(o.HaveOccurred())
+		currentinternalTransitSwSubnetIPv4Value, err := oc.AsAdmin().WithoutNamespace().Run("get").Args("Network.operator.openshift.io/cluster", "-o=jsonpath={.spec.defaultNetwork.ovnKubernetesConfig.ipv4.internalTransitSwitchSubnet}").Output()
+		o.Expect(err).NotTo(o.HaveOccurred())
+		currentinternalJoinSubnetIPv6Value, err := oc.AsAdmin().WithoutNamespace().Run("get").Args("Network.operator.openshift.io/cluster", "-o=jsonpath={.spec.defaultNetwork.ovnKubernetesConfig.ipv6.internalJoinSubnet}").Output()
+		o.Expect(err).NotTo(o.HaveOccurred())
+		currentinternalTransitSwSubnetIPv6Value, err := oc.AsAdmin().WithoutNamespace().Run("get").Args("Network.operator.openshift.io/cluster", "-o=jsonpath={.spec.defaultNetwork.ovnKubernetesConfig.ipv6.internalTransitSwitchSubnet}").Output()
+		o.Expect(err).NotTo(o.HaveOccurred())
+
+		//if any of value is null on exisiting cluster, it indicates that cluster came up with following default values assigned by OVNK
+		if currentinternalJoinSubnetIPv4Value == "" {
+			currentinternalJoinSubnetIPv4Value = "100.64.0.0/16"
+		}
+		if currentinternalJoinSubnetIPv6Value == "" {
+			currentinternalJoinSubnetIPv6Value = "fd98::/64"
+		}
+		if currentinternalTransitSwSubnetIPv4Value == "" {
+			currentinternalTransitSwSubnetIPv4Value = "100.88.0.0/16"
+		}
+		if currentinternalTransitSwSubnetIPv6Value == "" {
+			currentinternalTransitSwSubnetIPv6Value = "fd97::/64"
+		}
+
+		//vars to patch cluster back to original state
+		patchIPv4original := "{\"spec\":{\"defaultNetwork\":{\"ovnKubernetesConfig\":{\"ipv4\":{\"internalJoinSubnet\": \"" + currentinternalJoinSubnetIPv4Value + "\",\"internalTransitSwitchSubnet\": \"" + currentinternalTransitSwSubnetIPv4Value + "\"}}}}}"
+		patchIPv6original := "{\"spec\":{\"defaultNetwork\":{\"ovnKubernetesConfig\":{\"ipv6\":{\"internalJoinSubnet\": \"" + currentinternalJoinSubnetIPv6Value + "\",\"internalTransitSwitchSubnet\": \"" + currentinternalTransitSwSubnetIPv6Value + "\"}}}}}"
+		patchDualstackoriginal := "{\"spec\":{\"defaultNetwork\":{\"ovnKubernetesConfig\":{\"ipv4\":{\"internalJoinSubnet\": \"" + currentinternalJoinSubnetIPv4Value + "\",\"internalTransitSwitchSubnet\": \"" + currentinternalTransitSwSubnetIPv4Value + "\"},\"ipv6\": {\"internalJoinSubnet\": \"" + currentinternalJoinSubnetIPv6Value + "\",\"internalTransitSwitchSubnet\": \"" + currentinternalTransitSwSubnetIPv6Value + "\"}}}}}"
+
+		switch ipStackType {
+		case "ipv4single":
+			defer func() {
+				patchResourceAsAdmin(oc, "Network.operator.openshift.io/cluster", patchIPv4original)
+				err := checkOVNKState(oc)
+				o.Expect(err).NotTo(o.HaveOccurred(), "OVNkube didn't trigger or rolled out successfully post oc patch")
+			}()
+			patchResourceAsAdmin(oc, "Network.operator.openshift.io/cluster", customPatchIPv4)
+		case "ipv6single":
+			defer func() {
+				patchResourceAsAdmin(oc, "Network.operator.openshift.io/cluster", patchIPv6original)
+				err := checkOVNKState(oc)
+				o.Expect(err).NotTo(o.HaveOccurred(), "OVNkube didn't trigger or rolled out successfully post oc patch")
+			}()
+			patchResourceAsAdmin(oc, "Network.operator.openshift.io/cluster", customPatchIPv6)
+		default:
+			defer func() {
+				patchResourceAsAdmin(oc, "Network.operator.openshift.io/cluster", patchDualstackoriginal)
+				err := checkOVNKState(oc)
+				o.Expect(err).NotTo(o.HaveOccurred(), "OVNkube didn't trigger or rolled out successfully post oc patch")
+			}()
+			patchResourceAsAdmin(oc, "Network.operator.openshift.io/cluster", customPatchDualstack)
+		}
+		err = checkOVNKState(oc)
+		o.Expect(err).NotTo(o.HaveOccurred(), "OVNkube never trigger or rolled out successfully post oc patch")
+		//check usual svc and pod connectivities post migration which also ensures disruption doesn't last post successful rollout
+		curlPod2PodPass(oc, oc.Namespace(), pod1Name, oc.Namespace(), pod2Name, serviceTargetPort)
+		curlPod2SvcPass(oc, oc.Namespace(), oc.Namespace(), pod1Name, serviceName, servicePort)
+	})
+})