Skip to content

Commit

Permalink
CI: enable CiliumEndpointSlice in conformance-e2e
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
thorn3r committed May 7, 2024
1 parent eb2a6a2 commit 88906c5
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 1 deletion.
9 changes: 8 additions & 1 deletion .github/actions/cilium-config/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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
3 changes: 3 additions & 0 deletions .github/workflows/conformance-e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -264,6 +265,7 @@ jobs:
encryption: 'wireguard'
encryption-node: 'false'
host-fw: 'true'
ciliumendpointslice: 'true'

timeout-minutes: 60
steps:
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/tests-e2e-upgrade.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -271,6 +272,7 @@ jobs:
encryption: 'wireguard'
encryption-node: 'false'
host-fw: 'true'
ciliumendpointslice: 'true'

timeout-minutes: 60
steps:
Expand Down

0 comments on commit 88906c5

Please sign in to comment.