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

Add Canal CNI v3.22 support & make it the default CNI #9258

Merged
merged 3 commits into from Mar 9, 2022
Merged

Add Canal CNI v3.22 support & make it the default CNI #9258

merged 3 commits into from Mar 9, 2022

Conversation

rastislavs
Copy link
Contributor

@rastislavs rastislavs commented Mar 7, 2022

What does this PR do / Why do we need it:
Adds Canal CNI v3.22 (3.22.1) support & makes it the default CNI. This is the minimal Canal version that works with k8s 1.23.

Also makes sure that Canal automatically upgrades to v3.22 in user clusters with k8s v1.23 and higher and older Canal version.

Does this PR close any issues?:
Fixes #8842

Special notes for your reviewer:

Documentation:

Does this PR introduce a user-facing change?:

Add Canal CNI v3.22 support & make it the default CNI. 
NOTE: Automatically upgrades Canal to v3.22 in clusters with k8s v1.23 and higher and older Canal version.

Signed-off-by: Rastislav Szabo <rastislav@kubermatic.com>
@kubermatic-bot kubermatic-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. sig/api Denotes a PR or issue as being assigned to SIG API. sig/app-management Denotes a PR or issue as being assigned to SIG App Management. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Mar 7, 2022
…igher

Signed-off-by: Rastislav Szabo <rastislav@kubermatic.com>
Signed-off-by: Rastislav Szabo <rastislav@kubermatic.com>
@rastislavs
Copy link
Contributor Author

/retest

2 similar comments
@rastislavs
Copy link
Contributor Author

/retest

@rastislavs
Copy link
Contributor Author

/retest

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Mar 8, 2022
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 602093461bb8eab0ac5fe1ecf1ae6d4209496558

@lsviben
Copy link
Contributor

lsviben commented Mar 9, 2022

/approve

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lsviben, rastislavs

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 Mar 9, 2022
@kubermatic-bot kubermatic-bot merged commit abd48b7 into kubermatic:master Mar 9, 2022
@rastislavs
Copy link
Contributor Author

/cherry-pick release/v2.20

@kubermatic-bot
Copy link
Contributor

@rastislavs: #9258 failed to apply on top of branch "release/v2.20":

Applying: Add Canal CNI v3.22 support & make it the default CNI
.git/rebase-apply/patch:3994: trailing whitespace.
      - watch 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	pkg/handler/v1/cluster/cluster_test.go
M	pkg/handler/v2/cluster/cluster_test.go
M	pkg/webhook/cluster/validation/validation_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/webhook/cluster/validation/validation_test.go
CONFLICT (content): Merge conflict in pkg/webhook/cluster/validation/validation_test.go
Auto-merging pkg/handler/v2/cluster/cluster_test.go
Auto-merging pkg/handler/v1/cluster/cluster_test.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add Canal CNI v3.22 support & make it the default CNI
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release/v2.20

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.

kubermatic-bot pushed a commit that referenced this pull request Mar 10, 2022
* Add Canal CNI v3.22 support & make it the default CNI

Signed-off-by: Rastislav Szabo <rastislav@kubermatic.com>

* Automatically upgrade Canal to v3.22 in clusters with k8s v1.23 and higher

Signed-off-by: Rastislav Szabo <rastislav@kubermatic.com>

* Update validation webhook test

Signed-off-by: Rastislav Szabo <rastislav@kubermatic.com>
@PratikDeoghare
Copy link
Contributor

/cherry-pick release/v2.19

@kubermatic-bot
Copy link
Contributor

@PratikDeoghare: #9258 failed to apply on top of branch "release/v2.19":

Applying: Add Canal CNI v3.22 support & make it the default CNI
.git/rebase-apply/patch:3994: trailing whitespace.
      - watch 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	pkg/handler/v1/cluster/cluster_test.go
M	pkg/handler/v2/cluster/cluster_test.go
M	pkg/version/cni/version.go
M	pkg/webhook/cluster/validation/validation_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/webhook/cluster/validation/validation_test.go
CONFLICT (content): Merge conflict in pkg/webhook/cluster/validation/validation_test.go
Auto-merging pkg/version/cni/version.go
Auto-merging pkg/handler/v2/cluster/cluster_test.go
CONFLICT (content): Merge conflict in pkg/handler/v2/cluster/cluster_test.go
Auto-merging pkg/handler/v1/cluster/cluster_test.go
CONFLICT (content): Merge conflict in pkg/handler/v1/cluster/cluster_test.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add Canal CNI v3.22 support & make it the default CNI
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release/v2.19

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.

PratikDeoghare pushed a commit to PratikDeoghare/kubermatic that referenced this pull request Jul 6, 2022
* Add Canal CNI v3.22 support & make it the default CNI

Signed-off-by: Rastislav Szabo <rastislav@kubermatic.com>

* Automatically upgrade Canal to v3.22 in clusters with k8s v1.23 and higher

Signed-off-by: Rastislav Szabo <rastislav@kubermatic.com>

* Update validation webhook test

Signed-off-by: Rastislav Szabo <rastislav@kubermatic.com>
PratikDeoghare pushed a commit to PratikDeoghare/kubermatic that referenced this pull request Jul 6, 2022
* Add Canal CNI v3.22 support & make it the default CNI

Signed-off-by: Rastislav Szabo <rastislav@kubermatic.com>

* Automatically upgrade Canal to v3.22 in clusters with k8s v1.23 and higher

Signed-off-by: Rastislav Szabo <rastislav@kubermatic.com>

* Update validation webhook test

Signed-off-by: Rastislav Szabo <rastislav@kubermatic.com>
PratikDeoghare pushed a commit to PratikDeoghare/kubermatic that referenced this pull request Jul 6, 2022
* Add Canal CNI v3.22 support & make it the default CNI

Signed-off-by: Rastislav Szabo <rastislav@kubermatic.com>

* Automatically upgrade Canal to v3.22 in clusters with k8s v1.23 and higher

Signed-off-by: Rastislav Szabo <rastislav@kubermatic.com>

* Update validation webhook test

Signed-off-by: Rastislav Szabo <rastislav@kubermatic.com>
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. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. 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/api Denotes a PR or issue as being assigned to SIG API. sig/app-management Denotes a PR or issue as being assigned to SIG App Management. 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.

Add support for Canal CNI v3.22
4 participants