wip

Signed-off-by: zhangzujian <[email protected]>

Author: zhangzujian

charts/kube-ovn/templates/kube-ovn-crd.yaml

@@ -2078,6 +2078,18 @@ spec:
                   type: string
                 sctpSessionLoadBalancer:
                   type: string
+                localTCPLoadBalancer:
+                  type: string
+                localTCPSessionLoadBalancer:
+                  type: string
+                localUDPLoadBalancer:
+                  type: string
+                localUDPSessionLoadBalancer:
+                  type: string
+                localSCTPLoadBalancer:
+                  type: string
+                localSCTPSessionLoadBalancer:
+                  type: string
                 bfdPort:
                   type: object
                   properties:

dist/images/install.sh

@@ -2329,6 +2329,18 @@ spec:
                   type: string
                 sctpSessionLoadBalancer:
                   type: string
+                localTCPLoadBalancer:
+                  type: string
+                localTCPSessionLoadBalancer:
+                  type: string
+                localUDPLoadBalancer:
+                  type: string
+                localUDPSessionLoadBalancer:
+                  type: string
+                localSCTPLoadBalancer:
+                  type: string
+                localSCTPSessionLoadBalancer:
+                  type: string
                 bfdPort:
                   type: object
                   properties:

e2e.mk

@@ -7,26 +7,39 @@ E2E_IP_FAMILY := $(shell echo $${E2E_IP_FAMILY:-ipv4})
 E2E_NETWORK_MODE := $(shell echo $${E2E_NETWORK_MODE:-overlay})
 E2E_CILIUM_CHAINING = $(shell echo $${E2E_CILIUM_CHAINING:-false})
 
-K8S_CONFORMANCE_E2E_FOCUS = "sig-network.*Conformance" "sig-network.*Feature:NoSNAT"
+K8S_CONFORMANCE_E2E_FOCUS = "sig-network.*Conformance" "sig-network.*Feature:NoSNAT" \
+	"should be updated after adding or deleting ports" \
+	"should preserve source pod IP for traffic thru service cluster IP" \
+	"should allow pods to hairpin back to themselves through services" \
+	"should be able to up and down services" \
+	"should work after the service has been recreated"
+
 K8S_CONFORMANCE_E2E_SKIP =
 K8S_NETPOL_E2E_FOCUS = "sig-network.*Feature:NetworkPolicy"
 K8S_NETPOL_E2E_SKIP = "sig-network.*NetworkPolicyLegacy"
 K8S_NETPOL_LEGACY_E2E_FOCUS = "sig-network.*NetworkPolicyLegacy"
 
 GINKGO_PARALLEL_MULTIPLIER = $(shell echo $${GINKGO_PARALLEL_MULTIPLIER:-2})
 
+VER_MAJOR = 999
+VER_MINOR = 999
 ifeq ($(shell echo $(E2E_BRANCH) | grep -o ^release-),release-)
 VERSION_NUM = $(subst release-,,$(E2E_BRANCH))
 VER_MAJOR = $(shell echo $(VERSION_NUM) | cut -f1 -d.)
 VER_MINOR = $(shell echo $(VERSION_NUM) | cut -f2 -d.)
+endif
+
 ifeq ($(shell test $(VER_MAJOR) -lt 1 -o \( $(VER_MAJOR) -eq 1 -a $(VER_MINOR) -lt 12 \) && echo true),true)
 K8S_CONFORMANCE_E2E_SKIP += "sig-network.*Services.*session affinity"
 K8S_CONFORMANCE_E2E_SKIP += "sig-network.*Feature:SCTPConnectivity"
 else
 K8S_CONFORMANCE_E2E_FOCUS += "sig-network.*Networking.*Feature:SCTPConnectivity"
 endif
-else
-K8S_CONFORMANCE_E2E_FOCUS += "sig-network.*Networking.*Feature:SCTPConnectivity"
+
+# support for internalTrafficPolicy=Local was added in v1.14
+ifeq ($(shell test $(VER_MAJOR) -gt 1 -o \( $(VER_MAJOR) -eq 1 -a $(VER_MINOR) -gt 13 \) && echo true),true)
+K8S_CONFORMANCE_E2E_FOCUS += "should respect internalTrafficPolicy=Local Pod to Pod" \
+	"should respect internalTrafficPolicy=Local Pod and Node, to Pod  (hostNetwork: true)"
 endif
 
 ifneq ($(E2E_IP_FAMILY),ipv6)
@@ -65,6 +78,8 @@ endef
 
 TEST_BIN_ARGS = -kubeconfig $(KUBECONFIG) -num-nodes $(shell kubectl get node -o name | wc -l)
 
+K8S_CONFORMANCE_E2E_FOCUS = "should respect internalTrafficPolicy=Local Pod to Pod"
+
 .PHONY: e2e
 e2e: kube-ovn-conformance-e2e