Add Calico v3.17.3 and v3.18.1 #7524

cristicalin · 2021-04-18T16:29:55Z

What type of PR is this?

Uncomment only one /kind <> line, hit enter to put that in a new line, and remove leading whitespaces from that line:

/kind api-change
/kind bug
/kind cleanup
/kind design
/kind documentation
/kind failing-test
/kind feature
/kind flake

What this PR does / why we need it:

This PR adds the necessary hashes to support Calico versions 3.17 and 3.18 (while bumping the default to 3.17.3).

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

The release notes for versions 3.17 and 3.18 compared to the aging 3.16 are long so I include just the links here:

Does this PR introduce a user-facing change?:

Upgrade default calico network plugin to version 3.17.3

k8s-ci-robot · 2021-04-18T16:30:03Z

Hi @cristicalin. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

champtar · 2021-04-18T18:09:19Z

I'm not following calico closely but why not 3.18.1 ?

cristicalin · 2021-04-18T19:02:42Z

My rationale was to add that in a separate PR to keep review effort focused on 1 change at a time.

I added the hashes for 3.18.1 as well in a separate commit but kept the default to 3.17.3 unless you think I should bump the default to 3.18.1 as well.

One thing that I'm not fully sure is if to go from 3.16.9 to 3.18.1 we would need to go through 3.17.3 as an interim version, I have to do some testing in that area.

floryut

/ok-to-test

Fine to upgrade only to 3.17.3, we could always bump to 3.18.x later on

cristicalin · 2021-04-19T10:08:52Z

I have a suspicion that the CI failure is unrelated (markdown job failed in a git fetch), could you re-trigger it?

champtar · 2021-04-19T16:24:56Z

Relaunched, kubespray CI always need a bit of love to pass :P

cristicalin · 2021-04-20T08:44:24Z

This time the issue was with Calico 3.17 and newer crd files missing the --- yaml separator. I fixed this and tested both 3.17.3 and 3.18.1 deployments.

It turns out my hash for the 3.18 archive was also wrong so I also fixed it.

@floryut can you bless another CI run?

floryut · 2021-04-20T08:45:50Z

This time the issue was with Calico 3.17 and newer crd files missing the --- yaml separator. I fixed this and tested both 3.17.3 and 3.18.1 deployments.

It turns out my hash for the 3.18 archive was also wrong so I also fixed it.

@floryut can you bless another CI run?

CI is running right now, no error for now 🙏

cristicalin · 2021-04-20T12:03:39Z

Again last failure seems unrelated to this change.

champtar · 2021-04-21T14:15:10Z

roles/network_plugin/calico/tasks/install.yml

