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

🌱 Update Calico in e2e tests to v3.24.0 #1606

Merged

Conversation

johananl
Copy link
Member

@johananl johananl commented Aug 29, 2022

What this PR does / why we need it: This PR updates the Calico manifest used by the e2e tests to v3.24.0. It also fixes #1605.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #1605

Special notes for your reviewer:

This is a large diff. To ensure it is up to date with upstream, run the following:

curl https://raw.githubusercontent.com/johananl/cluster-api-provider-vsphere/johananl/e2e-update-calico/test/e2e/data/cni/calico/calico.yaml > pr.yaml
curl https://raw.githubusercontent.com/projectcalico/calico/v3.24.0/manifests/calico.yaml > upstream.yaml
diff upstream.yaml pr.yaml && echo "OK"

To test this PR, follow the reproduction instructions of #1605 and ensure the pods converge.

Please confirm that if this PR changes any image versions, then that's the sole change this PR makes.

Release note:

Update Calico to `v3.24.0` in e2e tests.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Aug 29, 2022
@k8s-ci-robot k8s-ci-robot requested review from MaxRink and srm09 August 29, 2022 16:17
Copy link
Contributor

@srm09 srm09 left a comment

Choose a reason for hiding this comment

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

Use quay.io prefix URLs for images instead of the docker.io URLs since they are rate limited.

Docker Hub is rate limited.

Signed-off-by: Johanan Liebermann <[email protected]>
@johananl
Copy link
Member Author

johananl commented Sep 1, 2022

Use quay.io prefix URLs for images instead of the docker.io URLs since they are rate limited.

Good point, thanks. I can see that the Calico maintainers have switched to quay.io as the official registry lately. Looks like they're going to update the manifests soon, too, so hopefully next time we shouldn't have to manually patch the official manifests.

For the record, here is what I used to switch to Quay in this PR:

sed -i 's/image: docker.io/image: quay.io/g' test/e2e/data/cni/calico/calico.yaml

@johananl
Copy link
Member Author

johananl commented Sep 1, 2022

The registry has been updated to quay.io @srm09.

@johananl
Copy link
Member Author

johananl commented Sep 1, 2022

Broken CI is fixed in #1608 #1602.

@johananl
Copy link
Member Author

johananl commented Sep 1, 2022

/hold

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 1, 2022
@srm09
Copy link
Contributor

srm09 commented Sep 7, 2022

/retitle 🌱 Update Calico in e2e tests to v3.24.0

@k8s-ci-robot k8s-ci-robot changed the title Update Calico in e2e tests to v3.24.0 🌱 Update Calico in e2e tests to v3.24.0 Sep 7, 2022
@randomvariable
Copy link
Member

randomvariable commented Sep 7, 2022

looks like the test failure is unrelated?
/override pull-cluster-api-provider-vsphere-test

probably don't have permissions to do that.

@randomvariable
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 7, 2022
@srm09
Copy link
Contributor

srm09 commented Sep 7, 2022

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: srm09

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 Sep 7, 2022
@srm09
Copy link
Contributor

srm09 commented Sep 7, 2022

/unhold

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 7, 2022
@johananl
Copy link
Member Author

johananl commented Sep 8, 2022

looks like the test failure is unrelated? /override pull-cluster-api-provider-vsphere-test

probably don't have permissions to do that.

The broken CI is indeed unrelated to this change (see my comment above). We are waiting for #1602 to get merged.

@srm09
Copy link
Contributor

srm09 commented Sep 9, 2022

/retest

@k8s-ci-robot k8s-ci-robot merged commit a1e74af into kubernetes-sigs:main Sep 9, 2022
@johananl johananl deleted the johananl/e2e-update-calico branch September 9, 2022 09:40
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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

calico-node pods are crashlooping in e2e tests
4 participants