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.

Sign up for GitHub

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

Jump to bottom

add cilium v1.14 and canal v3.26 #12561

Merged
merged 10 commits into from
Aug 18, 2023
Merged

add cilium v1.14 and canal v3.26 #12561

merged 10 commits into from
Aug 18, 2023

Conversation

mate4st
Copy link
Contributor

@mate4st mate4st commented Aug 15, 2023 •
edited

What this PR does / why we need it:

Bump Canal and Cilium CNI to next version.

Cilium v1.14 is confirmed to fix #12104

Update Cilium v1.11 and v1.12 to latest patch.

The Helm values clusterPoolIPv4PodCIDR and clusterPoolIPv6PodCIDR were deprecated and removed in Cilium v1.14, therefore I replaced it with clusterPoolIPv4PodCIDRList and clusterPoolIPv6PodCIDRList which was already available in v1.13. This is only relevant for Cilium installed as application (v1.13+)

What type of PR is this?

/kind chore

Special notes for your reviewer:

Does this PR introduce a user-facing change? Then add your Release Note here:

Add support for canal v3.26.1 and cilium 1.14.1
Update Cilium v1.11 and v1.12 to latest patch release.
Remove and replace deprecated clusterPoolIPv4PodCIDR and clusterPoolIPv6PodCIDR helm value with clusterPoolIPv4PodCIDRList and clusterPoolIPv6PodCIDRList for Cilium 1.13+
Deprecating canal v3.23

Documentation:

NONE

@kubermatic-bot kubermatic-bot added docs/none Denotes a PR that doesn't need documentation (changes). release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/chore Updating grunt tasks etc; no production code changes. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. sig/app-management Denotes a PR or issue as being assigned to SIG App Management. sig/networking Denotes a PR or issue as being assigned to SIG Networking. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Aug 15, 2023
@mate4st
Copy link
Contributor Author

mate4st commented Aug 16, 2023

/test pre-kubermatic-test

@mate4st
Copy link
Contributor Author

mate4st commented Aug 16, 2023

/test pre-kubermatic-cilium-e2e

@mate4st
Copy link
Contributor Author

mate4st commented Aug 16, 2023

/retest

@mate4st mate4st self-assigned this Aug 17, 2023
xrstf
xrstf reviewed Aug 17, 2023
View reviewed changes
pkg/cni/cilium/cilium.go
@@ -268,7 +280,7 @@ func ValidateValuesUpdate(newValues, oldValues map[string]any, fieldPath *field.
func validateImmutableValues(newValues, oldValues map[string]any, fieldPath *field.Path, immutableValues []string) field.ErrorList {
allErrs := field.ErrorList{}
for _, v := range immutableValues {
if !reflect.DeepEqual(newValues[v], oldValues[v]) {
Copy link
Contributor

@xrstf xrstf Aug 17, 2023 •
edited

Choose a reason for hiding this comment

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

Can we define this as a

// compareMaps is needed because DeepEqual doesn't work for ......
func equalMaps(a, b ........) bool {
   return ......
}

Copy link
Contributor

Choose a reason for hiding this comment

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

I say this because this is that type of code that I would come across, wonder "why isn't this just using reflect.DeepEqual?", change it and subtly break something. Explaning why a standard function doesn't apply is vital :)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Are you fine with writing a test for the validateImmutableValues function instead?

Copy link
Contributor

Choose a reason for hiding this comment

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

How would that look like? What are you then testing and how would that test ensure that the actual code is working?

embik
embik approved these changes Aug 18, 2023
View reviewed changes
Copy link
Member

@embik embik left a comment

Choose a reason for hiding this comment

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

/approve

after speaking to @xrstf.

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Aug 18, 2023
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 861a910c9def3fa0dc3342fcc71531a486302725

@xrstf
Copy link
Contributor

xrstf commented Aug 18, 2023

/approve

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: embik, WeirdMachine, xrstf

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

@kubermatic-bot kubermatic-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 18, 2023
@kubermatic-bot kubermatic-bot merged commit f0cb4e1 into kubermatic:main Aug 18, 2023
20 checks passed
@kubermatic-bot kubermatic-bot added this to the KKP 2.24 milestone Aug 18, 2023
@embik embik mentioned this pull request Oct 31, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xrstf xrstf xrstf left review comments

@embik embik embik approved these changes

Assignees

@embik embik

@mate4st mate4st

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. docs/none Denotes a PR that doesn't need documentation (changes). kind/chore Updating grunt tasks etc; no production code changes. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/app-management Denotes a PR or issue as being assigned to SIG App Management. sig/networking Denotes a PR or issue as being assigned to SIG Networking. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
KKP 2.24
Development

Successfully merging this pull request may close these issues.

Cilium does not meet systemd based distribution requirements
4 participants
@mate4st @kubermatic-bot @xrstf @embik