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.

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

Fix egress mtls origination test #14914

Merged
merged 4 commits into from
Apr 23, 2024

Conversation

keithmattix
Copy link
Contributor

@keithmattix keithmattix commented Apr 18, 2024

This should fix the failing test in istio/istio#50040, but we need to make sure we capture the underlying behavior change in a release/upgrade note somewhere.

@keithmattix keithmattix requested review from a team as code owners April 18, 2024 14:12
@istio-policy-bot
Copy link

😊 Welcome! This is either your first contribution to the Istio documentation repo, or
it's been a while since you've been here. A few things you should know:

  • You can learn about how we write and maintain documentation, our style guidelines,
    and the available web site features by visiting Contributing to the Docs.

  • In the next few minutes, an automatic preview of your change will be built with
    a full copy of the istio.io website. You can find this preview by clicking on
    the Details link next to the deploy/netlify entry in the status section of this
    page.

  • We care about quality, so we've put in place a number of checks to ensure our documentation
    is top-notch. We do spell checking, sanitize the Markdown, ensure all hyperlinks point to a
    valid location, and more. If your PR doesn't pass one of these checks, you'll see a red X in the
    lint_istio.io entry in the status section. Click on the Details link to get a list of the
    problems with your PR. Fix those problems and push an update; this will automatically re-run the
    tests. Hopefully this time everything will be perfect!

  • Once your changes are accepted and merged into the repository, they will initially show up
    on https://preliminary.istio.io. The changes will be published to https://istio.io
    the next time we do a major release (which typically happens every 3 months or so).
    To publish them sooner, add a cherrypick/release-x.xx label, where x.xx is the current
    release of Istio.

Thanks for contributing!

Courtesy of your friendly welcome wagon.

@istio-testing istio-testing added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Apr 18, 2024
@keithmattix
Copy link
Contributor Author

@frankbu Any idea why gencheck is failing? I have no diff locally

@frankbu
Copy link
Collaborator

frankbu commented Apr 18, 2024

Seems like a go.mod difference:

diff --git a/go.mod b/go.mod
index 40a84f7a8..d0674f050 100644
--- a/go.mod
+++ b/go.mod
@@ -11,11 +11,8 @@ exclude k8s.io/kubernetes v1.13.0
 replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.5
 
 require (
-	github.com/envoyproxy/go-control-plane v0.12.1-0.20240409154308-6a432fea92ca
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2
 	golang.org/x/sync v0.7.0
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda
-	google.golang.org/grpc v1.63.0
 	istio.io/istio v0.0.0-20240413233931-e1eeb10b4f36
 	k8s.io/apimachinery v0.30.0-rc.2
 	k8s.io/client-go v0.30.0-rc.2
@@ -50,6 +47,7 @@ require (
 	github.com/docker/docker v25.0.5+incompatible // indirect
 	github.com/docker/docker-credential-helpers v0.8.1 // indirect
 	github.com/emicklei/go-restful/v3 v3.11.2 // indirect
+	github.com/envoyproxy/go-control-plane v0.12.1-0.20240409154308-6a432fea92ca // indirect
 	github.com/envoyproxy/protoc-gen-validate v1.0.4 // indirect
 	github.com/evanphx/json-patch v5.9.0+incompatible // indirect
 	github.com/evanphx/json-patch/v5 v5.9.0 // indirect
@@ -190,6 +188,8 @@ require (
 	golang.org/x/tools v0.19.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20240401170217-c3f982113cda // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect
+	google.golang.org/grpc v1.63.0 // indirect
 	google.golang.org/protobuf v1.33.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect

You can fix it with:

git apply <(curl -sL "https://gcsweb.istio.io/gcs/istio-prow/pr-logs/pull/istio_istio.io/14914/gencheck_istio.io/1780982059813048320/artifacts/check-clean-repo-diff.patch")

Signed-off-by: Keith Mattix II <keithmattix@microsoft.com>
Signed-off-by: Keith Mattix II <keithmattix@microsoft.com>
@istio-testing istio-testing added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 18, 2024
@ericvn
Copy link
Contributor

ericvn commented Apr 18, 2024

Just a note that the gencheck failure will be fixed my doing a make clean gen. clean is needed to remove the test framework files copied in which will update the go.* slightly.

Signed-off-by: Keith Mattix II <keithmattix@microsoft.com>
@ericvn
Copy link
Contributor

ericvn commented Apr 18, 2024

/test doc.test.profile-demo

flake

@kfaseela
Copy link
Member

did we get this documented as well?

@@ -21,7 +21,6 @@ set -e
set -u
set -o pipefail

source "content/en/docs/tasks/traffic-management/egress/egress-gateway-tls-origination/snips.sh"
Copy link
Member

Choose a reason for hiding this comment

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

why is this not working anymore? is the exportTo part the only change?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The issue is the the egress gateway mTLS tests used the same setup code but must not use export to. Removing this import breaks the dependency between the workload and gateway mTLS tests

vm-cluster.yaml Outdated Show resolved Hide resolved
Comment on lines +337 to +338
annotations:
"networking.istio.io/exportTo": "." # simulate an external service by not exporting outside this namespace
Copy link
Member

Choose a reason for hiding this comment

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

this's the only thing different?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Substantively yes

@keithmattix
Copy link
Contributor Author

did we get this documented as well?

I'm trying to track down where the change occurred and add a release note

@ericvn
Copy link
Contributor

ericvn commented Apr 23, 2024

I'm trying to track down where the change occurred and add a release note

Did you find/create the release note? I don't think that effort needs to hold this PR out, so once the extraneous file is removed, this is ready for merge?

Signed-off-by: Keith Mattix II <keithmattix@microsoft.com>
@keithmattix
Copy link
Contributor Author

@ericvn correct

@keithmattix keithmattix added the cherrypick/release-1.22 Set this label on a PR to auto-merge it to the release-1.22 branch label Apr 23, 2024
@keithmattix
Copy link
Contributor Author

The context can be found in istio/istio#50478

@keithmattix
Copy link
Contributor Author

/test doc.test.profile-demo
Flake?

@kfaseela
Copy link
Member

/retest

@ericvn ericvn removed the cherrypick/release-1.22 Set this label on a PR to auto-merge it to the release-1.22 branch label Apr 23, 2024
@ericvn
Copy link
Contributor

ericvn commented Apr 23, 2024

Removed the cherry-pick 1.22 label since we don't branch 1.22 until the actual release of 1.22.0. For now, the master branch reflects what will be released in 1.22.0 (and at preliminary.istio.io).

@istio-testing istio-testing merged commit 600676f into istio:master Apr 23, 2024
12 checks passed
wilsonwu added a commit to wilsonwu/istio.io that referenced this pull request Apr 24, 2024
istio-testing pushed a commit that referenced this pull request Apr 24, 2024
* Sync #14914 fix egress mtls origination test into Chinese

* Apply suggestions from code review

Co-authored-by: Michael <haifeng.yao@daocloud.io>

---------

Co-authored-by: Michael <haifeng.yao@daocloud.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants