Merge pull request #1174 from fasaxc/auto-pick-of-#1170-origin-releas…

…e-v3.17 [release-v3.17] Auto pick #1170: Pin to Calico-owned scapy image.
projectcalico · Aug 20, 2021 · d278324 · d278324
2 parents 2f96eda + 9751e64
commit d278324
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -55,7 +55,7 @@ FELIX_GPL_SOURCE=filesystem/included-source/felix-ebpf-gpl.tar.gz
 INCLUDED_SOURCE=$(BIRD_SOURCE) $(FELIX_GPL_SOURCE)
 
 # Versions and locations of dependencies used in tests.
-CALICOCTL_VER?=master
+CALICOCTL_VER?=release-v3.17
 CNI_VER?=master
 TEST_CONTAINER_NAME_VER?=latest
 CTL_CONTAINER_NAME?=calico/ctl:$(CALICOCTL_VER)-$(ARCH)

diff --git a/tests/k8st/create_kind_cluster.sh b/tests/k8st/create_kind_cluster.sh
@@ -103,6 +103,8 @@ kubeadmConfigPatches:
   metadata:
     name: config
   mode: ipvs
+  conntrack:
+    maxPerCore: 0
 EOF
 
 ${kubectl} get no -o wide

diff --git a/tests/k8st/infra/calicoctl-etcd.yaml b/tests/k8st/infra/calicoctl-etcd.yaml
@@ -14,7 +14,7 @@ spec:
   hostNetwork: true
   containers:
   - name: calicoctl
-    image: calico/ctl:master
+    image: calico/ctl:release-v3.17
     command:
       - /calicoctl
     args:

diff --git a/tests/k8st/infra/calicoctl.yaml b/tests/k8st/infra/calicoctl.yaml
@@ -23,7 +23,7 @@ spec:
   serviceAccountName: calicoctl
   containers:
   - name: calicoctl
-    image: calico/ctl:master
+    image: calico/ctl:release-v3.17
     command:
       - /calicoctl
     args:

diff --git a/tests/k8st/tests/test_ipip_spoofing.py b/tests/k8st/tests/test_ipip_spoofing.py
@@ -57,7 +57,7 @@ def setUp(self):
         kubectl("run --generator=run-pod/v1 "
                 "scapy "
                 "-n %s "
-                "--image ehlers/scapy "
+                "--image calico/scapy:v2.4.0 "
                 "--overrides='{\"spec\": {\"nodeName\":\"%s\"}}' "
                 "--command /bin/sleep -- 3600" % (self.ns_name, nodes[2]))
 
@@ -181,7 +181,7 @@ def clear_conntrack():
     def send_packet(ns_name, name, remote_pod_ip, message):
         try:
             kubectl("exec " + name + " -ti -n %s -- "
-                                     "scapy3 << EOF\n"
+                                     "scapy << EOF\n"
                                      "send("
                                      "IP(dst='%s')/"
                                      "UDP(dport=5000, sport=5000)/"
@@ -196,7 +196,7 @@ def send_packet(ns_name, name, remote_pod_ip, message):
     def send_spoofed_ipip_packet(ns_name, name, remote_node_ip, remote_pod_ip, message):
         try:
             kubectl("exec " + name + " -ti -n %s -- "
-                                     "scapy3 << EOF\n"
+                                     "scapy << EOF\n"
                                      "send("
                                      "IP(dst='%s')/"
                                      "IP(dst='%s')/"
@@ -212,7 +212,7 @@ def send_spoofed_ipip_packet(ns_name, name, remote_node_ip, remote_pod_ip, messa
     def send_spoofed_vxlan_packet(ns_name, name, remote_node_ip, remote_pod_ip, message):
         try:
             kubectl("exec " + name + " -ti -n %s -- "
-                                     "scapy3 << EOF\n"
+                                     "scapy << EOF\n"
                                      "send("
                                      "IP(dst='%s')/"
                                      "UDP(dport=4789)/"