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

Fix AWS CCM defaults for IPAM to match KCM #15670

Merged
merged 2 commits into from
Aug 16, 2023

Conversation

johngmyers
Copy link
Member

When reviewing #15623 we noticed that AWS CCM was incorrectly defaulting ClusterCIDR to NonMasqueradeCIDR. Updating the CCM code to match that for KCM.

GCP networking doesn't work on AWS, so removing that code.

I'm not sure whether we should default UseServiceAccountCredentials to true like KCM does.

/cc @hakman

@k8s-ci-robot k8s-ci-robot requested a review from hakman July 19, 2023 06:12
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jul 19, 2023
@johngmyers johngmyers changed the title Fix AWS CCM defaults for IPAM to match KCM WIP Fix AWS CCM defaults for IPAM to match KCM Jul 19, 2023
@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jul 19, 2023
@johngmyers
Copy link
Member Author

KCM also has code for defaulting NodeCIDRMaskSize when ClusterCIDR is IPv6, but we never set ClusterCIDR for IPv6. I don't think we need to copy that.

@johngmyers johngmyers changed the title WIP Fix AWS CCM defaults for IPAM to match KCM Fix AWS CCM defaults for IPAM to match KCM Jul 19, 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 Jul 19, 2023
@johngmyers
Copy link
Member Author

/cc @olemarkus

@hakman
Copy link
Member

hakman commented Jul 19, 2023

/cc @justinsb

@justinsb justinsb self-assigned this Jul 28, 2023
@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 29, 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 Jul 29, 2023
@justinsb
Copy link
Member

Thanks @johngmyers - I also reviewed other uses of the CIDR and think they are correct.

I'm not sure whether we should default UseServiceAccountCredentials to true like KCM does.

It's slightly more secure, in that it allows each controller to have its own serviceaccount, though the process can still assume any of the serviceaccounts IIUC. It feels much more important for KCM, that has a lot of controllers, than it is for a CCM (which has fewer).

/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 Aug 16, 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 Aug 16, 2023
@k8s-ci-robot k8s-ci-robot merged commit 73159cd into kubernetes:master Aug 16, 2023
23 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.28 milestone Aug 16, 2023
@johngmyers johngmyers deleted the aws-ccm branch August 16, 2023 17:28
k8s-ci-robot added a commit that referenced this pull request Aug 16, 2023
…5670-upstream-release-1.27

Automated cherry pick of #15670: Fix AWS CCM defaults for IPAM to match KCM
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. blocks-next cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/office-hours 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
Development

Successfully merging this pull request may close these issues.

None yet

4 participants