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

Cherry pick of #16344: validation: Allow overlap of pod/node CIDR and service CIDR #16345

Conversation

hakman
Copy link
Member

@hakman hakman commented Feb 11, 2024

Cherry pick of #16344 on release-1.28.

#16344: validation: Allow overlap of pod/node CIDR and service CIDR

For details on the cherry pick process, see the cherry pick requests page.


We allowed this previously, so this is a regression for existing clusters.

These clusters are not obviously broken, and the
kube-controller-manager (for example) will exclude the service range
when issuing node CIDRs.  As such, remove validation until we can
determine if anything is actually broken by an overlap (and a path
forwards if so).

Issue kubernetes#16340
@k8s-ci-robot k8s-ci-robot added this to the v1.28 milestone Feb 11, 2024
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. area/api labels Feb 11, 2024
@hakman
Copy link
Member Author

hakman commented Feb 11, 2024

/cc @rifelpet @justinsb

@hakman
Copy link
Member Author

hakman commented Feb 11, 2024

/test pull-kops-verify-generated

@hakman hakman force-pushed the automated-cherry-pick-of-#16344-upstream-release-1.28 branch from e42bb1a to 8f07710 Compare February 11, 2024 04:25
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Feb 11, 2024
@hakman hakman changed the title Automated cherry pick of #16344: validation: Allow overlap of pod/node CIDR and service CIDR Cherry pick of #16344: validation: Allow overlap of pod/node CIDR and service CIDR Feb 11, 2024
@justinsb
Copy link
Member

Thanks @hakman

/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 Feb 11, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: justinsb

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 added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 11, 2024
@k8s-ci-robot k8s-ci-robot merged commit a62e14e into kubernetes:release-1.28 Feb 11, 2024
13 checks passed
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. area/api cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. 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.

3 participants