mirror of
https://github.com/k8snetworkplumbingwg/multus-cni.git
synced 2025-07-14 16:04:07 +00:00
Merge pull request #643 from s1061123/fix/no-network-error
[WIP] Change nil instead of error in case of no network annotation
This commit is contained in:
commit
ad6f57f14d
4
.github/workflows/kind-e2e.yml
vendored
4
.github/workflows/kind-e2e.yml
vendored
@ -27,6 +27,10 @@ jobs:
|
|||||||
working-directory: ./e2e
|
working-directory: ./e2e
|
||||||
run: ./setup_cluster.sh
|
run: ./setup_cluster.sh
|
||||||
|
|
||||||
|
- name: Test simple pod
|
||||||
|
working-directory: ./e2e
|
||||||
|
run: ./test-simple-pod.sh
|
||||||
|
|
||||||
- name: Test macvlan1
|
- name: Test macvlan1
|
||||||
working-directory: ./e2e
|
working-directory: ./e2e
|
||||||
run: ./test-simple-macvlan1.sh
|
run: ./test-simple-macvlan1.sh
|
||||||
|
15
e2e/simple-pod.yml
Normal file
15
e2e/simple-pod.yml
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
---
|
||||||
|
apiVersion: v1
|
||||||
|
kind: Pod
|
||||||
|
metadata:
|
||||||
|
name: simple-centos1
|
||||||
|
annotations:
|
||||||
|
labels:
|
||||||
|
app: simple
|
||||||
|
spec:
|
||||||
|
containers:
|
||||||
|
- name: simple-centos1
|
||||||
|
image: centos:8
|
||||||
|
command: ["/bin/sleep", "10000"]
|
||||||
|
securityContext:
|
||||||
|
privileged: true
|
10
e2e/test-simple-pod.sh
Executable file
10
e2e/test-simple-pod.sh
Executable file
@ -0,0 +1,10 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
set -o errexit
|
||||||
|
|
||||||
|
export PATH=${PATH}:./bin
|
||||||
|
|
||||||
|
kubectl create -f simple-pod.yml
|
||||||
|
kubectl wait --for=condition=ready -l app=simple --timeout=300s pod
|
||||||
|
|
||||||
|
echo "cleanup resources"
|
||||||
|
kubectl delete -f simple-pod.yml
|
@ -367,6 +367,9 @@ func TryLoadPodDelegates(pod *v1.Pod, conf *types.NetConf, clientInfo *ClientInf
|
|||||||
return len(delegates), clientInfo, nil
|
return len(delegates), clientInfo, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if _, ok := err.(*NoK8sNetworkError); ok {
|
||||||
|
return 0, clientInfo, nil
|
||||||
|
}
|
||||||
return 0, clientInfo, err
|
return 0, clientInfo, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user