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

Use Canal (flannel + Calico policy) as CNI #181

Merged
merged 1 commit into from
Apr 14, 2019
Merged

Use Canal (flannel + Calico policy) as CNI #181

merged 1 commit into from
Apr 14, 2019

Conversation

justaugustus
Copy link
Contributor

Signed-off-by: Stephen Augustus [email protected]

What this PR does / why we need it:
Swaps our CNI for Canal, so we can leverage Calico policy and a CNI (flannel), which can be used for Windows containers.

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

Release note:

Use Canal (flannel + Calico policy) as CNI

/priority important-soon
/milestone v1alpha1
/kind feature

@k8s-ci-robot k8s-ci-robot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Apr 13, 2019
@k8s-ci-robot k8s-ci-robot added this to the v1alpha1 milestone Apr 13, 2019
@k8s-ci-robot k8s-ci-robot added priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. kind/feature Categorizes issue or PR as related to a new feature. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. area/provider/azure Issues or PRs related to azure provider labels Apr 13, 2019
@k8s-ci-robot k8s-ci-robot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Apr 13, 2019
@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 13, 2019
@justaugustus
Copy link
Contributor Author

/assign @soggiest @awesomenix

@justaugustus justaugustus mentioned this pull request Apr 13, 2019
Closed
awesomenix
awesomenix reviewed Apr 13, 2019
View reviewed changes
cmd/clusterctl/examples/azure/addons.yaml
# Flannel network configuration. Mounted into the flannel container.
net-conf.json: |
{
"Network": "192.168.0.0/16",
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we please add unittests to block changing the defaults of pod cidr blocks. In case somebody changes the defaults, a warning to change in all the locations here would help in future

awesomenix
awesomenix suggested changes Apr 13, 2019
View reviewed changes
cmd/clusterctl/examples/azure/addons.yaml
# chosen from this range. Changing this value after installation will have
# no effect. This should fall within `--cluster-cidr`.
- name: CALICO_IPV4POOL_CIDR
value: "192.168.0.0/16"
Copy link
Contributor

Choose a reason for hiding this comment

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

same as above

@justaugustus
Copy link
Contributor Author

@awesomenix -- let's discuss pod/service CIDR configuration separately.
I don't believe we should necessarily restrict their configuration, in fact, they should probably be configurable. Would you mind opening a separate issue to discuss?

@awesomenix
Copy link
Contributor

/approve
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 14, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: awesomenix, justaugustus

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

@k8s-ci-robot k8s-ci-robot merged commit 3acfcd4 into kubernetes-sigs:master Apr 14, 2019
@awesomenix awesomenix mentioned this pull request Apr 14, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@awesomenix awesomenix awesomenix requested changes

@juan-lee juan-lee Awaiting requested review from juan-lee

Assignees

@awesomenix awesomenix

@soggiest soggiest

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/provider/azure Issues or PRs related to azure provider cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Milestone
v0.2
Development

Successfully merging this pull request may close these issues.
4 participants
@justaugustus @awesomenix @k8s-ci-robot @soggiest