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

images: Support updating Envoy to PR images #27850

Merged
merged 1 commit into from Sep 12, 2023

Conversation

jrajahalme
Copy link
Member

@jrajahalme jrajahalme commented Aug 31, 2023

Update Envoy to PR build image when $proxy_branch is set to the PR branch name, e.g.:

$ proxy_branch=pr/my/branch images/scripts/update-cilium-envoy-image.sh

This will result in the image being pulled from cilium-envoy-dev instead of cilium-envoy and the tag consisting only of the Git commit SHA (no Envoy version prefix). sed line for Dockerfile update needs to be more explicit so that the image repo name can be updated both ways.

The github repo can also be overridden, with proxy_repo=my/repo (default is cilium/proxy). Note that this still only supports PRs build by the main repo as otherwise the image would not be available in quay.io/cilium/cilium-envoy-dev.

Error out if sha256 digest for the image is not (yet) available, rather than continuing with an empty digest, as we still have "use digest" configured.

Also fix the recommended build order as install/kubernetes has to be built before Documentation.

@jrajahalme jrajahalme added kind/enhancement This would improve or streamline existing functionality. release-note/misc This PR makes changes that have no direct user impact. area/build Anything to do with the build, more general then area/CI labels Aug 31, 2023
@jrajahalme jrajahalme requested a review from a team as a code owner August 31, 2023 14:30
@jrajahalme jrajahalme requested a review from jibi August 31, 2023 14:30
Copy link
Member

@mhofstetter mhofstetter left a comment

Choose a reason for hiding this comment

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

thanks, nice improvement!

only one non-blocking suggestion to to support forked github repos :)

images/scripts/update-cilium-envoy-image.sh Outdated Show resolved Hide resolved
Update Envoy to PR build image when $proxy_branch is set to the PR branch
name, e.g.:

  $ proxy_branch=pr/my/branch images/scripts/update-cilium-envoy-image.sh

This will result in the image being pulled from cilium-envoy-dev instead
of cilium-envoy and the tag consisting only of the Git commit SHA (no
Envoy version prefix). sed line for Dockerfile update needs to be more
explicit so that the image repo name can be updated both ways.

The github repo can also be overridden, with `proxy_repo=my/repo`
(default is `cilium/proxy`). Note that this still only supports PR
build by the main repo as otherwise the image would not be available
in quay.io/cilium/cilium-envoy-dev.

Error out if sha256 digest for the image is not (yet) available, rather
than continuing with an empty digest, as we still have "use digest"
configured.

Also fix the recommended build order as install/kubernetes has to be
built before Documentation.

Signed-off-by: Jarno Rajahalme <jarno@isovalent.com>
@jrajahalme
Copy link
Member Author

/test

@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Sep 12, 2023
@julianwiedmann julianwiedmann merged commit 6180087 into cilium:main Sep 12, 2023
61 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/build Anything to do with the build, more general then area/CI kind/enhancement This would improve or streamline existing functionality. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/misc This PR makes changes that have no direct user impact.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants