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

Allow user to specify the Name tag value for AWS tags #3991

Merged
merged 1 commit into from
Feb 7, 2023
Merged

Allow user to specify the Name tag value for AWS tags #3991

merged 1 commit into from
Feb 7, 2023

Conversation

AverageMarcus
Copy link
Member

What type of PR is this?

/kind bug

What this PR does / why we need it:

Prevents CAPA from overwriting any user-provided Name tags.

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 #3989

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/bug Categorizes issue or PR as related to a bug. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-priority size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jan 17, 2023
@AverageMarcus
Copy link
Member Author

/test ?

@k8s-ci-robot
Copy link
Contributor

@AverageMarcus: The following commands are available to trigger required jobs:

  • /test pull-cluster-api-provider-aws-build
  • /test pull-cluster-api-provider-aws-test
  • /test pull-cluster-api-provider-aws-verify

The following commands are available to trigger optional jobs:

  • /test pull-cluster-api-provider-aws-apidiff-main
  • /test pull-cluster-api-provider-aws-e2e
  • /test pull-cluster-api-provider-aws-e2e-blocking
  • /test pull-cluster-api-provider-aws-e2e-clusterclass
  • /test pull-cluster-api-provider-aws-e2e-conformance
  • /test pull-cluster-api-provider-aws-e2e-conformance-with-ci-artifacts
  • /test pull-cluster-api-provider-aws-e2e-eks
  • /test pull-cluster-api-provider-aws-e2e-eks-gc
  • /test pull-cluster-api-provider-aws-e2e-eks-testing

Use /test all to run the following jobs that were automatically triggered:

  • pull-cluster-api-provider-aws-apidiff-main
  • pull-cluster-api-provider-aws-build
  • pull-cluster-api-provider-aws-test
  • pull-cluster-api-provider-aws-verify

In response to this:

/test ?

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
Copy link
Member Author

/ok-to-test
/test pull-cluster-api-provider-aws-e2e

@k8s-ci-robot k8s-ci-robot added the ok-to-test Indicates a non-member PR verified by an org member that is safe to test. label Jan 17, 2023
@AverageMarcus
Copy link
Member Author

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

@Ankitasw
Copy link
Member

Ankitasw commented Jan 31, 2023 •
edited
Loading

Thanks for the PR @AverageMarcus. Is it possible for you to add a unit test for this scenario?

@Ankitasw
Copy link
Member

Ankitasw commented Feb 3, 2023

@AverageMarcus would you be able to continue with the PR?

@AverageMarcus
Copy link
Member Author

@Ankitasw I should be able to but don't have the time currently. I'm going to see if any of my colleagues are able to finish it off for me.

@Ankitasw
Copy link
Member

Ankitasw commented Feb 3, 2023

@AverageMarcus no worries take your time 🙂 just wanted to remind!!!

@AndiDog
Copy link
Contributor

AndiDog commented Feb 3, 2023

@Ankitasw I'm taking over. Added a unit test, and another change that avoids ever having confusion about whether the generated or user-provided subnet Name tag is used. The original change in the Build function remains because it means that for many other objects (not only subnets), tag building would support a user-provided Name tag. I didn't find any code places where the changes are troublesome.

@k8s-ci-robot k8s-ci-robot added 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 Feb 3, 2023
@AverageMarcus
Copy link
Member Author

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

@AndiDog
Copy link
Contributor

AndiDog commented Feb 6, 2023

/retest

@AverageMarcus
Copy link
Member Author

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

Ankitasw
Ankitasw reviewed Feb 6, 2023
View reviewed changes
api/v1beta1/tags.go Outdated Show resolved Hide resolved
@AverageMarcus @AndiDog
Allow user to specify the Name tag value for AWS tags
e0dbf3e 
Signed-off-by: Marcus Noble <[email protected]>
Co-authored-by: Andreas Sommer <[email protected]>
@AndiDog
Copy link
Contributor

AndiDog commented Feb 6, 2023

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

@AndiDog
Copy link
Contributor

AndiDog commented Feb 6, 2023 •
edited
Loading

@Ankitasw can you advise on the E2E failures?

@Ankitasw
Copy link
Member

Ankitasw commented Feb 7, 2023

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

@Ankitasw
Copy link
Member

Ankitasw commented Feb 7, 2023

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 7, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Ankitasw

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 7, 2023
@k8s-ci-robot k8s-ci-robot merged commit 5538c89 into kubernetes-sigs:main Feb 7, 2023
@AndiDog AndiDog mentioned this pull request Feb 7, 2023
Closed
@zirain zirain mentioned this pull request Apr 21, 2023
Closed
@mjlshen mjlshen mentioned this pull request Nov 14, 2023
Closed
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ankitasw Ankitasw Ankitasw left review comments

@AndiDog AndiDog AndiDog left review comments

@dthorsen dthorsen Awaiting requested review from dthorsen

Assignees

@Ankitasw Ankitasw

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/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority ok-to-test Indicates a non-member PR verified by an org member that is safe to test. 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.

User-provided Name tag on subnets get overwritten
4 participants
@AverageMarcus @k8s-ci-robot @Ankitasw @AndiDog