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

[Cherry-Pick] Use calico_pool_blocksize from cluster when existing (#10516) #10770

Conversation

cyclinder
Copy link
Contributor

The blockSize attribute from Calico IPPool resources cannot be changed once set 1. Consequently, we use the one currently defined when configuring the existing IPPool, avoiding upgrade errors by trying to change it.

In particular, this can be useful when calico_pool_blocksize default changes in kubespray, which would otherwise force users to add an explicit setting to their inventories.

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:

The blockSize attribute from Calico IPPool resources cannot be changed
once set 1. Consequently, we use the one currently defined when
configuring the existing IPPool, avoiding upgrade errors by trying to
change it.

Which issue(s) this PR fixes:

#9055 (comment)

Special notes for your reviewer:

this PR cherry-pick #10516 to release-2.20

Does this PR introduce a user-facing change?:


…#10516)

The blockSize attribute from Calico IPPool resources cannot be changed
once set [1]. Consequently, we use the one currently defined when
configuring the existing IPPool, avoiding upgrade errors by trying to
change it.

In particular, this can be useful when calico_pool_blocksize default
changes in kubespray, which would otherwise force users to add an
explicit setting to their inventories.

[1]: https://docs.tigera.io/calico/latest/reference/resources/ippool#spec
@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jan 5, 2024
@k8s-ci-robot k8s-ci-robot requested a review from bozzo January 5, 2024 07:34
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: cyclinder
Once this PR has been reviewed and has the lgtm label, please assign cristicalin for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found 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

@cyclinder cyclinder changed the title [Cheery-Pick] Use calico_pool_blocksize from cluster when existing (#10516) [Cherry-Pick] Use calico_pool_blocksize from cluster when existing (#10516) Jan 5, 2024
@VannTen
Copy link
Contributor

VannTen commented Jan 5, 2024

Be aware that this does not completely advert the need to explicitly set calico_pool_blocksize in inventories (unfortunately). There is a check (in preinstall, I think) which verify that we have the correct blocksize, I need to change that as well. Didn't had time for that yet unfortunately

@cyclinder
Copy link
Contributor Author

Be aware that this does not completely advert the need to explicitly set calico_pool_blocksize in inventories (unfortunately).

At least, We can make sure it will work by default(If we don't set calico_pool_blocksize). Right?

@VannTen
Copy link
Contributor

VannTen commented Jan 12, 2024

Be aware that this does not completely advert the need to explicitly set calico_pool_blocksize in inventories (unfortunately).

At least, We can make sure it will work by default(If we don't set calico_pool_blocksize). Right?

No, precisely. There is another check in preinstall which check that calico_pool_blocksize == the one from the cluster, and since calico_pool_blocksize has a default... We should remove that check I think but I haven't taken the time to do the PR yet.

@floryut
Copy link
Member

floryut commented Jan 22, 2024

2.20 is no longer supported, moving to close this one, don't hesitate to comment/reach on slack if it seems extreme 👍

@floryut floryut closed this Jan 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants