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

Default to 100.64.0.0/13 as IPv4 service cluster IP range #15866

Merged
merged 2 commits into from
Sep 4, 2023
Merged

Default to 100.64.0.0/13 as IPv4 service cluster IP range #15866

merged 2 commits into from
Sep 4, 2023

Conversation

hakman
Copy link
Member

@hakman hakman commented Sep 4, 2023 •
edited
Loading

Closes #15862

@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 4, 2023
@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. labels Sep 4, 2023
@hakman
Copy link
Member Author

hakman commented Sep 4, 2023

/test pull-kops-e2e-cni-amazonvpc

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 4, 2023
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 4, 2023
@hakman
Copy link
Member Author

hakman commented Sep 4, 2023

/test pull-kops-e2e-cni-amazonvpc
/test pull-kops-e2e-cni-cilium-eni

@hakman hakman requested a review from johngmyers September 4, 2023 07:47
@hakman
Copy link
Member Author

hakman commented Sep 4, 2023

/test pull-kops-e2e-cni-amazonvpc

1 similar comment
@hakman
Copy link
Member Author

hakman commented Sep 4, 2023

/test pull-kops-e2e-cni-amazonvpc

@hakman hakman changed the title WIP Default to 100.64.0.0/13 as IPv4 service cluster IP range Default to 100.64.0.0/13 as IPv4 service cluster IP range Sep 4, 2023
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 4, 2023
@justinsb
Copy link
Member

justinsb commented Sep 4, 2023

This LGTM, now that we know/remember that the service CIDR should not overlap the pod CIDR, and doesn't need to be included in the nonMasqueradeCIDR.

/approve
/lgtm
/hold for @johngmyers to weigh in

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 4, 2023
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 4, 2023
@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 Sep 4, 2023
@justinsb
Copy link
Member

justinsb commented Sep 4, 2023

/milestone v1.28

@k8s-ci-robot k8s-ci-robot added this to the v1.28 milestone Sep 4, 2023
@johngmyers
Copy link
Member

/test pull-kops-e2e-cni-cilium

@johngmyers
Copy link
Member

/lgtm
/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 4, 2023
@hakman hakman mentioned this pull request Sep 4, 2023
Merged
@k8s-ci-robot k8s-ci-robot merged commit bb03f41 into kubernetes:master Sep 4, 2023
@k8s-ci-robot k8s-ci-robot modified the milestones: v1.28, v1.29 Sep 4, 2023
k8s-ci-robot added a commit that referenced this pull request Sep 4, 2023
@k8s-ci-robot
Merge pull request #15870 from hakman/automated-cherry-pick-of-#15866…
6a17165 
…-upstream-release-1.28

Automated cherry pick of #15866: Default to 100.64.0.0/13 as IPv4 service cluster IP range
@ederst ederst mentioned this pull request Oct 18, 2023
Merged
@BrewTestBot BrewTestBot mentioned this pull request May 16, 2024
Merged
@rafatio rafatio mentioned this pull request May 27, 2024
Merged
@adityanmishra
Copy link

This enhancement has broken cluster upgrades from older versions.
We are getting below error now
Unable to create token for CNI kubeconfig error=Post "https://172.21.0.1:443/api/v1/namespaces/kube-system/serviceaccounts/calico-cni-plugin/token": tls: failed to verify certificate: x509: certificate is valid for 100.64.0.1, 127.0.0.1, not 172.21.0.1

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

@olemarkus olemarkus Awaiting requested review from olemarkus

@johngmyers johngmyers Awaiting requested review from johngmyers

Assignees

@justinsb justinsb

@johngmyers johngmyers

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v1.29
Development

Successfully merging this pull request may close these issues.

e2e-kops-aws-cni-amazon-vpc failing
5 participants
@hakman @justinsb @k8s-ci-robot @johngmyers @adityanmishra