Skip to content

Fix diff suppress function ignoring additive_vpc_scope_dns_domain in Autopilot clusters #12567

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

Merged

Conversation

Michcioperz
Copy link
Contributor

@Michcioperz Michcioperz commented Dec 13, 2024

self-appointed successor to #11744

GKE Autopilot allows setting additive VPC scope domain on creation only. However, current implementation of the diff suppress function for Autopilot clusters removes any values in dns_config of Autopilot clusters, all the time.

This change permits setting additive VPC scope domain.

Remaining action items:

  • validate that allowing dns_config.# doesn't cause issues (it seems necessary for dns_config.0.additive_vpc_scope_dns_domain to exist
  • revise test coverage to look for other gaps
  • verify that the change in Autopilot Suppressed Diff Prevents using additive_vpc_scope_dns_domain #11744 to ForceNew when domain changes is exactly the behavior we want and copy it over
  • write the release note below

Release Note Template for Downstream PRs (will be copied)

See Write release notes for guidance.

container: fixed `additive_vpc_scope_dns_domain` being ignored in Autopilot cluster definition

@modular-magician
Copy link
Collaborator

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

google provider: Diff ( 2 files changed, 148 insertions(+), 1 deletion(-))
google-beta provider: Diff ( 2 files changed, 148 insertions(+), 1 deletion(-))

@modular-magician
Copy link
Collaborator

Tests analytics

Total tests: 221
Passed tests: 192
Skipped tests: 12
Affected tests: 17

Click here to see the affected service packages
  • container

Action taken

Found 17 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests
  • TestAccContainerClusterCustomServiceAccount_withAutopilot
  • TestAccContainerCluster_autopilot_minimal
  • TestAccContainerCluster_autopilot_net_admin
  • TestAccContainerCluster_autopilot_withAdditiveVPC
  • TestAccContainerCluster_autopilot_withDNSConfig
  • TestAccContainerCluster_enableCiliumPolicies_withAutopilot
  • TestAccContainerCluster_withAutopilot
  • TestAccContainerCluster_withAutopilotGcpFilestoreCsiDriver
  • TestAccContainerCluster_withAutopilotKubeletConfig
  • TestAccContainerCluster_withAutopilotNetworkTags
  • TestAccContainerCluster_withAutopilotResourceManagerTags
  • TestAccContainerCluster_withAutopilot_withNodePoolDefaults
  • TestAccContainerCluster_withBinaryAuthorizationEvaluationModeAutopilot
  • TestAccContainerCluster_withCgroupMode
  • TestAccContainerCluster_withCgroupModeUpdate
  • TestAccContainerCluster_withWorkloadALTSConfigAutopilot
  • TestAccContainerCluster_withWorkloadIdentityConfigAutopilot

Get to know how VCR tests work

@modular-magician
Copy link
Collaborator

🟢 Tests passed during RECORDING mode:
TestAccContainerCluster_autopilot_withAdditiveVPC [Debug log]

🟢 No issues found for passed tests after REPLAYING rerun.


🔴 Tests failed during RECORDING mode:
TestAccContainerClusterCustomServiceAccount_withAutopilot [Error message] [Debug log]
TestAccContainerCluster_autopilot_minimal [Error message] [Debug log]
TestAccContainerCluster_autopilot_net_admin [Error message] [Debug log]
TestAccContainerCluster_autopilot_withDNSConfig [Error message] [Debug log]
TestAccContainerCluster_enableCiliumPolicies_withAutopilot [Error message] [Debug log]
TestAccContainerCluster_withAutopilot [Error message] [Debug log]
TestAccContainerCluster_withAutopilotGcpFilestoreCsiDriver [Error message] [Debug log]
TestAccContainerCluster_withAutopilotKubeletConfig [Error message] [Debug log]
TestAccContainerCluster_withAutopilotNetworkTags [Error message] [Debug log]
TestAccContainerCluster_withAutopilotResourceManagerTags [Error message] [Debug log]
TestAccContainerCluster_withAutopilot_withNodePoolDefaults [Error message] [Debug log]
TestAccContainerCluster_withBinaryAuthorizationEvaluationModeAutopilot [Error message] [Debug log]
TestAccContainerCluster_withCgroupMode [Error message] [Debug log]
TestAccContainerCluster_withCgroupModeUpdate [Error message] [Debug log]
TestAccContainerCluster_withWorkloadALTSConfigAutopilot [Error message] [Debug log]
TestAccContainerCluster_withWorkloadIdentityConfigAutopilot [Error message] [Debug log]

🔴 Errors occurred during RECORDING mode. Please fix them to complete your PR.

View the build log or the debug log for each test

@Michcioperz Michcioperz force-pushed the additive-vpc-diff-suppress branch from df4d706 to 5fc163d Compare December 17, 2024 09:34
@modular-magician
Copy link
Collaborator

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

google provider: Diff ( 2 files changed, 207 insertions(+))
google-beta provider: Diff ( 2 files changed, 207 insertions(+))

@modular-magician
Copy link
Collaborator

Tests analytics

Total tests: 222
Passed tests: 207
Skipped tests: 12
Affected tests: 3

Click here to see the affected service packages
  • container

Action taken

Found 3 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests
  • TestAccContainerCluster_autopilot_withAdditiveVPCMutation
  • TestAccContainerCluster_autopilot_withDNSConfig
  • TestAccContainerCluster_withResourceUsageExportConfig

Get to know how VCR tests work

@modular-magician
Copy link
Collaborator

🟢 Tests passed during RECORDING mode:
TestAccContainerCluster_autopilot_withDNSConfig [Debug log]
TestAccContainerCluster_withResourceUsageExportConfig [Debug log]

