mirror of https://github.com/k3s-io/k3s
7585998299
Automatic merge from submit-queue (batch tested with PRs 57906, 57425, 56939, 57317, 57762). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. add "Not Found" error for ipset set & entry delete **What this PR does / why we need it**: Add "not found error" for ipset set and entry delete. For example, ``` [root@SHA1000130405 k8s-yml]# ipset list Name: KUBE-LOOP-BACK Type: hash:ip,port,ip Revision: 2 Header: family inet hashsize 1024 maxelem 65536 Size in memory: 16776 References: 1 Members: 172.17.0.2,udp:53,172.17.0.2 172.17.0.2,tcp:53,172.17.0.2 100.106.89.164,tcp:6443,100.106.89.164 [root@SHA1000130405 k8s-yml]# ipset delete foo ipset v6.19: The set with the given name does not exist [root@SHA1000130405 k8s-yml]# ipset del KUBE-LOOP-BACK 1.2.3.4,tcp:80,1.2.3.4 ipset v6.19: Syntax error: Third element is missing from 1.2.3.4,tcp:80,1.2.3.4. ``` Just need to filter the error message "does not exist" or "element is missing". We should ignore these error when try to make sure they are deleted. **Which issue(s) this PR fixes**: Fixes #57318 **Special notes for your reviewer**: **Release note**: ```release-note NONE ``` |
||
|---|---|---|
| .. | ||
| testing | ||
| BUILD | ||
| ipset.go | ||
| ipset_test.go | ||
| types.go | ||