fix: propagate AdditionalTags from AWSCluster to storage volumes #4512

philjb · 2023-09-21T23:27:51Z

see AWSCluster AdditionalTags are not propagated to AWSMachine storage volumes #4511

What type of PR is this?
/kind bug

What this PR does / why we need it:

This PR gets AWSCluster AdditionalTags onto root volumes for the AWSMachines in the cluster. I believe this is the intended behavior: Set the additional tags on the cluster and have them show up on all resources for that cluster.

I believe it was a minor oversight that the current behavior isn't like this already.

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

Special notes for your reviewer:

None

Checklist:

squashed commits
includes documentation
adds unit tests: update existing unit tests
adds or updates e2e tests: none impacted

Release note:

Fixed: Additional Tags specified on the AWSCluster will now propagate to root storage volumes.

* see kubernetes-sigs#4511

k8s-ci-robot · 2023-09-21T23:28:00Z

Welcome @philjb!

It looks like this is your first PR to kubernetes-sigs/cluster-api-provider-aws 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/cluster-api-provider-aws has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

k8s-ci-robot · 2023-09-21T23:28:01Z

Hi @philjb. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

philjb · 2023-09-21T23:34:14Z

~~Please hold while I work through a few test failures i see locally.~~

addressed in recent commits

Skarlso · 2023-09-22T07:23:09Z

/ok-to-test

philjb · 2023-09-22T17:21:03Z

/kind bug

philjb · 2023-09-22T17:22:18Z

/retest

philjb · 2023-09-22T17:45:28Z

@Skarlso - back to you whenever you have time. I addressed the test failures.

cnmcavoy

lgtm, I don't see any other places that use AWSMachine.Spec.AdditionalTags that needs changing.

philjb · 2023-09-22T20:17:02Z

lgtm, I don't see any other places that use AWSMachine.Spec.AdditionalTags that needs changing.

I didn't either. It's just that reconcile method that touches tags for the instance and root volumes as far as i saw.

Skarlso · 2023-09-23T16:10:40Z

/test ?

k8s-ci-robot · 2023-09-23T16:10:42Z

@Skarlso: 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.

Skarlso · 2023-09-23T16:11:01Z

/test pull-cluster-api-provider-aws-e2e-blocking
/lgtm
/approve
/hold

k8s-ci-robot · 2023-09-23T16:11:06Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Skarlso

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:

~~OWNERS~~ [Skarlso]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Skarlso · 2023-09-23T21:04:00Z

/unhold

philjb · 2023-10-02T17:22:04Z

thanks!

philjb · 2023-10-23T23:23:19Z

controllers/awsmachine_controller.go

 			annotations[volumeID] = newAnnotation
 		} else {
-			newAnnotation, err := r.ensureVolumeTags(ec2svc, aws.String(volumeID), make(map[string]interface{}), machine.Spec.AdditionalTags)
+			newAnnotation, err := r.ensureVolumeTags(ec2svc, aws.String(volumeID), make(map[string]interface{}), additionalTags)


this line change didn't make it into 2.2.4 release through https://github.com/kubernetes-sigs/cluster-api-provider-aws/pull/4535/files

Fix the backport of #4512 into release-2.2 branch

…altags-root-volumes fix: propagate AdditionalTags from AWSCluster to storage volumes

fix: propagate AdditionalTags from AWSCluster to storage volumes

f528a75

* see kubernetes-sigs#4511

k8s-ci-robot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-priority labels Sep 21, 2023

k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Sep 21, 2023

k8s-ci-robot requested review from Ankitasw and dlipovetsky September 21, 2023 23:28

k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Sep 21, 2023

k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Sep 22, 2023

tests(awsmachine controller): fix test that matched bug behavior

577bcda

k8s-ci-robot added the kind/bug Categorizes issue or PR as related to a bug. label Sep 22, 2023

tests(awsmachine controller): improve test for precedence of tags

b805082

k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Sep 22, 2023

cnmcavoy approved these changes Sep 22, 2023

View reviewed changes

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 23, 2023

k8s-ci-robot assigned Skarlso Sep 23, 2023

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 23, 2023

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 23, 2023

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 23, 2023

k8s-ci-robot merged commit a0e5849 into kubernetes-sigs:main Sep 23, 2023

philjb commented Oct 23, 2023

View reviewed changes

philjb mentioned this pull request Oct 23, 2023

[release-2.2] cherry-pick: Fix cluster-api-provider-last-applied-tags-on-volumes to recalculate the value on each reconcile #4535

Merged

4 tasks

cnmcavoy mentioned this pull request Oct 25, 2023

Fix the backport of #4512 into release-2.2 branch #4590

Merged

4 tasks

cnmcavoy added a commit to cnmcavoy/cluster-api-provider-aws that referenced this pull request Oct 25, 2023

Fix backport of kubernetes-sigs#4512 into release-2.2

b44cfd3

k8s-ci-robot added a commit that referenced this pull request Oct 26, 2023

Merge pull request #4590 from cnmcavoy/cmcavoy/fix-cherry-pick-4512

c0fdc9a

Fix the backport of #4512 into release-2.2 branch

rrpolanco pushed a commit to spectrocloud/cluster-api-provider-aws that referenced this pull request Oct 10, 2024

Merge pull request kubernetes-sigs#4512 from philjb/pjb-4511-addition…

4bf580f

…altags-root-volumes fix: propagate AdditionalTags from AWSCluster to storage volumes

rrpolanco pushed a commit to spectrocloud/cluster-api-provider-aws that referenced this pull request Oct 10, 2024

Merge pull request kubernetes-sigs#4512 from philjb/pjb-4511-addition…

d5d5cd7

…altags-root-volumes fix: propagate AdditionalTags from AWSCluster to storage volumes

pavansokkenagaraj mentioned this pull request Nov 4, 2024

PCP-4375: 🚀 SUS-564: Support AL 2023 spectrocloud/cluster-api-provider-aws#906

Merged

pavansokkenagaraj mentioned this pull request Jan 16, 2025

PEM-4967: CAPA changes for AWS Secret/TopSecret Region spectrocloud/cluster-api-provider-aws#933

Merged

fix: propagate AdditionalTags from AWSCluster to storage volumes #4512

fix: propagate AdditionalTags from AWSCluster to storage volumes #4512

Uh oh!

Conversation

philjb commented Sep 21, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

k8s-ci-robot commented Sep 21, 2023

Uh oh!

k8s-ci-robot commented Sep 21, 2023

Uh oh!

philjb commented Sep 21, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Skarlso commented Sep 22, 2023

Uh oh!

philjb commented Sep 22, 2023

Uh oh!

philjb commented Sep 22, 2023

Uh oh!

philjb commented Sep 22, 2023

Uh oh!

cnmcavoy left a comment

Choose a reason for hiding this comment

Uh oh!

philjb commented Sep 22, 2023

Uh oh!

Skarlso commented Sep 23, 2023

Uh oh!

k8s-ci-robot commented Sep 23, 2023

Uh oh!

Skarlso commented Sep 23, 2023

Uh oh!

k8s-ci-robot commented Sep 23, 2023

Uh oh!

Skarlso commented Sep 23, 2023

Uh oh!

philjb commented Oct 2, 2023

Uh oh!

philjb Oct 23, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

philjb commented Sep 21, 2023 •

edited

Loading

philjb commented Sep 21, 2023 •

edited

Loading