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

Added canal's "IP autodetection methods " option in Canal chart #208

Merged
merged 4 commits into from
Jan 27, 2022

Conversation

n-guitar
Copy link
Contributor

@n-guitar n-guitar commented Jan 8, 2022

・Added canal's "IP autodetection methods " option
https://projectcalico.docs.tigera.io/reference/node/configuration#ip-autodetection-methods

・This will fix the following requirements
rancher/rke2#2324

・It has been tested in the following environments

Linux:5.4.0-92-generic #103-Ubuntu SMP Fri Nov 26 16:13:00 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux
rke2:v1.22.5+rke2r1

@n-guitar n-guitar changed the title Added canal's "IP autodetection methods " option in Calico chart Added canal's "IP autodetection methods " option in Canal chart Jan 12, 2022
@manuelbuil
Copy link
Contributor

Could you rebase please? There is a conflicting file. Then I could review and merge :)

Comment on lines 2 to 3
# This repository does not use releaseCandidateVersions, so you can leave this as 00.
releaseCandidateVersion: 00
Copy link
Contributor

Choose a reason for hiding this comment

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

Why do you add this?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

hi @manuelbuil
Thanks for the review.
It was included when I "forked" the file, so I left it in.
If it is not needed, we will delete it.

Copy link
Contributor

Choose a reason for hiding this comment

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

AFAIK, this is not needed. However, in that same file, you should increase the packageVersion, otherwise CI will complain

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thank you very much for your kindness.
I have deleted it.

Copy link
Contributor

Choose a reason for hiding this comment

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

You forgot to increase the packageVersion in packages/rke2-canal/package.yaml. That's why CI is failing

Copy link
Contributor Author

Choose a reason for hiding this comment

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

sorry for talomg up your time.
Updated 07 to 08.
Thanks for the review.

Copy link
Contributor

Choose a reason for hiding this comment

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

thanks!

Delete unnecessary version information.
Update packageVersion.
@manuelbuil manuelbuil merged commit b27e243 into rancher:main-source Jan 27, 2022
github-actions bot pushed a commit that referenced this pull request Jan 27, 2022
Added canal's "IP autodetection methods " option in Canal chart
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants