Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ jobs:
runs-on: ubuntu-24.04
timeout-minutes: 10
steps:
- uses: linkerd/dev/actions/setup-tools@v50
- uses: linkerd/dev/actions/setup-tools@v51
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1
- run: just action-lint

devcontainer-versions:
runs-on: ubuntu-24.04
steps:
- uses: linkerd/dev/actions/setup-tools@v50
- uses: linkerd/dev/actions/setup-tools@v51
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1
- run: just action-dev-check
7 changes: 4 additions & 3 deletions .github/workflows/cni-plugin-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,14 @@ on:
jobs:
cni-test:
strategy:
fail-fast: false
matrix:
cni: [flannel, calico, cilium]
iptables-mode: [legacy, nft, plain]
timeout-minutes: 15
runs-on: ubuntu-24.04
steps:
- uses: linkerd/dev/actions/setup-tools@v50
- uses: linkerd/dev/actions/setup-tools@v51
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1
- name: Run CNI integration tests
env:
Expand All @@ -33,15 +34,15 @@ jobs:
timeout-minutes: 15
runs-on: ubuntu-24.04
steps:
- uses: linkerd/dev/actions/setup-tools@v50
- uses: linkerd/dev/actions/setup-tools@v51
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1
- name: Run CNI ordering tests
run: just cni-plugin-test-ordering
repair-controller:
timeout-minutes: 15
runs-on: ubuntu-24.04
steps:
- uses: linkerd/dev/actions/setup-tools@v50
- uses: linkerd/dev/actions/setup-tools@v51
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1
- name: Run repair-controller tests
run: just cni-repair-controller-integration
2 changes: 1 addition & 1 deletion .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
timeout-minutes: 15
runs-on: ubuntu-24.04
steps:
- uses: linkerd/dev/actions/setup-tools@v50
- uses: linkerd/dev/actions/setup-tools@v51
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1
- name: Run proxy-init integration tests
run: just proxy-init-test-integration
2 changes: 1 addition & 1 deletion .github/workflows/release-cni-plugin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:

- uses: docker/setup-qemu-action@99012661954931238ded8c8b007157a8430204e1
- uses: docker/setup-buildx-action@594f3bf4285d9ea8dc53c9a0c9c4092420091003
- uses: linkerd/dev/actions/setup-tools@v50
- uses: linkerd/dev/actions/setup-tools@v51
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1
- run: |
just cni-plugin-image='${{ needs.meta.outputs.repo }}:${{ needs.meta.outputs.version }}' \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-proxy-init.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:

- uses: docker/setup-qemu-action@99012661954931238ded8c8b007157a8430204e1
- uses: docker/setup-buildx-action@594f3bf4285d9ea8dc53c9a0c9c4092420091003
- uses: linkerd/dev/actions/setup-tools@v50
- uses: linkerd/dev/actions/setup-tools@v51
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1
- run: |
just proxy-init-image='${{ needs.meta.outputs.repo }}:${{ needs.meta.outputs.version }}' \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/shell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ jobs:
timeout-minutes: 5
runs-on: ubuntu-24.04
steps:
- uses: linkerd/dev/actions/setup-tools@v50
- uses: linkerd/dev/actions/setup-tools@v51
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1
- run: just sh-lint
5 changes: 3 additions & 2 deletions cni-plugin/integration/manifests/calico/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@ then
exit 1
fi

kubectl apply -f https://raw.githubusercontent.com/projectcalico/calico/v3.31.0/manifests/tigera-operator.yaml
calico_ver=v3.33.0
kubectl apply -f "https://raw.githubusercontent.com/projectcalico/calico/${calico_ver}/manifests/tigera-operator.yaml"
kubectl --namespace tigera-operator rollout status --timeout=5m deploy/tigera-operator