🟢 No issues found for passed tests after REPLAYING rerun.


🔴 Tests failed during RECORDING mode:
TestAccContainerCluster_autopilot_withAdditiveVPCMutation [Error message] [Debug log]

🔴 Errors occurred during RECORDING mode. Please fix them to complete your PR.

View the build log or the debug log for each test

@Michcioperz Michcioperz force-pushed the additive-vpc-diff-suppress branch from 5fc163d to d10998a Compare December 17, 2024 10:58
@modular-magician
Copy link
Collaborator

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

google provider: Diff ( 2 files changed, 210 insertions(+))
google-beta provider: Diff ( 2 files changed, 210 insertions(+))

@modular-magician
Copy link
Collaborator

Tests analytics

Total tests: 222
Passed tests: 209
Skipped tests: 12
Affected tests: 1

Click here to see the affected service packages
  • container

Action taken

Found 1 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests
  • TestAccContainerCluster_autopilot_withAdditiveVPCMutation

Get to know how VCR tests work

@modular-magician
Copy link
Collaborator

🔴 Tests failed during RECORDING mode:
TestAccContainerCluster_autopilot_withAdditiveVPCMutation [Error message] [Debug log]

🔴 Errors occurred during RECORDING mode. Please fix them to complete your PR.

View the build log or the debug log for each test

@Michcioperz Michcioperz force-pushed the additive-vpc-diff-suppress branch from d10998a to e881351 Compare January 7, 2025 13:32
@Michcioperz
Copy link
Contributor Author

Is @modular-magician on vacation? 😅

@Michcioperz Michcioperz marked this pull request as ready for review January 7, 2025 15:34
@github-actions github-actions bot requested a review from slevenick January 7, 2025 15:35
Copy link

github-actions bot commented Jan 7, 2025

Hello! I am a robot. Tests will require approval from a repository maintainer to run.

@ScottSuarez, a repository maintainer, has been assigned to review your changes. If you have not received review feedback within 2 business days, please leave a comment on this PR asking them to take a look.

You can help make sure that review is quick by doing a self-review and by running impacted tests locally.

@slevenick
Copy link
Contributor

Huh, something is off here. There isn't a build I can approve to trigger generation. Are you up to date with the main branch of this repo?

@Michcioperz Michcioperz force-pushed the additive-vpc-diff-suppress branch from e881351 to f3d19cf Compare January 7, 2025 15:51
@Michcioperz
Copy link
Contributor Author

Seems like recreating the commit helped? Even though the parent commit hasn't changed

@modular-magician
Copy link
Collaborator

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

google provider: Diff ( 2 files changed, 210 insertions(+))
google-beta provider: Diff ( 2 files changed, 210 insertions(+))

1 similar comment
@modular-magician
Copy link
Collaborator

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

google provider: Diff ( 2 files changed, 210 insertions(+))
google-beta provider: Diff ( 2 files changed, 210 insertions(+))

@modular-magician
Copy link
Collaborator

Tests analytics

Total tests: 222
Passed tests: 209
Skipped tests: 12
Affected tests: 1

Click here to see the affected service packages
  • container

Action taken

Found 1 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests
  • TestAccContainerCluster_autopilot_withAdditiveVPCMutation

Get to know how VCR tests work

1 similar comment
@modular-magician
Copy link
Collaborator

Tests analytics

Total tests: 222
Passed tests: 209
Skipped tests: 12
Affected tests: 1

Click here to see the affected service packages
  • container

Action taken

Found 1 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests
  • TestAccContainerCluster_autopilot_withAdditiveVPCMutation

Get to know how VCR tests work

@modular-magician
Copy link
Collaborator

🟢 Tests passed during RECORDING mode:
TestAccContainerCluster_autopilot_withAdditiveVPCMutation [Debug log]

🟢 No issues found for passed tests after REPLAYING rerun.


🟢 All tests passed!

View the build log or the debug log for each test

@Michcioperz
Copy link
Contributor Author

@slevenick I think it's looking better now, PTAL.

I know I put an action item to look for more test gaps in the PR description, but I'll file a followup bug internally for this. I think the dns config mutation test I added should be useful enough for now.

@modular-magician
Copy link
Collaborator

🟢 Tests passed during RECORDING mode:
TestAccContainerCluster_autopilot_withAdditiveVPCMutation [Debug log]

🟢 No issues found for passed tests after REPLAYING rerun.


🟢 All tests passed!

View the build log or the debug log for each test

Copy link

@slevenick This PR has been waiting for review for 3 weekdays. Please take a look! Use the label disable-review-reminders to disable these notifications.

Copy link

@GoogleCloudPlatform/terraform-team @slevenick This PR has been waiting for review for 1 week. Please take a look! Use the label disable-review-reminders to disable these notifications.

@slevenick slevenick requested review from a team and ScottSuarez and removed request for slevenick and a team January 14, 2025 14:37
@slevenick
Copy link
Contributor

Rerolling reviewer as I'm out sick

@Michcioperz
Copy link
Contributor Author

Thanks, hope you get well soon!

@ScottSuarez ScottSuarez merged commit a575eb9 into GoogleCloudPlatform:main Jan 16, 2025
12 checks passed
NA2047 pushed a commit to NA2047/magic-modules that referenced this pull request Jan 18, 2025
anoopkverma-google pushed a commit to anoopkverma-google/magic-modules that referenced this pull request Jan 31, 2025
niharika-98 pushed a commit to niharika-98/magic-modules that referenced this pull request Feb 17, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants