ingress: Improve coverage with unit tests #24684
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
This attribute is deprecated and derived based on sum of individual weights. ``` 2023-04-01T06:08:08.708391385Z level=warning msg="[Deprecated field: type envoy.config.route.v3.WeightedCluster Using deprecated option 'envoy.config.route.v3.WeightedCluster.total_weight' from file route_components.proto. This configuration will be removed from Envoy soon. Please see https://www.envoyproxy.io/docs/envoy/latest/version_history/version_history for details. If continued use of this field is absolutely necessary, see https://www.envoyproxy.io/docs/envoy/latest/configuration/operations/runtime#using-runtime-overrides-for-deprecated-features for how to apply a temporary and highly discouraged override." subsys=envoy-misc threadID=79 ``` Signed-off-by: Tam Mach <tam.mach@cilium.io>
Signed-off-by: Tam Mach <tam.mach@cilium.io>
There is validation of unique domain names in envoy v1.25.x, which causes the below error in conformance test. This commit is to make sure that we don't generate two virtual hosts with same domain names if enforce https is enabled. ``` 2023-04-01T06:08:08.710574289Z level=warning msg="NACK received for versions after and up to 4; waiting for a version update before sending again" subsys=xds xdsAckedVersion= xdsClientNode="host~127.0.0.1~no-id~localdomain" xdsDetail="Only unique values for domains are permitted. Duplicate entry of domain foo.bar.com in route default/cilium-ingress-default-host-rules/listener-insecure" xdsNonce=4 xdsStreamID=9 xdsTypeURL=type.googleapis.com/envoy.config.route.v3.RouteConfiguration ``` Before ```json - '@type': type.googleapis.com/envoy.config.route.v3.RouteConfiguration name: listener-insecure virtualHosts: - domains: - foo.bar.com - foo.bar.com:* name: foo.bar.com routes: - match: safeRegex: regex: (/.*)?$ redirect: httpsRedirect: true - domains: - '*.foo.com' - '*.foo.com:*' name: '*.foo.com' routes: - match: headers: - name: :authority stringMatch: safeRegex: regex: ^[^.]+[.]foo[.]com$ safeRegex: regex: (/.*)?$ route: cluster: default/wildcard-foo-com:8080 maxStreamDuration: maxStreamDuration: 0s - domains: - foo.bar.com - foo.bar.com:* name: foo.bar.com routes: - match: safeRegex: regex: (/.*)?$ route: maxStreamDuration: maxStreamDuration: 0s weightedClusters: clusters: - name: default/foo-bar-com:http weight: 1 - name: default/foo-bar-com:http weight: 1 ``` After ```json - '@type': type.googleapis.com/envoy.config.route.v3.RouteConfiguration name: listener-insecure virtualHosts: - domains: - foo.bar.com - foo.bar.com:* name: foo.bar.com routes: - match: safeRegex: regex: (/.*)?$ redirect: httpsRedirect: true - domains: - '*.foo.com' - '*.foo.com:*' name: '*.foo.com' routes: - match: headers: - name: :authority stringMatch: safeRegex: regex: ^[^.]+[.]foo[.]com$ safeRegex: regex: (/.*)?$ route: cluster: default/wildcard-foo-com:8080 maxStreamDuration: maxStreamDuration: 0s ``` Signed-off-by: Tam Mach <tam.mach@cilium.io>
Signed-off-by: Tam Mach <tam.mach@cilium.io>
Signed-off-by: Tam Mach <tam.mach@cilium.io>
Signed-off-by: Tam Mach <tam.mach@cilium.io>
Signed-off-by: Tam Mach <tam.mach@cilium.io>
maintainer-s-little-helper
bot
added
the
dont-merge/needs-release-note-label
sayboras
added
area/CI
maintainer-s-little-helper
bot
removed
dont-merge/needs-release-note-label
|
/test |
mhofstetter
approved these changes
Apr 3, 2023
|
Beat me to it @mhofstetter, nice work both of you! |
7 tasks
sayboras
added
needs-backport/1.13
julianwiedmann
added
backport-done/1.13
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.
Description
This PR is to perform minor clean-up and to improve unit test coverage with test fixtures same as upstream Ingress Conformance tests. The goal is that we don't need to even run Conformance Test to debug any failure/discrepancy.
Testing
Just to make sure there is no flake in unit tests.