From 88906c5294a068060a9201de50ba33b995e91f47 Mon Sep 17 00:00:00 2001
From: Tim Horner <timothy.horner@isovalent.com>
Date: Tue, 7 May 2024 14:17:33 -0400
Subject: [PATCH] CI: enable CiliumEndpointSlice in conformance-e2e

Enable CiliumEndpointSlice in the conformance-e2e and upgrade workflows for
coverage with tunneling enabled and disabled.

Signed-off-by: Tim Horner <timothy.horner@isovalent.com>
---
 .github/actions/cilium-config/action.yml | 9 ++++++++-
 .github/workflows/conformance-e2e.yaml   | 3 +++
 .github/workflows/tests-e2e-upgrade.yaml | 2 ++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/.github/actions/cilium-config/action.yml b/.github/actions/cilium-config/action.yml
index e9518b726e5d2..da9fc8428faca 100644
--- a/.github/actions/cilium-config/action.yml
+++ b/.github/actions/cilium-config/action.yml
@@ -52,6 +52,9 @@ inputs:
   misc:
     description: 'Misc helm rarely set by a user coma separated values'
     default: ''
+  ciliumendpointslice:
+    description: 'Enable CiliumEndpointSlice'
+    default: false
 outputs:
   config:
     description: 'Cilium installation config'
@@ -157,6 +160,10 @@ runs:
               INGRESS_CONTROLLER+=" --helm-set=ingressController.service.type=NodePort"
             fi
           fi
+
+          if [ "${{ inputs.ciliumendpointslice }}" == "true" ]; then
+            CILIUMENDPOINTSLICE="--helm-set=enableCiliumEndpointSlice"
+          fi
         
-          CONFIG="${DEFAULTS} ${IMAGE} ${TUNNEL} ${DEVICES} ${LB_MODE} ${ENDPOINT_ROUTES} ${IPV6} ${MASQ} ${EGRESS_GATEWAY} ${ENCRYPT} ${HOST_FW} ${LB_ACCELERATION} ${INGRESS_CONTROLLER}"
+          CONFIG="${DEFAULTS} ${IMAGE} ${TUNNEL} ${DEVICES} ${LB_MODE} ${ENDPOINT_ROUTES} ${IPV6} ${MASQ} ${EGRESS_GATEWAY} ${ENCRYPT} ${HOST_FW} ${LB_ACCELERATION} ${INGRESS_CONTROLLER} ${CILIUMENDPOINTSLICE}"
           echo "config=${CONFIG}" >> $GITHUB_OUTPUT
diff --git a/.github/workflows/conformance-e2e.yaml b/.github/workflows/conformance-e2e.yaml
index 3cc9d4a1fe1a6..8f343705f64bb 100644
--- a/.github/workflows/conformance-e2e.yaml
+++ b/.github/workflows/conformance-e2e.yaml
@@ -251,6 +251,7 @@ jobs:
             tunnel: 'disabled'
             ingress-controller: 'true'
             misc: 'bpf.tproxy=true'
+            ciliumendpointslice: 'true'
 
           - name: '16'
             # renovate: datasource=docker depName=quay.io/lvh-images/kind
@@ -264,6 +265,7 @@ jobs:
             encryption: 'wireguard'
             encryption-node: 'false'
             host-fw: 'true'
+            ciliumendpointslice: 'true'
 
     timeout-minutes: 60
     steps:
@@ -310,6 +312,7 @@ jobs:
           host-fw: ${{ matrix.host-fw }}
           ingress-controller: ${{ matrix.ingress-controller }}
           misc: ${{ matrix.misc }}
+          ciliumendpointslice: ${{ matrix.ciliumendpointslice }}
 
       - name: Install Cilium CLI
         uses: cilium/cilium-cli@bfa4f93a41da410a1b4c9373c1694ca6d5c35ade # v0.16.6
diff --git a/.github/workflows/tests-e2e-upgrade.yaml b/.github/workflows/tests-e2e-upgrade.yaml
index eab3e083405d9..e88c796441a58 100644
--- a/.github/workflows/tests-e2e-upgrade.yaml
+++ b/.github/workflows/tests-e2e-upgrade.yaml
@@ -258,6 +258,7 @@ jobs:
             # Disable bpf.tproxy=true until https://github.com/cilium/cilium/issues/31918
             # has been resolved.
             misc: 'bpfClockProbe=false,cni.uninstall=false'
+            ciliumendpointslice: 'true'
 
           - name: '16'
             # renovate: datasource=docker depName=quay.io/lvh-images/kind
@@ -271,6 +272,7 @@ jobs:
             encryption: 'wireguard'
             encryption-node: 'false'
             host-fw: 'true'
+            ciliumendpointslice: 'true'
 
     timeout-minutes: 60
     steps: