Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Test sandwiched waypoint #973

Merged
merged 1 commit into from
Apr 25, 2024
Merged

Test sandwiched waypoint #973

merged 1 commit into from
Apr 25, 2024

Conversation

howardjohn
Copy link
Member

@howardjohn howardjohn commented Apr 24, 2024 •
edited

No description provided.

@howardjohn howardjohn added the release-notes-none Indicates a PR that does not require release notes. label Apr 24, 2024
@istio-testing
Copy link
Contributor

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@istio-testing istio-testing added do-not-merge/work-in-progress Block merging of a PR because it isn't ready yet. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Apr 24, 2024
@istio-testing istio-testing added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Apr 25, 2024
@howardjohn howardjohn changed the title Fix and test sandwiched waypoint Test sandwiched waypoint Apr 25, 2024
@howardjohn howardjohn marked this pull request as ready for review April 25, 2024 17:57
@howardjohn howardjohn requested a review from a team as a code owner April 25, 2024 17:57
@istio-testing istio-testing removed the do-not-merge/work-in-progress Block merging of a PR because it isn't ready yet. label Apr 25, 2024
@howardjohn howardjohn added the cherrypick/release-1.22 Set this label on a PR to auto-merge it to the release-1.22 branch label Apr 25, 2024
howardjohn
howardjohn commented Apr 25, 2024
View reviewed changes
src/proxy/outbound.rs
@@ -233,7 +233,7 @@ impl OutboundConnection {
.track_outbound(source_addr, dest_addr, req.gateway);

let metrics = self.pi.metrics.clone();
let hbone_target = if req.request_type == RequestType::ToServerWaypoint {
let hbone_target = if req.protocol == Protocol::HBONE {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor fix to make stats properly report for all hbone cases, not just to waypoint

src/test_helpers/linux.rs
@@ -48,7 +48,6 @@ pub struct WorkloadManager {
services: HashMap<NamespacedHostname, Service>,
/// Configured policies
policies: Vec<Authorization>,
waypoints: Vec<IpAddr>,
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not needed anymore, waypoints are not special. This was deadcode before this PR

stevenctl
stevenctl reviewed Apr 25, 2024
View reviewed changes
tests/namespaced.rs
let waypoint = manager
.workload_builder("waypoint", DEFAULT_NODE)
.mutate_workload(|w| {
w.application_tunnel = Some(ApplicationTunnel {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't really do anything, is it just here for explicitness?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TBH thought it did matter... I was thinking of adding a PROXY test as well but didn't get around to it

@istio-testing istio-testing merged commit 9f6cc73 into istio:master Apr 25, 2024
3 checks passed
@istio-testing
Copy link
Contributor

In response to a cherrypick label: #973 failed to apply on top of branch "release-1.22":

Applying: Test sandwich waypoints
Using index info to reconstruct a base tree...
M	src/proxy/outbound.rs
M	src/test_helpers/linux.rs
M	src/test_helpers/tcp.rs
M	tests/namespaced.rs
Falling back to patching base and 3-way merge...
Auto-merging tests/namespaced.rs
CONFLICT (content): Merge conflict in tests/namespaced.rs
Auto-merging src/test_helpers/tcp.rs
Auto-merging src/test_helpers/linux.rs
CONFLICT (content): Merge conflict in src/test_helpers/linux.rs
Auto-merging src/proxy/outbound.rs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Test sandwich waypoints
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

@istio-testing istio-testing mentioned this pull request Apr 25, 2024
Closed
@istio-testing
Copy link
Contributor

In response to a cherrypick label: new issue created for failed cherrypick: #976

@bleggett
Copy link
Contributor

/cherry-pick release-1.22

@istio-testing
Copy link
Contributor

@bleggett: new pull request created: #984

In response to this:

/cherry-pick release-1.22

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@istio-testing istio-testing mentioned this pull request Apr 26, 2024
Merged
@howardjohn howardjohn mentioned this pull request May 1, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stevenctl stevenctl stevenctl approved these changes

Assignees
No one assigned
Labels
cherrypick/release-1.22 Set this label on a PR to auto-merge it to the release-1.22 branch release-notes-none Indicates a PR that does not require release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@howardjohn @istio-testing @bleggett @stevenctl