wip

Signed-off-by: Tom Hadlaw <tom.hadlaw@isovalent.com>
isovalent · Feb 14, 2024 · 36167da · 36167da
1 parent 7452124
commit 36167da
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 5 deletions.
diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml
@@ -21,8 +21,10 @@ jobs:
       matrix:
         include:
           # TODO: "v1.15.0-rc.0"
-          - name: 'Talos v1.5 with KPR'
-            cilium-version: "1.14.7"
+          #
+          #
+          - name: 'v1.15 on Talos v1.5 w KPR'
+            cilium-version: "1.15.0-rc.0"
             talos-version: 'v1.5.3'
             kube-proxy: true 
             kube-proxy-replacement: "strict"
@@ -32,11 +34,33 @@ jobs:
             ipv4: true
             ipv6: false
 
-          - name: 'Talos v1.5 without KPR'
+          - name: 'v1.15 on Talos v1.5 w KPR'
+            cilium-version: "1.15.0-rc.0"
+            talos-version: 'v1.5.3'
+            kube-proxy: true 
+            kube-proxy-replacement: "disabled"
+            socketlb: false 
+            bpf-masquerade: true
+            ipam-mode: 'kubernetes'
+            ipv4: true
+            ipv6: false
+
+          - name: 'v1.14 on Talos v1.5 w KPR'
             cilium-version: "1.14.7"
             talos-version: 'v1.5.3'
-            kube-proxy: false
+            kube-proxy: true 
             kube-proxy-replacement: "strict"
+            socketlb: false 
+            bpf-masquerade: true
+            ipam-mode: 'kubernetes'
+            ipv4: true
+            ipv6: false
+
+          - name: 'v1.14 on Talos v1.5 no KPR'
+            cilium-version: "1.14.7"
+            talos-version: 'v1.5.3'
+            kube-proxy: true
+            kube-proxy-replacement: "disabled"
             socketlb: false
             bpf-masquerade: true
             ipam-mode: 'kubernetes'

diff --git a/test/conformance/create-ci-env.sh b/test/conformance/create-ci-env.sh
@@ -84,12 +84,17 @@ fi
 pr_name=$(head -c 15 <<< ${pr_name})
 num=$(head -c 3 <<< ${RANDOM})
 
+disable_kube_proxy=false
+if [ ${kube_proxy} == "false" ]; then
+	disable_kube_proxy=true
+fi
+
 cat > env.tfvars << EOF
 cluster_name = "talos-e2e-${pr_name}-${num}"
 region = "us-east-2"
 owner = "${owner}"
 talos_version = "${talos_version}"
-disable_kube_proxy = ${kube_proxy} 
+disable_kube_proxy = ${disable_kube_proxy} 
 EOF
 
 cat env.tfvars