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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: Fix hubble-relay tag pull for release branches #12034

Merged
merged 1 commit into from
Jun 12, 2020

Conversation

joestringer
Copy link
Member

@joestringer joestringer commented Jun 12, 2020

(The following was written from the perspective of the v1.8 branch)

In the CI framework we build images from the current tree and tag them
as latest, even if the current tree is for instance v1.8 (with
version v1.8.0-rc2).

At the same time, the Helm charts in the tree specify in the files that
they will pull the current tag from VERSION, for instance right now
on v1.8 branch, v1.8.0-rc2.

For cilium and operator images, we override the helm chart
defaults with latest to pick up the build/cached images from the first
step above. So latest contains the version built from v1.8.

However we weren't doing this for Hubble Relay, which meant that it
tried to pull the image with the tag v1.8.0-rc2 but this image didn't
exist in the local registry.

To fix this and get the v1.8 tree to properly build with a version of
hubble-relay from v1.8 branch, we must tag, cache and deploy images that
represent the latest v1.8 development with latest, and pull that image
from the CI framework, and explicitly not pull the v1.8 version which
is specified in the helm charts.

馃く

In the CI framework we build images from the current tree and tag them
as `latest`, even if the current tree is for instance `v1.8` (with
version `v1.8.0-rc2`).

At the same time, the Helm charts in the tree specify in the files that
they will pull the current tag from `VERSION`, for instance right now
on v1.8 branch, `v1.8.0-rc2`.

For `cilium` and `operator` images, we *override* the helm chart
defaults with `latest` to pick up the build/cached images from the first
step above. So `latest` contains the version built from `v1.8`.

However we weren't doing this for Hubble Relay, which meant that it
tried to pull the image with the tag `v1.8.0-rc2` but this image didn't
exist in the local registry.

To fix this and get the v1.8 tree to properly build with a version of
hubble-relay from v1.8 branch, we must tag, cache and deploy images that
represent the latest v1.8 development with `latest`, and pull that image
from the CI framework, and explicitly *not* pull the v1.8 version which
is specified in the helm charts.

:exploding_head:

Signed-off-by: Joe Stringer <joe@cilium.io>
@joestringer joestringer added release-note/misc This PR makes changes that have no direct user impact. backport-done/1.8 labels Jun 12, 2020
@joestringer joestringer requested a review from a team as a code owner June 12, 2020 00:08
@maintainer-s-little-helper maintainer-s-little-helper bot added this to In progress in 1.8.0 Jun 12, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Backport done to v1.8 in 1.8.0 Jun 12, 2020
Copy link
Contributor

@michi-covalent michi-covalent left a comment

Choose a reason for hiding this comment

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

馃く

@joestringer
Copy link
Member Author

test-focus K8sHubbleTest

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.02%) to 37.008% when pulling 8228ec6 on joestringer:submit/fix-hubble-relay-tags into a50fa3d on cilium:master.

@aanm aanm merged commit 6a8eb0f into cilium:master Jun 12, 2020
1.8.0 automation moved this from In progress to Merged Jun 12, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport done to v1.8 to Needs backport from master in 1.8.0 Jun 12, 2020
@aanm
Copy link
Member

aanm commented Jun 12, 2020

It was backported in #12027

@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport done to v1.8 in 1.8.0 Jun 12, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note/misc This PR makes changes that have no direct user impact.
Projects
No open projects
1.8.0
  
Merged
1.8.0
Backport done to v1.8
Development

Successfully merging this pull request may close these issues.

None yet

5 participants