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

Update Canal CNI to v3.10 #718

Merged
merged 2 commits into from
Oct 29, 2019
Merged

Update Canal CNI to v3.10 #718

merged 2 commits into from
Oct 29, 2019

Conversation

xmudrii
Copy link
Member

@xmudrii xmudrii commented Oct 28, 2019

What this PR does / why we need it:

Update Canal CNI to v3.10.

Docs: https://docs.projectcalico.org/v3.10/getting-started/kubernetes/installation/flannel
Manifest: https://docs.projectcalico.org/v3.10/manifests/canal.yaml

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #599

Special notes for your reviewer:

Blocked until upgrade E2E tests are not fixed (#717).
/hold

Does this PR introduce a user-facing change?:

Update Canal CNI to v3.10

@xmudrii xmudrii added the lifecycle/blocked Denotes an issue or PR is blocked. label Oct 28, 2019
@kubermatic-bot kubermatic-bot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. 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. labels Oct 28, 2019
@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: xmudrii

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 approved Indicates a PR has been approved by an approver from all required OWNERS files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Oct 28, 2019
@xmudrii xmudrii changed the title [WIP] Update Canal CNI to the latest version Update Canal CNI to v3.10 Oct 29, 2019
@kubermatic-bot kubermatic-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 29, 2019
@xmudrii
Copy link
Member Author

xmudrii commented Oct 29, 2019

/assign @kron4eg
The PR is ready for review, but I'll leave it on hold until I don't finish testing it manually

@xmudrii xmudrii requested a review from kron4eg October 29, 2019 09:59
xmudrii
xmudrii commented Oct 29, 2019
View reviewed changes
pkg/templates/canal/prerequisites.go
@@ -210,6 +216,7 @@ func calicoClusterRole() *rbacv1.ClusterRole {
}
}

// TODO(xmudrii): This doesn't exist anymore in the original manifest.
Copy link
Member Author

Choose a reason for hiding this comment

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

@kron4eg That ClusterRole is not present in the manifest anymore and I don't know who creates that ServiceAccount. Should we drop this role?

Copy link
Member

Choose a reason for hiding this comment

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

Yeah, probably yes.

Yet we don't have effective mechanism to delete "old stuff" currently. Something like kubectl apply --prune -l app=kubeone would do. Probably we need to work on implementing it.

@xmudrii
Copy link
Member Author

xmudrii commented Oct 29, 2019

Timeout error
/retest

@xmudrii xmudrii removed the lifecycle/blocked Denotes an issue or PR is blocked. label Oct 29, 2019
@xmudrii
Copy link
Member Author

xmudrii commented Oct 29, 2019

This doesn't affect upgrades because we never upgrade CNI. I'll create a follow-up PR that fixes this, but in meanwhile we can merge this one.
/hold cancel

@kubermatic-bot kubermatic-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 29, 2019
@xmudrii
Copy link
Member Author

xmudrii commented Oct 29, 2019

/hold

@kubermatic-bot kubermatic-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 29, 2019
@xmudrii
Copy link
Member Author

xmudrii commented Oct 29, 2019

/hold cancel

@kubermatic-bot kubermatic-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 29, 2019
@kron4eg
Copy link
Member

kron4eg commented Oct 29, 2019

/lgtm

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Oct 29, 2019
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: fbc7c09c7cb35005a8564576e85f7b0a36d9c750

@kubermatic-bot kubermatic-bot merged commit 88cca8a into master Oct 29, 2019
@kubermatic-bot kubermatic-bot added this to the v0.11 milestone Oct 29, 2019
@kubermatic-bot kubermatic-bot deleted the update-canal branch October 29, 2019 11:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kron4eg kron4eg kron4eg left review comments

Assignees

@kron4eg kron4eg

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. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v0.11
Development

Successfully merging this pull request may close these issues.

Update Canal to the latest version
3 participants
@xmudrii @kubermatic-bot @kron4eg