Take IPFamily precedence based on order #8460
Merged
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
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## master #8460 +/- ##
==========================================
+ Coverage 47.16% 49.49% +2.33%
==========================================
Files 143 143
Lines 14855 14817 -38
==========================================
+ Hits 7006 7334 +328
+ Misses 6718 6301 -417
- Partials 1131 1182 +51
Flags with carried forward coverage won't be shown. Click here to find out more.
☔ View full report in Codecov by Sentry. |
manuelbuil
force-pushed
the
dsOrderGood2
branch
2 times, most recently
from
fdabaa6
to
5123367
Compare
thomasferrandiz
approved these changes
Sep 27, 2023
manuelbuil
force-pushed
the
dsOrderGood2
branch
from
5123367
to
21d9323
Compare
brandond
approved these changes
Sep 27, 2023
There was a problem hiding this comment.
LGTM.
@rancher-max we should specifically test upgrades to this commit on dual-stack clusters. Should check the logs to make sure that the deploy controller doesn't get stuck in a loop trying to change the ClusterIPs in a way that is rejected by the apiserver.
manuelbuil
force-pushed
the
dsOrderGood2
branch
2 times, most recently
from
81e1e96
to
7b09964
Compare
brandond
reviewed
Sep 28, 2023
| if (serviceIPv6 != clusterIPv6) || (dualCluster != dualService) || (serviceIPv4 != clusterIPv4) { | ||
| return fmt.Errorf("cluster-cidr: %v and service-cidr: %v, must share the same IP version (IPv4, IPv6 or dual-stack)", nodeConfig.AgentConfig.ClusterCIDRs, nodeConfig.AgentConfig.ServiceCIDRs) | ||
| } | ||
| if (clusterIPv6 && !nodeIPv6) || (dualCluster && !dualNode) || (clusterIPv4 && !nodeIPv4) { | ||
| if (clusterIPv6 && !(nodeIPv6 || dualNode)) || (dualCluster && !dualNode) || (clusterIPv4 && !(nodeIPv4 || dualNode)) { |
There was a problem hiding this comment.
this is getting comically complicated to follow!
There was a problem hiding this comment.
Good point, I'll add a comment
brandond
approved these changes
Sep 28, 2023
Signed-off-by: Manuel Buil <mbuil@suse.com>
manuelbuil
force-pushed
the
dsOrderGood2
branch
from
7b09964
to
2677a11
Compare
Signed-off-by: Manuel Buil <mbuil@suse.com>
manuelbuil
force-pushed
the
dsOrderGood2
branch
from
2677a11
to
f2c7117
Compare
|
I squashed the utils commit. I will leave the coredns commit separately though |
This was referenced Sep 29, 2023
This was referenced Nov 1, 2023
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.
Proposed Changes
This PR supports networking related config flags to follow the order in dual-stack. In that case, IPv6 address will be prioritized.
Note that flannel-cni is not supporting this and always prioritizes IPv4. I am investigating how to fix this but I wanted to create this PR first to address some of the comments in #8394
This PR includes two commits. The first one 067094a has its own PR and is being reviewed here: #8394
On a high level, the other commit does the following:
Types of Changes
New feature
Verification
Deploy in dual-stack mode with cluster-cidr and service-cidr using order and verify that when listing services or pods, IPv6 addresses appear. Check that all have an IPv4 as well and that connectivity to both addresses is working
Testing
Linked Issues
#8467
User-Facing Change
Further Comments