Skip to content

Add membership_type field to cluster/fleet#15221

Merged
shuyama1 merged 14 commits intoGoogleCloudPlatform:mainfrom
anthonyrtong:main
Oct 20, 2025
Merged

Add membership_type field to cluster/fleet#15221
shuyama1 merged 14 commits intoGoogleCloudPlatform:mainfrom
anthonyrtong:main

Conversation

@anthonyrtong
Copy link
Contributor

@anthonyrtong anthonyrtong commented Sep 23, 2025

Fixes b/407103444

container: added `fleet.membership_type` field to `google_container_cluster` resource

@github-actions
Copy link

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

Googlers: For automatic test runs see go/terraform-auto-test-runs.

@shuyama1, 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.

@github-actions github-actions bot requested a review from shuyama1 September 23, 2025 19:38
@github-actions
Copy link

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

@github-actions github-actions bot requested a review from shuyama1 September 30, 2025 21:21
@shuyama1
Copy link
Member

shuyama1 commented Oct 2, 2025

@anthonyrtong I've kicked off the tests. For future PRs, you can have them run automatically by following the instructions at go/terraform-auto-test-runs. Thanks!

@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 ( 3 files changed, 41 insertions(+), 1 deletion(-))
google-beta provider: Diff ( 3 files changed, 41 insertions(+), 1 deletion(-))

@modular-magician
Copy link
Collaborator

Tests analytics

Total tests: 257
Passed tests: 224
Skipped tests: 11
Affected tests: 22

Click here to see the affected service packages
  • container

Action taken

Found 22 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests
  • TestAccContainerCluster_enableCiliumPolicies
  • TestAccContainerCluster_nodeAutoprovisioningDefaults
  • TestAccContainerCluster_withAddons
  • TestAccContainerCluster_withAdvancedDatapath
  • TestAccContainerCluster_withEnterpriseConfig
  • TestAccContainerCluster_withFleetConfig
  • TestAccContainerCluster_withKubeletResourceManagerConfig
  • TestAccContainerCluster_withMasterAuthorizedNetworksConfig
  • TestAccContainerCluster_withNodePoolResize
  • TestAccContainerCluster_withProtectConfig
  • TestAccContainerCluster_withTPUConfig
  • TestAccContainerCluster_withTpu
  • TestAccContainerNodePool_compactPlacement
  • TestAccContainerNodePool_concurrent
  • TestAccContainerNodePool_resize
  • TestAccContainerNodePool_secondaryBootDisks
  • TestAccContainerNodePool_version
  • TestAccContainerNodePool_withEnablePrivateNodesToggle
  • TestAccContainerNodePool_withMultiNicNetworkConfig
  • TestAccContainerNodePool_withNetworkConfig
  • TestAccContainerNodePool_withNodeConfigWithBootDiskConfigChangeTypeLegacy
  • TestAccContainerNodePool_withTaintsUpdate

Get to know how VCR tests work

@modular-magician
Copy link
Collaborator

🟢 Tests passed during RECORDING mode:
TestAccContainerCluster_enableCiliumPolicies [Debug log]
TestAccContainerCluster_nodeAutoprovisioningDefaults [Debug log]
TestAccContainerCluster_withAddons [Debug log]
TestAccContainerCluster_withAdvancedDatapath [Debug log]
TestAccContainerCluster_withEnterpriseConfig [Debug log]
TestAccContainerCluster_withFleetConfig [Debug log]
TestAccContainerCluster_withKubeletResourceManagerConfig [Debug log]
TestAccContainerCluster_withMasterAuthorizedNetworksConfig [Debug log]
TestAccContainerCluster_withNodePoolResize [Debug log]
TestAccContainerCluster_withProtectConfig [Debug log]
TestAccContainerNodePool_compactPlacement [Debug log]
TestAccContainerNodePool_concurrent [Debug log]
TestAccContainerNodePool_resize [Debug log]
TestAccContainerNodePool_version [Debug log]
TestAccContainerNodePool_withEnablePrivateNodesToggle [Debug log]
TestAccContainerNodePool_withMultiNicNetworkConfig [Debug log]
TestAccContainerNodePool_withNetworkConfig [Debug log]
TestAccContainerNodePool_withNodeConfigWithBootDiskConfigChangeTypeLegacy [Debug log]
TestAccContainerNodePool_withTaintsUpdate [Debug log]

