Skip to content

Conversation

@dkoshkin
Copy link
Contributor

@dkoshkin dkoshkin commented Oct 1, 2025

What problem does this PR solve?:
Add support to set additionalTags at both the global level and for individual nodepools.

Which issue(s) this PR fixes:
Fixes #

How Has This Been Tested?:

Added unit tests.
Also tested in an EKS cluster with

    variables:
    - name: clusterConfig
      value:
        eks:
          additionalTags:
            Team: nkp
            IsItOverridable: "no"
        name: md-0
...
    workers:
      machineDeployments:
      - class: default-worker
        variables:
          overrides:
          - name: workerConfig
            value:
              eks:
                instanceType: m5.2xlarge
                additionalTags:
                  NodeType: worker
                  IsItOverridable: "yes"

See tags added to the VPC and all other resources being created:
Screenshot 2025-09-30 at 4 59 40 PM
See tags added to the instances, notice how the IsItOverridable tag comes from the higher precedence workerConfig
Screenshot 2025-09-30 at 5 00 18 PM

Special notes for your reviewer:

@dkoshkin dkoshkin force-pushed the dkoshkin/feat-aws-eks-tags branch from a1cfdd4 to 1cf378b Compare October 1, 2025 03:04
@faiq faiq enabled auto-merge (squash) October 2, 2025 19:22
Copy link
Contributor

@supershal supershal left a comment

Choose a reason for hiding this comment

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

Thanks

@faiq faiq merged commit 106e7c3 into main Oct 2, 2025
22 checks passed
@faiq faiq deleted the dkoshkin/feat-aws-eks-tags branch October 2, 2025 20:07
@faiq faiq mentioned this pull request Oct 2, 2025
faiq added a commit that referenced this pull request Oct 2, 2025
🤖 I have created a release *beep* *boop*
---


## 0.35.0 (2025-10-02)

<!-- Release notes generated using configuration in .github/release.yaml
at main -->

## What's Changed
### Exciting New Features 🎉
* feat: enable Cilium source IP preservation by @dkoshkin in
#1295
* feat: update capa with nutanix fork by @faiq in
#1329
* feat: additionalTags handlers for AWS and EKS by @dkoshkin in
#1333
### Fixes 🔧
* fix: use nodeadm mutations by @faiq in
#1332
### Other Changes
* build: downgrade clusterctl version by @dkoshkin in
#1330


**Full Changelog**:
v0.34.0...v0.35.0

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).
vijayaraghavanr31 pushed a commit that referenced this pull request Oct 8, 2025
**What problem does this PR solve?**:
Add support to set `additionalTags` at both the global level and for
individual nodepools.

**Which issue(s) this PR fixes**:
Fixes #

**How Has This Been Tested?**:
<!--
Please describe the tests that you ran to verify your changes.
Provide output from the tests and any manual steps needed to replicate
the tests.
-->
Added unit tests.
Also tested in an EKS cluster with
```
    variables:
    - name: clusterConfig
      value:
        eks:
          additionalTags:
            Team: nkp
            IsItOverridable: "no"
        name: md-0
...
    workers:
      machineDeployments:
      - class: default-worker
        variables:
          overrides:
          - name: workerConfig
            value:
              eks:
                instanceType: m5.2xlarge
                additionalTags:
                  NodeType: worker
                  IsItOverridable: "yes"
```

See tags added to the VPC and all other resources being created:
<img width="329" height="253" alt="Screenshot 2025-09-30 at 4 59 40 PM"
src="https://github.com/user-attachments/assets/58f474ae-685b-4908-b595-c5d2e6991b57"
/>
See tags added to the instances, notice how the `IsItOverridable` tag
comes from the higher precedence `workerConfig`
<img width="484" height="362" alt="Screenshot 2025-09-30 at 5 00 18 PM"
src="https://github.com/user-attachments/assets/09c9bcc5-9705-4d14-b922-025a167ce5e1"
/>


**Special notes for your reviewer**:
<!--
Use this to provide any additional information to the reviewers.
This may include:
- Best way to review the PR.
- Where the author wants the most review attention on.
- etc.
-->
vijayaraghavanr31 pushed a commit that referenced this pull request Oct 8, 2025
🤖 I have created a release *beep* *boop*
---


## 0.35.0 (2025-10-02)

<!-- Release notes generated using configuration in .github/release.yaml
at main -->

## What's Changed
### Exciting New Features 🎉
* feat: enable Cilium source IP preservation by @dkoshkin in
#1295
* feat: update capa with nutanix fork by @faiq in
#1329
* feat: additionalTags handlers for AWS and EKS by @dkoshkin in
#1333
### Fixes 🔧
* fix: use nodeadm mutations by @faiq in
#1332
### Other Changes
* build: downgrade clusterctl version by @dkoshkin in
#1330


**Full Changelog**:
v0.34.0...v0.35.0

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants