Remove all IPV6 listeners in ingress resources with -disable-ipv6 command line #3139
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
haywoodsh
changed the title
haywoodsh
changed the title
haywoodsh
changed the title
jjngx
approved these changes
Oct 12, 2022
Codecov Report
@@ Coverage Diff @@
## main #3139 +/- ##
=======================================
Coverage 52.54% 52.55%
=======================================
Files 58 58
Lines 16069 16070 +1
=======================================
+ Hits 8444 8445 +1
Misses 7349 7349
Partials 276 276
📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
jjngx
reviewed
Oct 12, 2022
internal/configs/ingress_test.go
Outdated
|
|
||
| result, warnings := generateNginxCfg(&cafeIngressEx, nil, nil, false, configParams, isPlus, false, &StaticConfigParams{DisableIPV6: true}, false) | ||
|
|
||
| if diff := cmp.Diff(expected, result); diff != "" { |
There was a problem hiding this comment.
How about calculating diff between expected and result only after it is discovered that the values are not equal (aka test fails)?
if !cmp.Equal(expected, result) {
t.Errorf("generateNginxCfg() returned unexpected result (-want +got):\n%s", cmp.Diff(expected, result))
}There was a problem hiding this comment.
Sounds good! Updated in the latest commit.
shaun-nx
approved these changes
Oct 12, 2022
haywoodsh
force-pushed
the
fix/remove-all-ingress-ipv6-listeners-when-commandline-argument-used
branch
from
7b304d5
to
db33331
Compare
shaun-nx
reviewed
Oct 13, 2022
| @pytest.mark.parametrize( | ||
| "ingress_controller", | ||
| [ | ||
| pytest.param({"extra_args": ["-disable-ipv6"]}, id="one-additional-cli-args"), |
There was a problem hiding this comment.
What does the id="one-additional-cli-args" option do? I haven't seen that before
There was a problem hiding this comment.
This is just the test ID of the parametrize values in pytest. Since I only have one set of values, I have removed the id and let pytest generate it.
shaun-nx
approved these changes
Oct 13, 2022
haywoodsh
force-pushed
the
fix/remove-all-ingress-ipv6-listeners-when-commandline-argument-used
branch
from
ff2d037
to
66899e0
Compare
vepatel
approved these changes
Oct 13, 2022
…ommandline-argument-used
…ommandline-argument-used
…ommandline-argument-used
haywoodsh
deleted the
fix/remove-all-ingress-ipv6-listeners-when-commandline-argument-used
branch
ciarams87
added a commit
that referenced
this pull request
Oct 19, 2022
* Remove all IPV6 listeners in ingress resources with -disable-ipv6 command line (#3139) * Remove ipv6 listeners in ingress upstream with command line argument Co-authored-by: Venktesh <ve.patel@f5.com> (cherry picked from commit 4e6caf0) * Fix typo in Action.Proxy.ResponseHeaders (#3157) Corrected bool to []string in Action.Proxy.ResponseHeaders section (cherry picked from commit 4824823) Co-authored-by: Ciara Stacke <18287516+ciarams87@users.noreply.github.com> Co-authored-by: tomasohaodha <86358393+tomasohaodha@users.noreply.github.com>
coolbry95
pushed a commit
to coolbry95/kubernetes-ingress
that referenced
this pull request
Nov 18, 2022
…mand line (nginxinc#3139) * Remove ipv6 listeners in ingress upstream with command line argument Co-authored-by: Venktesh <ve.patel@f5.com>
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
When
-disable-ipv6command line argument is used, remove all IPV6 listeners in upstream deployed with ingress.Closes #3138
Checklist
Before creating a PR, run through this checklist and mark each as complete.