Skip to content

Add membership_type field to cluster/fleet #15221

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.

Sign up for GitHub

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
shuyama1 merged 14 commits into from
Oct 20, 2025
Merged

Add membership_type field to cluster/fleet #15221

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
faa3cb1
Update resource_container_cluster.go.tmpl to support membership_type
anthonyrtong Aug 12, 2025
8b4cf33
Merge branch 'GoogleCloudPlatform:main' into main
anthonyrtong Aug 18, 2025
7ffbe92
Update resource_container_cluster_test.go.tmpl to support membership_…
anthonyrtong Aug 18, 2025
0d507c5
Merge branch 'GoogleCloudPlatform:main' into main
anthonyrtong Sep 16, 2025
8fbc419
Add conversion logic for Fleet membership_type in resource_container_…
anthonyrtong Sep 23, 2025
4c48b33
Update resource_container_cluster.go.tmpl
anthonyrtong Sep 23, 2025
b19490f
Merge branch 'GoogleCloudPlatform:main' into main
anthonyrtong Sep 23, 2025
430981f
Add DiffSuppressFunc for Fleet membership_type
anthonyrtong Sep 23, 2025
30be8e1
remove default for Fleet membership_type
anthonyrtong Sep 23, 2025
4c988f2
Update container_cluster.html.markdown
anthonyrtong Sep 23, 2025
25d0927
Update resource_container_cluster.go.tmpl to omit MEMBERSHIP_TYPE_UNS…
anthonyrtong Sep 30, 2025
78cd424
Update membership_type description in container_cluster docs
anthonyrtong Oct 13, 2025
0e6252f
Merge branch 'GoogleCloudPlatform:main' into main
anthonyrtong Oct 15, 2025
4ec4cbf
Remove DiffSuppressFunc from cluster membership type
anthonyrtong Oct 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions mmv1/third_party/terraform/services/container/resource_container_cluster.go.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2450,6 +2450,13 @@ func ResourceContainerCluster() *schema.Resource {
Computed: true,
Description: `Location of the fleet membership, for example "us-central1".`,
},
"membership_type": {
Type: schema.TypeString,
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

@shuyama1 shuyama1 Oct 7, 2025

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

@anthonyrtong anthonyrtong Oct 13, 2025

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

@shuyama1 shuyama1 Oct 14, 2025

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

@anthonyrtong anthonyrtong Oct 15, 2025

Choose a reason for hiding this comment

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

Done 👍

},
},
},
},
Expand Down Expand Up @@ -6570,6 +6577,7 @@ func expandFleet(configured interface{}) *container.Fleet {
config := l[0].(map[string]interface{})
return &container.Fleet{
Project: config["project"].(string),
MembershipType: config["membership_type"].(string),
}
}

Expand Down Expand Up @@ -7680,6 +7688,7 @@ func flattenFleet(c *container.Fleet) []map[string]interface{} {
"membership_id": membership_id,
"membership_location": membership_location,
"pre_registered": c.PreRegistered,
"membership_type": c.MembershipType,
},
}
}
Expand Down
29 changes: 29 additions & 0 deletions mmv1/third_party/terraform/services/container/resource_container_cluster_test.go.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5914,6 +5914,15 @@ func TestAccContainerCluster_withFleetConfig(t *testing.T) {
ImportStateVerify: true,
ImportStateVerifyIgnore: []string{"deletion_protection"},
},
{
Config: testAccContainerCluster_withFleetConfigLightweightMembership(clusterName, projectID, networkName, subnetworkName),
},
{
ResourceName: "google_container_cluster.primary",
ImportState: true,
ImportStateVerify: true,
ImportStateVerifyIgnore: []string{"deletion_protection"},
},
},
})
}
Expand Down Expand Up @@ -6040,6 +6049,26 @@ resource "google_container_cluster" "primary" {
`, resource_name, networkName, subnetworkName)
}

func testAccContainerCluster_withFleetConfigLightweightMembership(name, projectID, networkName, subnetworkName string) string {
return fmt.Sprintf(`
resource "google_container_cluster" "primary" {
name = "%s"
location = "us-central1-a"
initial_node_count = 1

fleet {
project = "%s"
membership_type = "LIGHTWEIGHT"
}

network = "%s"
subnetwork = "%s"

deletion_protection = false
}
`, name, projectID, networkName, subnetworkName)
}

func testAccContainerCluster_withIncompatibleMasterVersionNodeVersion(name, networkName, subnetworkName string) string {
return fmt.Sprintf(`
resource "google_container_cluster" "gke_cluster" {
Expand Down
2 changes: 2 additions & 0 deletions mmv1/third_party/terraform/website/docs/r/container_cluster.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1662,6 +1662,8 @@ linux_node_config {

* `project` - (Optional) The name of the Fleet host project where this cluster will be registered.

* `membership_type` - (Optional) Sets the membership type of the cluster. Available options are `LIGHTWEIGHT` and `MEMBERSHIP_TYPE_UNSPECIFIED`.

<a name="nested_workload_alts_config"></a>The `workload_alts_config` block supports:

* `enable_alts` - (Required) Whether the alts handshaker should be enabled or not for direct-path. Requires Workload Identity ([workloadPool]((#nested_workload_identity_config)) must be non-empty).
Expand Down