Support multiple IPPools in the namespace #4777
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cnvergence
force-pushed
the
fix-ipampools-ns
branch
from
08cdee5 to
2eeaec2
Compare
dosubot
bot
added
size:M
Pull Request Test Coverage Report for Build 12298070287Details
💛 - Coveralls |
dosubot
bot
added
size:L
cnvergence
force-pushed
the
fix-ipampools-ns
branch
from
0d232b9 to
49b1f5b
Compare
dosubot
bot
added
size:M
cnvergence
force-pushed
the
fix-ipampools-ns
branch
4 times, most recently
from
db03de0 to
178f7c2
Compare
Signed-off-by: Karol Szwaj <[email protected]>
Signed-off-by: Karol Szwaj <[email protected]>
Signed-off-by: Karol Szwaj <[email protected]>
Signed-off-by: Karol Szwaj <[email protected]>
Signed-off-by: Karol Szwaj <[email protected]>
Signed-off-by: Karol Szwaj <[email protected]>
Signed-off-by: Karol Szwaj <[email protected]>
Signed-off-by: Karol Szwaj <[email protected]>
Signed-off-by: Karol Szwaj <[email protected]>
Signed-off-by: Karol Szwaj <[email protected]>
Signed-off-by: Karol Szwaj <[email protected]>
Signed-off-by: Karol Szwaj <[email protected]>
Signed-off-by: Karol Szwaj <[email protected]>
Signed-off-by: Karol Szwaj <[email protected]>
Signed-off-by: Karol Szwaj <[email protected]>
Signed-off-by: Karol Szwaj <[email protected]>
Signed-off-by: Karol Szwaj <[email protected]>
cnvergence
force-pushed
the
fix-ipampools-ns
branch
from
a852962 to
ded43bd
Compare
|
PTAL @zhangzujian |
zhangzujian
reviewed
Dec 13, 2024
| @@ -509,4 +509,56 @@ var _ = framework.Describe("[group:ipam]", func() { | |||
| deploy = deployClient.PatchSync(deploy, patchedDeploy) | |||
| checkFn() | |||
| }) | |||
|
|
|||
| framework.ConformanceIt("should allocate right IPs for the statefulset when there are multiple IP Pools added to its namespace", func() { | |||
There was a problem hiding this comment.
Let's skip this test case for versions < v1.14 by using f.SkipVersionPriorTo(1, 14, "some message...")
zhangzujian
reviewed
Dec 13, 2024
Comment on lines
+525
to
+526
| testSubnet := framework.MakeSubnet(testSubnetName, "", testCidr, "", "", "", nil, nil, []string{namespaceName}) | ||
| subnetClient.CreateSync(testSubnet) |
There was a problem hiding this comment.
Suggested change
| testSubnet := framework.MakeSubnet(testSubnetName, "", testCidr, "", "", "", nil, nil, []string{namespaceName}) | |
| subnetClient.CreateSync(testSubnet) | |
| testSubnet := framework.MakeSubnet(testSubnetName, "", testCidr, "", "", "", nil, nil, []string{namespaceName}) | |
| ginkgo.DeferCleanup(func() { | |
| ginkgo.By("Deleting subnet " + testSubnetName) | |
| subnetClient.DeleteSync(testSubnetName) | |
| }) | |
| subnetClient.CreateSync(testSubnet) |
Let's use ginkgo.DeferCleanup() to ensure test resources are cleaned up.
zhangzujian
reviewed
Dec 13, 2024
Comment on lines
+554
to
+562
| ginkgo.By("Deleting statefulset " + testStsName) | ||
| stsClient.DeleteSync(testStsName) | ||
|
|
||
| ginkgo.By("Deleting ippools") | ||
| ippoolClient.DeleteSync(testIPPool1Name) | ||
| ippoolClient.DeleteSync(testIPPool2Name) | ||
|
|
||
| ginkgo.By("Deleting subnet " + testSubnetName) | ||
| subnetClient.DeleteSync(testSubnetName) |
There was a problem hiding this comment.
Suggested change
| ginkgo.By("Deleting statefulset " + testStsName) | |
| stsClient.DeleteSync(testStsName) | |
| ginkgo.By("Deleting ippools") | |
| ippoolClient.DeleteSync(testIPPool1Name) | |
| ippoolClient.DeleteSync(testIPPool2Name) | |
| ginkgo.By("Deleting subnet " + testSubnetName) | |
| subnetClient.DeleteSync(testSubnetName) |
Since we are using ginkgo.DeferCleanup(), there is no need to delete the resources here.
zhangzujian
reviewed
Dec 13, 2024
Comment on lines
+519
to
+521
| testSubnetName := "ip-pool-subnet2" | ||
| testIPPool1Name := "ip-pool1" | ||
| testIPPool2Name := "ip-pool2" |
There was a problem hiding this comment.
Suggested change
| testSubnetName := "ip-pool-subnet2" | |
| testIPPool1Name := "ip-pool1" | |
| testIPPool2Name := "ip-pool2" | |
| testSubnetName := "ip-pool-subnet2" + framework.RandomSuffix() | |
| testIPPool1Name := "ip-pool1" + framework.RandomSuffix() | |
| testIPPool2Name := "ip-pool2" + framework.RandomSuffix() |
Subnet and ippool are cluster wide resources, we need to add a suffix to them.
zhangzujian
reviewed
Dec 13, 2024
| replicas := 1 | ||
| ipsCount := 12 | ||
| ipsRange1 := framework.RandomIPPool(cidr, ipsCount) | ||
| ipsRange2 := framework.RandomIPPool(cidr, ipsCount) |
There was a problem hiding this comment.
Suggested change
| ipsRange2 := framework.RandomIPPool(cidr, ipsCount) | |
| ipsRange2 := framework.RandomIPPool(testCidr, ipsCount) |
Should be testCidr here?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull Request
What type of this PR
Examples of user facing changes:
While reproducing issue #4687 (comment)
I have found that when user have multiple IPPools in the single namespace, pods without ippool annotation won’t be able to pick up a correct address.
Which issue(s) this PR fixes
Fixes #4687