envoy: Support more envoy image tag formats #24750
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
sayboras
added
needs-backport/1.11
needs-backport/1.13
This commit is to add the support for below image tags Different envoy image tag formats: ``` quay.io/cilium/cilium-envoy:f195a0a836629ceca5d7561f758c9505d9ebaebfa262647a2d4 quay.io/cilium/cilium-envoy:v1.23-f195a0a836629ceca5d7561f758c9505d9ebaebfa262647a2d4 ``` Testing was done as per below, kindly note the existing format should be working as usual. ```bash $ test=quay.io/cilium/cilium-envoy:014ceeb312a4d18dcf0ea219143f099fa91f2f28@sha256:1a3020822e8fb10b5f96bf45554690c411c2f48d8ca8fcf33da871dad1ce6b53 $ echo $test | sed -E -e 's/[^/]*\/[^:]*:([^:@]*).*/\1/p;d' | sed -E -e 's/.*-([^-]*)$/\1/' 014ceeb312a4d18dcf0ea219143f099fa91f2f28 $ test=quay.io/cilium/cilium-envoy:v1.24-014ceeb312a4d18dcf0ea219143f099fa91f2f28@sha256:1a3020822e8fb10b5f96bf45554690c411c2f48d8ca8fcf33da871dad1ce6b53 $ echo $test | sed -E -e 's/[^/]*\/[^:]*:([^:@]*).*/\1/p;d' | sed -E -e 's/.*-([^-]*)$/\1/' 014ceeb312a4d18dcf0ea219143f099fa91f2f28 ``` Fixes: cilium#24749 Signed-off-by: Tam Mach <tam.mach@cilium.io>
|
Full CI is not required, the current format is verified in GHA. |
|
/test |
|
/ci-awscni |
|
/ci-external-workloads |
jibi
approved these changes
Apr 5, 2023
There was a problem hiding this comment.
Looks good 👍
non blocking nit: perhaps we can merge the 2 seds commands?
Something like:
➜ ~ cat test.sh
test=quay.io/cilium/cilium-envoy:014ceeb312a4d18dcf0ea219143f099fa91f2f28@sha256:1a3020822e8fb10b5f96bf45554690c411c2f48d8ca8fcf33da871dad1ce6b53
echo $test | sed -E -e 's/[^/]*\/[^:]*:(.*-)?([^:@]*).*/\2/p;d'
test=quay.io/cilium/cilium-envoy:v1.24-014ceeb312a4d18dcf0ea219143f099fa91f2f28@sha256:1a3020822e8fb10b5f96bf45554690c411c2f48d8ca8fcf33da871dad1ce6b53
echo $test | sed -E -e 's/[^/]*\/[^:]*:(.*-)?([^:@]*).*/\2/p;d'
➜ ~ ./test.sh
014ceeb312a4d18dcf0ea219143f099fa91f2f28
014ceeb312a4d18dcf0ea219143f099fa91f2f28
(please double test this as I'm a bit rusty with regexes)
sayboras
added
release-note/misc
|
There was an issue with MLH, so Mergeability is stuck. Considered that all CI jobs are successful, review is in, marking this ready to merge. |
sayboras
added
the
ready-to-merge
tklauser
reviewed
Apr 11, 2023
sayboras
added a commit
to sayboras/cilium
that referenced
this pull request
Apr 11, 2023
Relates: cilium#24750 (review) Signed-off-by: Tam Mach <tam.mach@cilium.io>
sayboras
removed
needs-backport/1.11
needs-backport/1.13
tklauser
pushed a commit
that referenced
this pull request
Apr 12, 2023
Relates: #24750 (review) Signed-off-by: Tam Mach <tam.mach@cilium.io>
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.
This commit is to add the support for the below image tags
Different envoy image tag formats:
Testing was done as per below, kindly note the existing format should be working as usual.
Fixes: #24749