@@ -119,12 +119,13 @@
        -e '/^\s{2,4}annotations:/{:1;/\(devel\)$/!{N;b 1}; /.*/d}'
        {{ local_release_dir }}/calico-{{ calico_version }}-kdd-crds/*.yaml
      when:
-        - calico_version is version('v3.17.0', '<')
+        - calico_version is version('v3.19.0', '<')


Are you sure about this one ?
I think those annotations are not present in 3.17+

Indeed, I looked over the CRDs from 3.17 and 3.18 and they were not there. I just assumed that since there was no other mention of 3.17 before this patch that when condition was an upper bound. That said, the command itself is harmless since it will not change anything in the 3.17+ CRD files but I removed the unnecessary change anyway.

I agree it's harmless but in kubespray we tend to carry workaround for way longer than needed, once we remove the 3.17 hash we can also remove this task ;)

champtar · 2021-04-21T14:15:43Z

/cc @champtar

champtar

see previous message

k8s-ci-robot · 2021-04-21T14:56:07Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: champtar, cristicalin, floryut

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:

~~OWNERS~~ [floryut]

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

champtar · 2021-04-21T14:57:38Z

we will have to wait for #7535 to get merged and maybe need rebase

cristicalin · 2021-04-21T16:07:36Z

Rebased after #7535 was merged as requested.

champtar · 2021-04-21T16:38:36Z

/lgtm

champtar · 2021-04-21T17:50:30Z

you forgot to update the README

* add hashes for calico v3.17.3 * add hashes for claico v3.18.1 * bump default calico version to v3.17.3 * calico crds are missing yaml separator breaking kdd

* Add Calico v3.17.3 and v3.18.1 (kubernetes-sigs#7524) * add hashes for calico v3.17.3 * add hashes for claico v3.18.1 * bump default calico version to v3.17.3 * calico crds are missing yaml separator breaking kdd * Calico new versions v3.17.4 and v3.18.2 (kubernetes-sigs#7563) * calico: upgrade from v3.17.3 to v3.17.4 * calico: upgrade from v3.18.1 to v3.18.2 * Fixes issue kubernetes-sigs#7573 - Made Calico permissions compatible with v3.18.x (see projectcalico/calico#4557). Specifically, granted watch to custom resources blockaffinities, ipamblocks & ipamhandles (kubernetes-sigs#7575) * bump calico 3.18 to v3.18.3 (kubernetes-sigs#7592) * Support Calico advertisement of MetalLB LoadBalancer IPs (kubernetes-sigs#7593) * add initial MetalLB docs * metallb allow disabling the deployment of the metallb speaker * calico>=3.18 allow using calico to advertise service loadbalancer IPs * Document the use of MetalLB and Calico * clean MetalLB docs Co-authored-by: Cristian Calin <[email protected]> Co-authored-by: holmesb <[email protected]>

* add hashes for calico v3.17.3 * add hashes for claico v3.18.1 * bump default calico version to v3.17.3 * calico crds are missing yaml separator breaking kdd

k8s-ci-robot added kind/feature Categorizes issue or PR as related to a new feature. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Apr 18, 2021

k8s-ci-robot requested review from bozzo and EppO April 18, 2021 16:30

k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Apr 18, 2021

k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Apr 18, 2021

cristicalin force-pushed the calico_v3.17.3 branch from cebc036 to fa1026b Compare April 18, 2021 19:06

k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Apr 18, 2021

cristicalin changed the title ~~Calico v3.17.3~~ Add Calico v3.17.3 and v3.18.1 Apr 18, 2021

floryut approved these changes Apr 19, 2021

View reviewed changes

k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 20, 2021

cristicalin force-pushed the calico_v3.17.3 branch from 3c3a8ad to 4f760e8 Compare April 20, 2021 06:47

k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Apr 20, 2021

champtar reviewed Apr 21, 2021

View reviewed changes

k8s-ci-robot requested a review from champtar April 21, 2021 14:15

champtar suggested changes Apr 21, 2021

View reviewed changes

cristicalin force-pushed the calico_v3.17.3 branch 2 times, most recently from 4ba1a43 to 72a809c Compare April 21, 2021 14:54

champtar approved these changes Apr 21, 2021

View reviewed changes

cristicalin added 4 commits April 21, 2021 16:06

add hashes for calico v3.17.3

9489831

add hashes for claico v3.18.1

8ad2d6f

bump default calico version to v3.17.3

baf55d1

calico crds are missing yaml separator breaking kdd

0f72c03

cristicalin force-pushed the calico_v3.17.3 branch from 72a809c to 0f72c03 Compare April 21, 2021 16:06

k8s-ci-robot assigned champtar Apr 21, 2021

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 21, 2021

k8s-ci-robot merged commit add6186 into kubernetes-sigs:master Apr 21, 2021

cristicalin mentioned this pull request Apr 22, 2021

update calico default version in README.md #7537

Merged

faruryo mentioned this pull request Apr 25, 2021

calico-kube-controller becomes Error #7547

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Calico v3.17.3 and v3.18.1 #7524

Add Calico v3.17.3 and v3.18.1 #7524

cristicalin commented Apr 18, 2021 •

edited

Loading

k8s-ci-robot commented Apr 18, 2021

champtar commented Apr 18, 2021

cristicalin commented Apr 18, 2021 •

edited

Loading

floryut left a comment

cristicalin commented Apr 19, 2021

champtar commented Apr 19, 2021

cristicalin commented Apr 20, 2021

floryut commented Apr 20, 2021

cristicalin commented Apr 20, 2021

champtar Apr 21, 2021

cristicalin Apr 21, 2021

champtar Apr 21, 2021

champtar commented Apr 21, 2021

champtar left a comment

k8s-ci-robot commented Apr 21, 2021

champtar commented Apr 21, 2021

cristicalin commented Apr 21, 2021

champtar commented Apr 21, 2021

champtar commented Apr 21, 2021

Add Calico v3.17.3 and v3.18.1 #7524

Add Calico v3.17.3 and v3.18.1 #7524

Conversation

cristicalin commented Apr 18, 2021 • edited Loading

k8s-ci-robot commented Apr 18, 2021

champtar commented Apr 18, 2021

cristicalin commented Apr 18, 2021 • edited Loading

floryut left a comment

Choose a reason for hiding this comment

cristicalin commented Apr 19, 2021

champtar commented Apr 19, 2021

cristicalin commented Apr 20, 2021

floryut commented Apr 20, 2021

cristicalin commented Apr 20, 2021

champtar Apr 21, 2021

Choose a reason for hiding this comment

cristicalin Apr 21, 2021

Choose a reason for hiding this comment

champtar Apr 21, 2021

Choose a reason for hiding this comment

champtar commented Apr 21, 2021

champtar left a comment

Choose a reason for hiding this comment

k8s-ci-robot commented Apr 21, 2021

champtar commented Apr 21, 2021

cristicalin commented Apr 21, 2021

champtar commented Apr 21, 2021

champtar commented Apr 21, 2021

cristicalin commented Apr 18, 2021 •

edited

Loading

cristicalin commented Apr 18, 2021 •

edited

Loading