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

Suppress private_endpoint_subnetwork when master_ipv4_cidr_block is set #2096

Conversation

modular-magician
Copy link
Collaborator

For private flexible clusters, user are still allowed to set master_ipv4_cidr_block. In this situation, private_endpoint_subnetwork will return a non-empty subnet name, which doesn't match the empty subnet in Terraform config (user can set either cidr block or subnet, or neither, but not both, which is error-checked by API). We should ignore the subnet diff in this case. This PR is intended to fix the same issue #10089 attempted to fix. #10089 was reverted by #10096.

Release Note Template for Downstream PRs (will be copied)

container: fixed `google_container_cluster` permadiff when `master_ipv4_cidr_block` is set for a private flexible cluster

Derived from GoogleCloudPlatform/magic-modules#10101

…et (#10101)

* Suppress private_endpoint_subnetwork when master_ipv4_cidr_block is set

* acceptance test: Suppress private_endpoint_subnetwork when master_ipv4_cidr_block is set

Signed-off-by: Francis Liu <[email protected]>

---------

Signed-off-by: Francis Liu <[email protected]>

[upstream:e6dbde8e5cde48677a57ce0667090ccd799cb29b]

Signed-off-by: Modular Magician <[email protected]>
@modular-magician modular-magician requested a review from a team as a code owner March 26, 2024 17:31
@modular-magician modular-magician requested review from iyabchen and removed request for a team March 26, 2024 17:31
Copy link

🤖 I detect that the PR title and the commit message differ and there's only one commit. To use the PR title for the commit history, you can use Github's automerge feature with squashing, or use automerge label. Good luck human!

-- conventional-commit-lint bot
https://conventionalcommits.org/

@modular-magician modular-magician merged commit ca56139 into GoogleCloudPlatform:main Mar 26, 2024
3 checks passed
@modular-magician modular-magician deleted the downstream-pr-e6dbde8e5cde48677a57ce0667090ccd799cb29b branch November 18, 2024 07:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant