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

Align AWS VPC CNI manifest with upstream #10126

Merged
merged 8 commits into from
Oct 28, 2020

Conversation

hakman
Copy link
Member

@hakman hakman commented Oct 28, 2020

v1.7.x got a makeup with a lot of quoting (which is quite annoying) which makes it hard to compare to the upstream manifest.
This PR mostly adds quotes, reshuffles things and makes some minor changes to align the kOps manifest with the one from upstream:
https://raw.githubusercontent.com/aws/amazon-vpc-cni-k8s/release-1.7/config/v1.7/aws-k8s-cni.yaml

Changes are best viewed in the generated test file diff upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/networking.amazon-vpc-routed-eni-k8s-1.16.yaml.

/cc @MoShitrit @rifelpet

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Oct 28, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hakman

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 area/addons approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Oct 28, 2020
@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Oct 28, 2020
@hakman hakman force-pushed the aws-vpc-cni-reset branch 2 times, most recently from 2510a5d to df37854 Compare October 28, 2020 10:16
@moshevayner
Copy link
Member

/lgtm
Thanks @hakman !

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 28, 2020
@k8s-ci-robot k8s-ci-robot merged commit fdc56ef into kubernetes:master Oct 28, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.20 milestone Oct 28, 2020
@hakman
Copy link
Member Author

hakman commented Oct 28, 2020

Thanks for the review @MoShitrit

k8s-ci-robot added a commit that referenced this pull request Oct 28, 2020
…126-origin-release-1.19

Automated cherry pick of #10126: Align AWS VPC CNI manifest with upstream
@hakman hakman deleted the aws-vpc-cni-reset branch October 30, 2020 06:03
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/addons 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/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants