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

Applied cluster tags to nodepools, don't report this as a terraform change #369

Merged
merged 6 commits into from
Feb 21, 2024

Conversation

snootan
Copy link
Contributor

@snootan snootan commented Jan 5, 2024

  1. What this PR does / why we need it:
    Updated terraform to add cluster tags to the nodepool objects without complaining for any changes.
  2. Which issue(s) this PR fixes
    N/A
  3. Additional information
    As we are propagating tags from cluster to nodepool and nodepool resources. So, we added support for this as part of this PR.
    Terraform testing:
    Created cluster with nodepool
Screenshot 2024-01-05 at 12 15 09 PM

Applied same file without any change
Screenshot 2024-01-05 at 12 15 27 PM

Deleted few tags from EKS cluster
Screenshot 2024-01-05 at 12 15 40 PM

Again, applied same file
Screenshot 2024-01-05 at 12 15 52 PM

Deleted few tags from nodepool
Screenshot 2024-01-05 at 12 20 39 PM

  1. Special notes for your reviewer

Signed-off-by: Nootan Singh <snootan@vmware.com>
@codecov-commenter
Copy link

codecov-commenter commented Jan 5, 2024

Codecov Report

Attention: 46 lines in your changes are missing coverage. Please review.

Comparison is base (8c08715) 25.09% compared to head (c63ad81) 26.13%.
Report is 53 commits behind head on main.

Files Patch % Lines
internal/resources/ekscluster/data_source.go 0.00% 16 Missing ⚠️
internal/resources/ekscluster/helpers.go 0.00% 15 Missing ⚠️
...ternal/resources/ekscluster/resource_ekscluster.go 0.00% 15 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main     #369      +/-   ##
==========================================
+ Coverage   25.09%   26.13%   +1.04%     
==========================================
  Files         191      195       +4     
  Lines       16480    17203     +723     
==========================================
+ Hits         4135     4496     +361     
- Misses      12131    12496     +365     
+ Partials      214      211       -3     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Signed-off-by: Nootan Singh <snootan@vmware.com>
@snootan snootan force-pushed the feature/support-tagging-from-cluster-to-nodepool branch from 1a389c2 to 212b9fc Compare January 9, 2024 05:41
Signed-off-by: Nootan Singh <snootan@vmware.com>
@snootan snootan force-pushed the feature/support-tagging-from-cluster-to-nodepool branch from 2e67472 to d31a14c Compare January 29, 2024 08:01
…rrected for acceptance EKS cluster testing

Signed-off-by: Nootan Singh <snootan@vmware.com>
Signed-off-by: Nootan Singh <snootan@vmware.com>
@ramya-bangera
Copy link
Contributor

@snootan - Can you run the acceptance tests locally and attach the screenshot here?

@snootan
Copy link
Contributor Author

snootan commented Feb 7, 2024

@snootan - Can you run the acceptance tests locally and attach the screenshot here?
Screenshot:

Screenshot 2024-02-07 at 12 42 37 PM

@snootan
Copy link
Contributor Author

snootan commented Feb 8, 2024

@ramya-bangera, I ran acceptance testing using my stack credentials. Seems, working fine.

Signed-off-by: Nootan Singh <snootan@vmware.com>
@snootan
Copy link
Contributor Author

snootan commented Feb 9, 2024

