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

ambient: integrate ztunnel builds #41633

Merged

Conversation

stevenctl
Copy link
Contributor

@stevenctl stevenctl commented Oct 25, 2022

This sets up the Istio repo to depend on https://github.com/isito/ztunnel

  • Download/build ztunnel
  • Put it in an image
  • Use that image in our ztunnel pod with the init container (instead of proxyv2)
  • Try to prep for integration tests using rust tunnel

Usage

  • By default, download the binary from GCR based on the SHA in istio.deps
  • If BUILD_ZTUNNEL is set, look in ../ztunnel and try to build from rust.
    • Right now this happens for all make targets since its part of init. Intended to allow make docker.ztunnel for rapid iteration with control plane + ztunnel changes.
    • This should be ok since the build is super fast
  • If BUILD_ZTUNNEL_REPOSITORY is set, do the same as BUILD_ZTUNNEL, but build from the specified directory

Change-Id: Icfbdcafa953d3af16307490d552a00d44e857866
@istio-testing istio-testing added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Oct 25, 2022
Steven Landow added 3 commits October 25, 2022 14:57
Change-Id: Ic91b929bf9afd3fff272f3acc6c439a0246ff8c3
Change-Id: Icbf04c969e9eca0c07ea336fd0f7859e48a79496
Change-Id: I46d9b96895e12c40774c18507bba1ad6571590c5
@stevenctl stevenctl changed the title ambient: separate ztunnel image ambient: integrate ztunnel builds Oct 26, 2022
@stevenctl
Copy link
Contributor Author

/test all

bin/build_ztunnel.sh Show resolved Hide resolved
tools/docker.yaml Outdated Show resolved Hide resolved
@@ -244,9 +244,6 @@ spec:
httpGet:
port: 15020 # TODO: use 15021, but it spams logs
Copy link
Member

Choose a reason for hiding this comment

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

We should probably make this 15021 (should work for envoy) then switch the ztunnel code to use 15021 as well.

In the meantime I suspect it won't get marked as ready

@zirain
Copy link
Member

zirain commented Oct 28, 2022

/test integ-ambient

Steven Landow added 3 commits October 31, 2022 10:49
Change-Id: Iba1f99f5942653b512ab966e450568e2bfbf53d1
Change-Id: I65f6a4e4979fad618bc46b83062a19b069dc7125
Change-Id: I1509854ee44eb8a7061b0732ca124a7f79129c76
cp -f "${2}" "${TARGET_OUT_LINUX}/ztunnel"
}

function maybe_build_ztunnel() {
Copy link
Member

Choose a reason for hiding this comment

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

Why not download like envoy proxy? IMO this will couple ztunnel and istio

Copy link
Contributor Author

Choose a reason for hiding this comment

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

"maybe" - by default we download it.

Rust proxy is 100x easier to build locally. If I'm quickly iterating on both proxy and control plane, this allows triggering the build of both in one step.

Copy link
Contributor Author

@stevenctl stevenctl left a comment

Choose a reason for hiding this comment

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

fix lint

stevenctl and others added 3 commits November 2, 2022 13:53
Change-Id: I3eb448f00bd70a444fccfa3b01b2f74346992844
Change-Id: I42b8df786aeb0ef0d24ab1ae17a2eb8623bfceff
@stevenctl
Copy link
Contributor Author

/retest

@istio-testing istio-testing merged commit 1ab9d5a into istio:experimental-ambient Nov 3, 2022
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.

None yet

5 participants