Update flannel to v0.25.4 and fixed issue with IPv6 mask #10422
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
brandond
previously approved these changes
Jun 28, 2024
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #10422 +/- ##
==========================================
- Coverage 43.03% 41.65% -1.38%
==========================================
Files 163 177 +14
Lines 16534 14830 -1704
==========================================
- Hits 7115 6178 -937
+ Misses 8158 7471 -687
+ Partials 1261 1181 -80
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
manuelbuil
requested changes
Jul 1, 2024
pkg/agent/flannel/flannel.go
Outdated
| if _, err := os.Stat(path); !os.IsNotExist(err) { | ||
| prevSubnetVals, err := godotenv.Read(path) | ||
| if err != nil { | ||
| logrus.Errorf("Couldn't fetch previous %s from subnet file at %s: %v", CIDRKey, path, err) | ||
| logrus.Errorf("Couldn't fetch previous %s from subnet file at %s: %s", CIDRKey, path, err) |
pkg/agent/flannel/flannel.go
Outdated
| for i := range cidrs { | ||
| _, cidr, err := net.ParseCIDR(cidrs[i]) | ||
| if err != nil { | ||
| logrus.Errorf("Couldn't parse previous %s from subnet file at %s: %s", CIDRKey, path, err) |
pkg/agent/flannel/flannel.go
Outdated
| if _, err := os.Stat(path); !os.IsNotExist(err) { | ||
| prevSubnetVals, err := godotenv.Read(path) | ||
| if err != nil { | ||
| logrus.Errorf("Couldn't fetch previous %s from subnet file at %s: %v", CIDRKey, path, err) | ||
| logrus.Errorf("Couldn't fetch previous %s from subnet file at %s: %s", CIDRKey, path, err) |
manuelbuil
requested changes
Jul 1, 2024
pkg/agent/flannel/flannel.go
Outdated
| for i := range cidrs { | ||
| _, cidr, err := net.ParseCIDR(cidrs[i]) | ||
| if err != nil { | ||
| logrus.Errorf("Couldn't parse previous %s from subnet file at %s: %s", CIDRKey, path, err) |
There was a problem hiding this comment.
same here, sorry I missed it
Signed-off-by: Roberto Bonafiglia <[email protected]>
manuelbuil
approved these changes
Jul 1, 2024
dereknola
approved these changes
Jul 1, 2024
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
Bump Flannel version to v0.25.4 and fixes an issue when IPv6masq flag is configured
Types of Changes
Verification
Testing
Linked Issues
#10419
User-Facing Change
Further Comments