Log details of acceptance EKS cluster testing:
<testsuite name="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" tests="89" failures="0" errors="0" id="165" hostname="sc1-10-168-218-58.nimbus.eng.vmware.com" time="789.356" timestamp="2024-02-09T09:09:59Z"> <properties> <property name="coverage.statements.pct" value="70.30"></property> </properties> <testcase name="TestNodepoolPosMap" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestNodepoolPosMap/empty_list" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestNodepoolPosMap/with_some_nodepool_defs" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestFlattenClusterSpec" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestFlattenClusterSpec/nil_spec" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"> <system-out><![CDATA[[0/0]0x17caf00[0/0]0x17caf00=== RUN TestFlattenClusterSpec/full_cluster_spec_without_addonsconfig [1/1]0xc0003e7ca0[1/1]0xc00047a030=== RUN TestFlattenClusterSpec/full_cluster_spec_with_addonsconfig [1/1]0xc0003e7cb0[1/1]0xc00047ae60=== RUN TestFlattenClusterSpec/empty_nodepools [1/1]0xc0003e7cc0[1/1]0xc00047bc10=== RUN TestFlattenClusterSpec/empty_proxy [1/1]0xc0003e7cd0[1/1]0xc00049c170=== RUN TestFlattenClusterSpec/empty_config [1/1]0xc0003e7ce0[1/1]0xc0005040c0]]></system-out> </testcase> <testcase name="TestFlattenClusterSpec/full_cluster_spec_without_addonsconfig" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestFlattenClusterSpec/full_cluster_spec_with_addonsconfig" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestFlattenClusterSpec/empty_nodepools" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestFlattenClusterSpec/empty_proxy" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestFlattenClusterSpec/empty_config" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestFlattenConfig" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestFlattenConfig/nil_config" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestFlattenConfig/full_config" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestFlattenConfig/k8s_network_config_is_nil_config" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestFlattenConfig/logging_is_nil" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestFlattenConfig/vpc_is_nil" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestNodepoolSpecEqual" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestNodepoolSpecEqual/both_are_equal" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestNodepoolSpecEqual/ami_types_are_not_equal" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestNodepoolSpecEqual/capacity_types_are_not_equal" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestNodepoolSpecEqual/instance_types_are_not_equal" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestNodepoolSpecEqual/instance_types_are_not_set" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestNodepoolSpecEqual/instance_types_are_set_equal" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestNodepoolSpecEqual/launch_templates_are_not_equal" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestNodepoolSpecEqual/launch_template_for_1_is_not_set_and_the_other_is_empty" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestNodepoolSpecEqual/launch_template_for_1_is_empty_and_the_other_is_not_set" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestNodepoolSpecEqual/node_labels_are_not_equal" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestNodepoolSpecEqual/remote_accesses&#39;_SSH_keys_are_not_equal" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestNodepoolSpecEqual/remote_accesses&#39;_security_grps_are_not_equal" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestNodepoolSpecEqual/remote_accesses&#39;_security_grps_are_set_equal" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestNodepoolSpecEqual/first_remote_access_is_nil_and_the_other_empty" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestNodepoolSpecEqual/first_remote_access_is_empty_and_the_other_nil" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestNodepoolSpecEqual/role_arns_are_not_equal" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestNodepoolSpecEqual/root_disk_sizes_are_not_equal" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestNodepoolSpecEqual/scaling_config_are_not_equal" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestNodepoolSpecEqual/subnet_IDs_are_not_equal" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestNodepoolSpecEqual/subnet_IDs_are_not_set" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestNodepoolSpecEqual/subnet_IDs_are_set_equal" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestNodepoolSpecEqual/tags_are_not_equal" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestNodepoolSpecEqual/taints_are_not_equal" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestNodepoolSpecEqual/taints_are_not_set" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestNodepoolSpecEqual/taints_are_set_equal" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestNodepoolSpecEqual/updated_config_are_not_equal" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestNodepoolSpecEqual/ami_release_versions_are_not_equal" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestClusterSpecEqual" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestClusterSpecEqual/both_are_equal" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestClusterSpecEqual/cluster_group_names_are_not_equal" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestClusterSpecEqual/proxies_are_not_equal" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestClusterSpecEqual/config1_is_nil" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestClusterSpecEqual/config2_is_nil" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestClusterSpecEqual/both_config_are_nil" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestClusterSpecEqual/k8s_network_configs_are_not_equal" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestClusterSpecEqual/loggings_are_not_equal" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestClusterSpecEqual/role_arns_are_not_equal" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestClusterSpecEqual/tags_are_not_equal" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestClusterSpecEqual/versions_are_not_equal" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestClusterSpecEqual/vpc1_is_nil" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestClusterSpecEqual/vpc2_is_nil" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestClusterSpecEqual/both_vpcs_are_nil" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestClusterSpecEqual/vpc_private_accesses_are_not_equal" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestClusterSpecEqual/vpc_public_accesses_are_not_equal" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestClusterSpecEqual/public_cirds_are_not_equal" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestClusterSpecEqual/public_cirds_are_set_equal" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestClusterSpecEqual/security_groups_are_not_equal" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestClusterSpecEqual/security_groups_are_set_equal" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestClusterSpecEqual/subnets_are_not_equal" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestClusterSpecEqual/subnets_are_set_equal" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestClusterSpecEqual/addon_configs_are_set_equal" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestClusterSpecEqual/addon_config_subnets_are_set_unequal" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestClusterSpecEqual/addon_config_SecurityGroupIds_are_set_unequal" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestFlattenNodepools" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestFlattenNodepools/nil_list" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestFlattenNodepools/single_nodepool" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestFlattenNodepools/multiple_nodepool" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestFlattenNodepool" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestFlattenNodepool/nil_np" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestFlattenNodepool/full_nodepool" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestFlattenNodepoolSpec" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestFlattenNodepoolSpec/nil_spec" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestFlattenNodepoolSpec/full_spec" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestFlattenNodepoolSpec/launch_template_with_id" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestFlattenNodepoolSpec/remote_access_is_nil" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestFlattenNodepoolSpec/root_disk_size_is_0" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestFlattenNodepoolSpec/scaling_config_is_nil" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestFlattenNodepoolSpec/subnet_ids_are_nil" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestFlattenNodepoolSpec/taints_are_nil" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestFlattenNodepoolSpec/update_config_is_nil" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestFlattenNodepoolSpec/sg_in_remote_access_is_nil" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="0.000"></testcase> <testcase name="TestAcceptanceForMkpClusterResource" classname="github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/ekscluster" time="789.330"> <system-out><![CDATA[ resource_ekscluster_test.go:321: cluster resource acceptance test complete!]]></system-out> </testcase> </testsuite>

Copy link
Contributor

@ramya-bangera ramya-bangera left a comment

Choose a reason for hiding this comment

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

LGTM

@snootan snootan merged commit ed4b47e into main Feb 21, 2024
4 checks passed
@snootan snootan deleted the feature/support-tagging-from-cluster-to-nodepool branch February 21, 2024 15:23
Copy link

I'm going to lock this pull request because it has been closed for 30 days. This helps our maintainers find and focus on the active issues.

If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 15, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants