Skip to content

Conversation

YutaroHayakawa
Copy link
Member

@YutaroHayakawa YutaroHayakawa commented May 27, 2024

I mistakenly bumped up the golang image version in hubble-relay Dockerfile in the v1.15 backport. Revert it. Also, let me piggy-back the very small cosmetic change bugfix for GHA.

Fixes: #32691

Revert golang image version of hubble-relay

@maintainer-s-little-helper maintainer-s-little-helper bot added backport/1.15 This PR represents a backport for Cilium 1.15.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master. labels May 27, 2024
@YutaroHayakawa
Copy link
Member Author

/test-backport-1.15

240163b mistakenly bumped the golang
1.22.X image version due to the mistake in the conflict resolution. Set
it back to 1.21.X version.

Fixes: 240163b

Signed-off-by: Yutaro Hayakawa <yutaro.hayakawa@isovalent.com>
Signed-off-by: Yutaro Hayakawa <yutaro.hayakawa@isovalent.com>
@YutaroHayakawa YutaroHayakawa force-pushed the yutaro/backport-followup branch from a08d128 to 5c56009 Compare May 28, 2024 07:38
@YutaroHayakawa YutaroHayakawa changed the title Revert golang image version of hubble-relay v1.15: Revert the change to the golang image version of hubble-relay May 28, 2024
@YutaroHayakawa YutaroHayakawa marked this pull request as ready for review May 28, 2024 07:47
@YutaroHayakawa YutaroHayakawa requested review from a team as code owners May 28, 2024 07:47
@YutaroHayakawa YutaroHayakawa requested review from aanm and nebril May 28, 2024 07:47
@@ -446,7 +446,7 @@ jobs:
--sysdump-output-filename "cilium-sysdump-${{ matrix.name }}-<ts>" \
--junit-file "cilium-junits/${{ env.job_name }} (${{ join(matrix.*, ', ') }}).xml" \
--junit-property github_job_step="Run tests upgrade 2 (${{ join(matrix.*, ', ') }})" \
\$EXTRA
$EXTRA
Copy link
Contributor

Choose a reason for hiding this comment

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

So this gets rid of unnecessary escaping?

Copy link
Member Author

@YutaroHayakawa YutaroHayakawa May 28, 2024

Choose a reason for hiding this comment

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

Oh, yeah. I was thinking it is just a cosmetic thing, but actually it was mistakenly escaped.

In the upstream, it is fixed:

@aanm
Copy link
Member

aanm commented May 28, 2024

/test-backport-1.15

@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 May 29, 2024
@joestringer joestringer merged commit 4203bd6 into cilium:v1.15 May 29, 2024
michi-covalent added a commit to cilium/release that referenced this pull request Jun 18, 2024
In my env, the command `tail -n+4 CHANGELOG.md | sed '/^## v.*$/q'`
includes the version header of the previous command. Grep it out.

    % tail -n+4 CHANGELOG.md | sed '/^## v.*$/q'

    Summary of Changes
    ------------------

    **Minor Changes:**
    ...
    * Revert golang image version of hubble-relay (cilium/cilium#32732, @YutaroHayakawa)

    ## v1.15.5

Signed-off-by: Michi Mutsuzaki <michi@isovalent.com>
aanm pushed a commit to cilium/release that referenced this pull request Jun 18, 2024
In my env, the command `tail -n+4 CHANGELOG.md | sed '/^## v.*$/q'`
includes the version header of the previous command. Grep it out.

    % tail -n+4 CHANGELOG.md | sed '/^## v.*$/q'

    Summary of Changes
    ------------------

    **Minor Changes:**
    ...
    * Revert golang image version of hubble-relay (cilium/cilium#32732, @YutaroHayakawa)

    ## v1.15.5

Signed-off-by: Michi Mutsuzaki <michi@isovalent.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/1.15 This PR represents a backport for Cilium 1.15.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master. ready-to-merge This PR has passed all tests and received consensus from code owners to merge.
Projects
No open projects
Status: Released
Development

Successfully merging this pull request may close these issues.

5 participants