Skip to content

🐛 Fix e2e test by using quay.io for images #239

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

Merged
merged 1 commit into from
May 21, 2024

Conversation

jimmidyson
Copy link
Member

@jimmidyson jimmidyson commented May 16, 2024

Images are not automatically published to MCR on each Calico release to use quay.io instead, where Calico images are pushed as part of the Calico release process (see https://github.com/projectcalico/calico/blob/master/hack/release/pkg/builder/builder.go#L29-L37).

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label May 16, 2024
@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label May 16, 2024
@jimmidyson
Copy link
Member Author

/cc @mboersma

@k8s-ci-robot k8s-ci-robot requested a review from mboersma May 16, 2024 15:39
@jimmidyson jimmidyson changed the title 🐛 Fix e2e test by removing override of calico images 🐛 Fix e2e test by fixing version of calico May 16, 2024
@jimmidyson jimmidyson force-pushed the jimmi/fix-e2e-calico branch from 7341009 to f1044e8 Compare May 16, 2024 16:20
@k8s-ci-robot k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels May 16, 2024
@jimmidyson
Copy link
Member Author

/test pull-cluster-api-addon-provider-helm-e2e

@jimmidyson jimmidyson force-pushed the jimmi/fix-e2e-calico branch from f1044e8 to 5508caa Compare May 16, 2024 16:57
Copy link
Contributor

@mboersma mboersma left a comment

Choose a reason for hiding this comment

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

/lgtm
/assign @Jont828

Thanks @jimmidyson!

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 17, 2024
Images are not autoamtically pulished to MCR to use quay.io instead.
@jimmidyson jimmidyson force-pushed the jimmi/fix-e2e-calico branch from 5508caa to 6155c06 Compare May 20, 2024 15:01
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels May 20, 2024
@jimmidyson
Copy link
Member Author

@mboersma I made a change to actually pull images from quay.io instead of mcr.microsoft.com as Calico publishes images there on release - that means we don't need to specify the Calico version so won't need to keep updating manually in future.

@mboersma
Copy link
Contributor

that means we don't need to specify the Calico version

That's great, but I'm confused: I don't see where we specify the Calico version currently or how this PR changes this. Just because new releases will show up right away at quay.io rather than eventually at mcr.microsoft.com/oss?

I think there's a slight advantage to using the existing source, because (since I work at Microsoft) I've seen that build pipeline and I know it includes a lot of code scanning, security checks, and is done in a trusted build environment. So I think these images are potentially "safer," but I may be wrong and I'm not opposed to quay.io.

@jackfrancis @Jont828 do you have an opinion on changing the source of the Calico images?

@jimmidyson
Copy link
Member Author

@mboersma

I don't see where we specify the Calico version currently or how this PR changes this

Current main does not specify the Calico version. My original commit in this PR (5508caa) that you lgtmed did specify the version to use, but I changed that in the latest commit to use the official open source images pushed as part of the calico release to quay.io. That removed the need to specify the Calico version as the latest version is always available.

As for image scanning, etc as this is only used for e2e tests, not production deployments, I personally wouldn't worry about that so much, especially as the images are pushed as part of the official Calico project release pipelines, not replicated there by some other process.

@jimmidyson jimmidyson changed the title 🐛 Fix e2e test by fixing version of calico 🐛 Fix e2e test by using quay.io for images May 21, 2024
Copy link
Contributor

@mboersma mboersma left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 21, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jimmidyson, mboersma

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 21, 2024
@k8s-ci-robot k8s-ci-robot merged commit 7a72ba6 into kubernetes-sigs:main May 21, 2024
1 check passed
@jimmidyson jimmidyson deleted the jimmi/fix-e2e-calico branch May 21, 2024 12:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

4 participants