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

Refactor VPC CNI in managed control plane #3846

Merged
merged 1 commit into from
Nov 15, 2022
Merged

Refactor VPC CNI in managed control plane #3846

merged 1 commit into from
Nov 15, 2022

Conversation

Ankitasw
Copy link
Member

@Ankitasw Ankitasw commented Nov 11, 2022 •
edited

What type of PR is this?
/kind refactor

What this PR does / why we need it:
Refactor the disableVPCCNI on the managed control plane inside VpcCni.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes Part of #2355
Fixes #3410

Special notes for your reviewer:

Checklist:

  • squashed commits
  • includes documentation
  • adds unit tests
  • adds or updates e2e tests

@k8s-ci-robot k8s-ci-robot added kind/refactor cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Nov 11, 2022
@k8s-ci-robot k8s-ci-robot added needs-priority size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Nov 11, 2022
@Ankitasw Ankitasw changed the title Refactor VPC CNI in aws managed control plane Refactor VPC CNI in managed control plane Nov 11, 2022
AverageMarcus
AverageMarcus reviewed Nov 11, 2022
View reviewed changes
Copy link
Member

@AverageMarcus AverageMarcus left a comment

Choose a reason for hiding this comment

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

I'm not sure the conversion is right on this, but I could be wrong as I always get confused with the auto generated vs manual stuff.

I was expecting something that converted from the old .DisableVPCCNI to the new .VpcCni.Disable and vice-versa but I don't see that here. Am I missing something?

@Ankitasw
Copy link
Member Author

Ankitasw commented Nov 11, 2022 •
edited

I was expecting something that converted from the old .DisableVPCCNI to the new .VpcCni.Disable and vice-versa but I don't see that here. Am I missing something?

I have made conversions here

@Ankitasw
Copy link
Member Author

/test pull-cluster-api-provider-aws-e2e-eks

@richardcase
Copy link
Member

/override pull-cluster-api-provider-aws-apidiff-main

@k8s-ci-robot
Copy link
Contributor

@richardcase: Overrode contexts on behalf of richardcase: pull-cluster-api-provider-aws-apidiff-main

In response to this:

/override pull-cluster-api-provider-aws-apidiff-main

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@richardcase
Copy link
Member

/test pull-cluster-api-provider-aws-e2e-eks

@richardcase
Copy link
Member

e2e is passing.

@Ankitasw @AverageMarcus - is there still a question outstanding on the conversion functions?

@AverageMarcus
Copy link
Member

Just this: https://github.com/kubernetes-sigs/cluster-api-provider-aws/pull/3846/files#r1022463444

@Ankitasw
Copy link
Member Author

I will run the tests again.
/test pull-cluster-api-provider-aws-e2e-eks
/test pull-cluster-api-provider-aws-e2e

@richardcase
Copy link
Member

/override pull-cluster-api-provider-aws-apidiff-main

@k8s-ci-robot
Copy link
Contributor

@richardcase: Overrode contexts on behalf of richardcase: pull-cluster-api-provider-aws-apidiff-main

In response to this:

/override pull-cluster-api-provider-aws-apidiff-main

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

AverageMarcus
AverageMarcus reviewed Nov 15, 2022
View reviewed changes
Copy link
Member

@AverageMarcus AverageMarcus left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 15, 2022
@richardcase
Copy link
Member

Until the e2e pass:

/hold

@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 Nov 15, 2022
@richardcase
Copy link
Member

richardcase commented Nov 15, 2022 •
edited

/approve

@Ankitasw - looks good, thanks. If you unhold when the e2e finish and pass

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: richardcase

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 Nov 15, 2022
@Ankitasw
Copy link
Member Author

/retest

@Ankitasw
Copy link
Member Author

The test is flaky for external VPC so retriggered.

@Ankitasw Ankitasw mentioned this pull request Nov 15, 2022
Closed
4 tasks
@Ankitasw
Copy link
Member Author

/unhold

@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 Nov 15, 2022
@k8s-ci-robot k8s-ci-robot merged commit 0b55547 into kubernetes-sigs:main Nov 15, 2022
@Ankitasw Ankitasw deleted the vpccni branch November 15, 2022 17:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AverageMarcus AverageMarcus AverageMarcus left review comments

@shivi28 shivi28 Awaiting requested review from shivi28

@Skarlso Skarlso Awaiting requested review from Skarlso

Assignees

@AverageMarcus AverageMarcus

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. kind/refactor lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Deprecate DisableVPCCNI in AWSManagedControlPlane
4 participants
@Ankitasw @richardcase @k8s-ci-robot @AverageMarcus