until kubectl apply -f https://raw.githubusercontent.com/projectcalico/calico/v3.31.0/manifests/custom-resources.yaml 1>/dev/null 2>&1; do
until kubectl apply -f "https://raw.githubusercontent.com/projectcalico/calico/${calico_ver}/manifests/custom-resources.yaml" 1>/dev/null 2>&1; do
echo "retrying calico custom resources installation..."
sleep 2
done
Expand Down
12 changes: 4 additions & 8 deletions cni-plugin/integration/run-ordering.sh
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,9 @@ fi
printf '\n# Trigger calico; k8s should now schedule the pod...\n'
kubectl label node "k3d-$NODE_NAME-0" allow-calico=true
kubectl rollout status daemonset -n calico-system
sleep 10s
status=$(kubectl get po nginx -ojson | jq -c .status.containerStatuses[0])
if [[ "$status" == "null" ]]; then
echo "Pod not scheduled unexpectedly"
exit1
elif [[ $(echo "$status" | jq .state.running) == "null" ]]; then
echo "Unexpected pod container status: $status"
exit 1
if ! kubectl wait pod/nginx --for=condition=Ready --timeout=2m; then
echo "Pod did not become ready after calico was scheduled on the node"
kubectl describe pod nginx
exit 1
fi
echo 'Pod scheduled as expected.'
5 changes: 3 additions & 2 deletions cni-repair-controller/integration/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@ cni_image_version=${BASH_REMATCH[2]}
cd "${BASH_SOURCE[0]%/*}"

step 'Installing Calico'
calico_ver=v3.33.0
# Install calico per instructions from https://k3d.io/v5.8.3/usage/advanced/calico/#1-create-the-cluster-without-flannel
kubectl apply -f https://raw.githubusercontent.com/projectcalico/calico/v3.31.0/manifests/tigera-operator.yaml
kubectl apply -f "https://raw.githubusercontent.com/projectcalico/calico/${calico_ver}/manifests/tigera-operator.yaml"
kubectl --namespace tigera-operator rollout status --timeout=5m deploy/tigera-operator
until kubectl apply -f https://raw.githubusercontent.com/projectcalico/calico/v3.31.0/manifests/custom-resources.yaml; do
until kubectl apply -f "https://raw.githubusercontent.com/projectcalico/calico/${calico_ver}/manifests/custom-resources.yaml"; do
echo "retrying calico custom resources installation..."
sleep 5
done
Expand Down
23 changes: 15 additions & 8 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -192,17 +192,24 @@ _cni-plugin-setup-cilium:
docker exec k3d-l5d-cilium-test-server-0 mount --make-shared /run/cilium/cgroupv2/
echo "Mounted /sys/fs/bpf to cilium-test-server cluster"
helm repo add cilium https://helm.cilium.io/
helm install cilium cilium/cilium --version 1.13.0 \
helm install cilium cilium/cilium --version 1.20.3 \
--kube-context k3d-l5d-cilium-test \
--namespace kube-system \
--set kubeProxyReplacement=partial \
--set hostServices.enabled=false \
--set externalIPs.enabled=true \
--set nodePort.enabled=true \
--set hostPort.enabled=true \
--set kubeProxyReplacement=false \
--set cni.exclusive=false \
--set bpf.masquerade=false \
--set image.pullPolicy=IfNotPresent \
--set ipam.mode=kubernetes
--set ipam.mode=kubernetes \
--set operator.replicas=1
# Wait for cilium to be ready so that a broken install fails here, with
# logs, rather than as an opaque network-validator timeout later on.
for r in ds/cilium deploy/cilium-operator; do
if ! kubectl --context k3d-l5d-cilium-test -n kube-system rollout status "$r" --timeout=5m; then
kubectl --context k3d-l5d-cilium-test -n kube-system describe "$r" || true
kubectl --context k3d-l5d-cilium-test -n kube-system logs "$r" --all-containers --tail=200 || true
exit 1
fi
done
echo "cilium has been installed"

# Run cni-plugin integration tests using flannel, in a dedicated k3d
Expand All @@ -214,7 +221,7 @@ cni-plugin-test-integration-flannel:

# TODO(stevej): add a k3d-create-debug
export K3D_CLUSTER_NAME := env_var_or_default("K3D_CLUSTER_NAME", "l5d")
export K3S_DISABLE := "local-storage,traefik,servicelb,metrics-server@server:*"
export K3S_DISABLE := "gateway-api-crd,local-storage,traefik,servicelb,metrics-server@server:*"
export K3D_CREATE_FLAGS := '--no-lb --k3s-arg "--debug@server:*"'

# Scenario to use for integration tests
Expand Down
Loading