🔴 Tests failed when rerunning REPLAYING mode:
TestAccContainerCluster_withNodePoolResize [Error message] [Debug log]
TestAccContainerNodePool_resize [Error message] [Debug log]
TestAccContainerNodePool_withNetworkConfig [Error message] [Debug log]

Tests failed due to non-determinism or randomness when the VCR replayed the response after the HTTP request was made.

Please fix these to complete your PR. If you believe these test failures to be incorrect or unrelated to your change, or if you have any questions, please raise the concern with your reviewer.


🔴 Tests failed during RECORDING mode:
TestAccContainerCluster_withTPUConfig [Error message] [Debug log]
TestAccContainerCluster_withTpu [Error message] [Debug log]
TestAccContainerNodePool_secondaryBootDisks [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

@github-actions
Copy link

github-actions bot commented Oct 3, 2025

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

@github-actions
Copy link

github-actions bot commented Oct 7, 2025

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

Copy link
Member

@shuyama1 shuyama1 left a comment

Choose a reason for hiding this comment

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

Mostly good. left a small comment

Optional: true,
ValidateFunc: validation.StringInSlice([]string{"LIGHTWEIGHT"}, false),
Description: `The type of the cluster's fleet membership.`,
DiffSuppressFunc: tpgresource.EmptyOrDefaultStringSuppress("MEMBERSHIP_TYPE_UNSPECIFIED"),
Copy link
Member

Choose a reason for hiding this comment

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

Just to confirm, is this meant that the API will return MEMBERSHIP_TYPE_UNSPECIFIED when the field is unset? I know our validation already blocks explicitly setting this value in the config.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Right now it should return the field as unset. Is this DiffSuppressFunc overkill?

Copy link
Member

Choose a reason for hiding this comment

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

Okay, then we can remove this DiffSuppressFunc IMO.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done 👍

Clarify the options for membership_type in the fleet block.
@modular-magician modular-magician added the awaiting-approval Pull requests that need reviewer's approval to run presubmit tests label Oct 13, 2025
@github-actions github-actions bot requested a review from shuyama1 October 13, 2025 20:24
@modular-magician modular-magician removed the awaiting-approval Pull requests that need reviewer's approval to run presubmit tests label Oct 15, 2025
@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 ( 3 files changed, 40 insertions(+), 1 deletion(-))
google-beta provider: Diff ( 3 files changed, 40 insertions(+), 1 deletion(-))

@modular-magician
Copy link
Collaborator

Tests analytics

Total tests: 257
Passed tests: 230
Skipped tests: 11
Affected tests: 16

Click here to see the affected service packages
  • container

Action taken

Found 16 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests
  • TestAccContainerCluster_deleteExclusionWindow
  • TestAccContainerCluster_updateMaintenanceExclusionOptions
  • TestAccContainerCluster_withCostManagementConfig
  • TestAccContainerCluster_withKubeletConfig
  • TestAccContainerCluster_withMonitoringConfig
  • TestAccContainerCluster_withNodeConfigLinuxNodeConfig
  • TestAccContainerCluster_withNodePoolResize
  • TestAccContainerCluster_withSecretManagerConfig
  • TestAccContainerCluster_withTPUConfig
  • TestAccContainerCluster_withTpu
  • TestAccContainerNodePool_basic
  • TestAccContainerNodePool_resize
  • TestAccContainerNodePool_secondaryBootDisks
  • TestAccContainerNodePool_withHugepageConfig
  • TestAccContainerNodePool_withLegacyNodeConfigAndBootDiskUpdate
  • TestAccContainerNodePool_withNetworkConfig

Get to know how VCR tests work

@modular-magician
Copy link
Collaborator

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

🔴 Tests failed when rerunning REPLAYING mode:
TestAccContainerNodePool_withNetworkConfig [Error message] [Debug log]

Tests failed due to non-determinism or randomness when the VCR replayed the response after the HTTP request was made.

Please fix these to complete your PR. If you believe these test failures to be incorrect or unrelated to your change, or if you have any questions, please raise the concern with your reviewer.


🔴 Tests failed during RECORDING mode:
TestAccContainerCluster_deleteExclusionWindow [Error message] [Debug log]
TestAccContainerCluster_updateMaintenanceExclusionOptions [Error message] [Debug log]
TestAccContainerCluster_withCostManagementConfig [Error message] [Debug log]
TestAccContainerCluster_withKubeletConfig [Error message] [Debug log]
TestAccContainerCluster_withMonitoringConfig [Error message] [Debug log]
TestAccContainerCluster_withNodeConfigLinuxNodeConfig [Error message] [Debug log]
TestAccContainerCluster_withNodePoolResize [Error message] [Debug log]
TestAccContainerCluster_withSecretManagerConfig [Error message] [Debug log]
TestAccContainerCluster_withTPUConfig [Error message] [Debug log]
TestAccContainerCluster_withTpu [Error message] [Debug log]
TestAccContainerNodePool_basic [Error message] [Debug log]
TestAccContainerNodePool_resize [Error message] [Debug log]
TestAccContainerNodePool_secondaryBootDisks [Error message] [Debug log]
TestAccContainerNodePool_withHugepageConfig [Error message] [Debug log]
TestAccContainerNodePool_withLegacyNodeConfigAndBootDiskUpdate [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

@shuyama1
Copy link
Member

/gcbrun

@modular-magician modular-magician added awaiting-approval Pull requests that need reviewer's approval to run presubmit tests and removed awaiting-approval Pull requests that need reviewer's approval to run presubmit tests labels Oct 16, 2025
@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 ( 3 files changed, 40 insertions(+), 1 deletion(-))
google-beta provider: Diff ( 3 files changed, 40 insertions(+), 1 deletion(-))

@modular-magician
Copy link
Collaborator

Tests analytics

Total tests: 257
Passed tests: 230
Skipped tests: 11
Affected tests: 16

Click here to see the affected service packages
  • container

Action taken

Found 16 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests
  • TestAccContainerCluster_deleteExclusionWindow
  • TestAccContainerCluster_privateRegistry
  • TestAccContainerCluster_updateMaintenanceExclusionOptions
  • TestAccContainerCluster_withLoggingConfig
  • TestAccContainerCluster_withMaintenanceExclusionWindow
  • TestAccContainerCluster_withNodeConfigLinuxNodeConfig
  • TestAccContainerCluster_withNodePoolResize
  • TestAccContainerCluster_withNodePoolUpdateVersion
  • TestAccContainerCluster_withTPUConfig
  • TestAccContainerCluster_withTpu
  • TestAccContainerNodePool_regionalAutoscaling
  • TestAccContainerNodePool_resize
  • TestAccContainerNodePool_resourceManagerTags
  • TestAccContainerNodePool_secondaryBootDisks
  • TestAccContainerNodePool_withMultiNicNetworkConfig
  • TestAccContainerNodePool_withNetworkConfig

Get to know how VCR tests work

@modular-magician
Copy link
Collaborator

🟢 Tests passed during RECORDING mode:
TestAccContainerCluster_privateRegistry [Debug log]
TestAccContainerCluster_updateMaintenanceExclusionOptions [Debug log]
TestAccContainerCluster_withMaintenanceExclusionWindow [Debug log]
TestAccContainerCluster_withNodeConfigLinuxNodeConfig [Debug log]
TestAccContainerNodePool_withMultiNicNetworkConfig [Debug log]
TestAccContainerNodePool_withNetworkConfig [Debug log]

🔴 Tests failed when rerunning REPLAYING mode:
TestAccContainerCluster_privateRegistry [Error message] [Debug log]
TestAccContainerNodePool_withNetworkConfig [Error message] [Debug log]

Tests failed due to non-determinism or randomness when the VCR replayed the response after the HTTP request was made.

Please fix these to complete your PR. If you believe these test failures to be incorrect or unrelated to your change, or if you have any questions, please raise the concern with your reviewer.


🔴 Tests failed during RECORDING mode:
TestAccContainerCluster_deleteExclusionWindow [Error message] [Debug log]
TestAccContainerCluster_withLoggingConfig [Error message] [Debug log]
TestAccContainerCluster_withNodePoolResize [Error message] [Debug log]
TestAccContainerCluster_withNodePoolUpdateVersion [Error message] [Debug log]
TestAccContainerCluster_withTPUConfig [Error message] [Debug log]
TestAccContainerCluster_withTpu [Error message] [Debug log]
TestAccContainerNodePool_regionalAutoscaling [Error message] [Debug log]
TestAccContainerNodePool_resize [Error message] [Debug log]
TestAccContainerNodePool_resourceManagerTags [Error message] [Debug log]
TestAccContainerNodePool_secondaryBootDisks [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

@shuyama1
Copy link
Member

/gcbrun

@modular-magician modular-magician added awaiting-approval Pull requests that need reviewer's approval to run presubmit tests and removed awaiting-approval Pull requests that need reviewer's approval to run presubmit tests labels Oct 19, 2025
@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 ( 3 files changed, 40 insertions(+), 1 deletion(-))
google-beta provider: Diff ( 3 files changed, 40 insertions(+), 1 deletion(-))

@modular-magician
Copy link
Collaborator

Tests analytics

Total tests: 257
Passed tests: 230
Skipped tests: 11
Affected tests: 16

Click here to see the affected service packages
  • container

Action taken

Found 16 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests
  • TestAccContainerCluster_enableCiliumPolicies
  • TestAccContainerCluster_withEnableKubernetesBetaAPIsOnExistingCluster
  • TestAccContainerCluster_withFleetConfig
  • TestAccContainerCluster_withIntraNodeVisibility
  • TestAccContainerCluster_withKubeletConfig
  • TestAccContainerCluster_withNodePoolCIA
  • TestAccContainerCluster_withNodePoolResize
  • TestAccContainerCluster_withNodePoolUpdateVersion
  • TestAccContainerCluster_withTPUConfig
  • TestAccContainerCluster_withTpu
  • TestAccContainerNodePool_resize
  • TestAccContainerNodePool_secondaryBootDisks
  • TestAccContainerNodePool_withHugepageConfig
  • TestAccContainerNodePool_withMaxRunDuration
  • TestAccContainerNodePool_withNetworkConfig
  • TestAccContainerNodePool_withReservationAffinity

Get to know how VCR tests work

@modular-magician
Copy link
Collaborator

🟢 Tests passed during RECORDING mode:
TestAccContainerCluster_enableCiliumPolicies [Debug log]
TestAccContainerCluster_withEnableKubernetesBetaAPIsOnExistingCluster [Debug log]
TestAccContainerCluster_withFleetConfig [Debug log]
TestAccContainerCluster_withIntraNodeVisibility [Debug log]
TestAccContainerCluster_withKubeletConfig [Debug log]
TestAccContainerCluster_withNodePoolCIA [Debug log]
TestAccContainerCluster_withNodePoolResize [Debug log]
TestAccContainerCluster_withNodePoolUpdateVersion [Debug log]
TestAccContainerNodePool_resize [Debug log]
TestAccContainerNodePool_withHugepageConfig [Debug log]
TestAccContainerNodePool_withMaxRunDuration [Debug log]
TestAccContainerNodePool_withNetworkConfig [Debug log]
TestAccContainerNodePool_withReservationAffinity [Debug log]

🔴 Tests failed when rerunning REPLAYING mode:
TestAccContainerCluster_withNodePoolResize [Error message] [Debug log]
TestAccContainerNodePool_resize [Error message] [Debug log]
TestAccContainerNodePool_withNetworkConfig [Error message] [Debug log]

Tests failed due to non-determinism or randomness when the VCR replayed the response after the HTTP request was made.

Please fix these to complete your PR. If you believe these test failures to be incorrect or unrelated to your change, or if you have any questions, please raise the concern with your reviewer.


🔴 Tests failed during RECORDING mode:
TestAccContainerCluster_withTPUConfig [Error message] [Debug log]
TestAccContainerCluster_withTpu [Error message] [Debug log]
TestAccContainerNodePool_secondaryBootDisks [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

@shuyama1 shuyama1 added this pull request to the merge queue Oct 20, 2025
Merged via the queue into GoogleCloudPlatform:main with commit 5eb5d67 Oct 20, 2025
28 of 29 checks passed
BBBmau pushed a commit to BBBmau/magic-modules that referenced this pull request Oct 23, 2025
jkrish-c pushed a commit to jkrish-c/magic-modules that referenced this pull request Oct 24, 2025
akerekes pushed a commit to akerekes/magic-modules that referenced this pull request Oct 29, 2025
mizanali-04 pushed a commit to mizanali-04/magic-modules that referenced this pull request Nov 3, 2025
bcreddy-gcp pushed a commit to bcreddy-gcp/magic-modules that referenced this pull request Nov 24, 2025
JianweiQ pushed a commit to JianweiQ/magic-modules that referenced this pull request Feb 20, 2026
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.

3 participants