Skip to content

Fill in default node cidr mask size when dual stack is not enabled #85494

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
Merged
k8s-ci-robot merged 1 commit into from
Nov 21, 2019
Merged

Fill in default node cidr mask size when dual stack is not enabled #85494

k8s-ci-robot merged 1 commit into from
Nov 21, 2019

Conversation

@tedyu
Copy link
Contributor

@tedyu tedyu commented Nov 21, 2019 •
edited
Loading

What type of PR is this?
/kind bug

What this PR does / why we need it:
Fixes #85492

Which issue(s) this PR fixes:
Fixes #85492 by setting default node cidr mask size when dual stack is not enabled.

kubeadm: fix stray "node-cidr-mask-size" flag in the kube-controller-manager manifest when IPv6DualStack is enabled

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/bug Categorizes issue or PR as related to a bug. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Nov 21, 2019
@tedyu
Copy link
Contributor Author

tedyu commented Nov 21, 2019

/cc @neolit123

@k8s-ci-robot k8s-ci-robot added area/kubeadm sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. and removed needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Nov 21, 2019
neolit123
neolit123 reviewed Nov 21, 2019
View reviewed changes
neolit123
neolit123 reviewed Nov 21, 2019
View reviewed changes
cmd/kubeadm/app/phases/controlplane/manifests.go Outdated
Copy link
Member

@neolit123 neolit123 Nov 21, 2019

Choose a reason for hiding this comment

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

@tedyu please move the comment too.

@Arvinderpal what is the state of this TODO?
#73977 still shows a single max size:
https://github.com/kubernetes/kubernetes/pull/73977/files#diff-6bbac02bd63acca6e05007f7c054396cR84

Copy link
Contributor Author

@tedyu tedyu Nov 21, 2019

Choose a reason for hiding this comment

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

@neolit123
Your comment has been addressed.

@neolit123
Copy link
Member

neolit123 commented Nov 21, 2019

/priority important-soon
/milestone v1.17

@k8s-ci-robot k8s-ci-robot added the priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. label Nov 21, 2019
@k8s-ci-robot k8s-ci-robot added this to the v1.17 milestone Nov 21, 2019
@k8s-ci-robot k8s-ci-robot removed the needs-priority Indicates a PR lacks a `priority/foo` label and requires one. label Nov 21, 2019
@neolit123
Copy link
Member

neolit123 commented Nov 21, 2019

@tedyu

NONE

please add a release note in the lines of :

kubeadm: fix stray "node-cidr-mask-size" flag in the kube-controller-manager manifest when IPv6DualStack is enabled

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Nov 21, 2019
neolit123
neolit123 reviewed Nov 21, 2019
View reviewed changes
Copy link
Member

@neolit123 neolit123 left a comment

Choose a reason for hiding this comment

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

@tedyu thanks.
/lgtm
/approve

@Arvinderpal this looks correct to me.
please have a look if/when you can (even post merge).

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

k8s-ci-robot commented Nov 21, 2019

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: neolit123, tedyu

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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 added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 21, 2019
@k8s-ci-robot k8s-ci-robot merged commit 3c5dad6 into kubernetes:master Nov 21, 2019
@Arvinderpal
Copy link
Contributor

Arvinderpal commented Nov 21, 2019

@neolit123 Looks this PR merged a few days back: #79993
We will need to add support for the two new flags introduced: --node-cidr-mask-size-ipv4 and --node-cidr-mask-size-ipv6

I will update the dual-stack tracking ticket kubernetes/kubeadm#1612
and get started on the necessary changes.

@neolit123
Copy link
Member

neolit123 commented Nov 21, 2019

@Arvinderpal thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@fabriziopandini fabriziopandini Awaiting requested review from fabriziopandini

@kad kad Awaiting requested review from kad

1 more reviewer

@neolit123 neolit123 neolit123 left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@neolit123 neolit123

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubeadm cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. 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. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Milestone

v1.17

Development

Successfully merging this pull request may close these issues.

kubeadm parameter node-cidr-mask-size repeated

5 participants

@tedyu @neolit123 @k8s-ci-robot @Arvinderpal @yutedz