Add support for Lustre CSI Driver on GKE (#14435) (#10413)

[upstream:5a4ec2a3bc64354f947734caaa50c9b638ebe6d1]

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/14435.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+container: added `addons_config.lustre_csi_driver_config` field to `google_container_cluster` resource
+```

google-beta/services/container/resource_container_cluster.go

@@ -109,6 +109,7 @@ var (
 		"addons_config.0.stateful_ha_config",
 		"addons_config.0.ray_operator_config",
 		"addons_config.0.parallelstore_csi_driver_config",
+		"addons_config.0.lustre_csi_driver_config",
 		"addons_config.0.istio_config",
 		"addons_config.0.kalm_config",
 	}
@@ -501,6 +502,29 @@ func ResourceContainerCluster() *schema.Resource {
 								},
 							},
 						},
+						"lustre_csi_driver_config": {
+							Type:         schema.TypeList,
+							Optional:     true,
+							Computed:     true,
+							AtLeastOneOf: addonsConfigKeys,
+							MaxItems:     1,
+							Description:  `Configuration for the Lustre CSI driver. Defaults to disabled; set enabled = true to enable.`,
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									"enabled": {
+										Type:        schema.TypeBool,
+										Required:    true,
+										Description: `Whether the Lustre CSI driver is enabled for this cluster.`,
+									},
+									"enable_legacy_lustre_port": {
+										Type:     schema.TypeBool,
+										Optional: true,
+										Description: `If set to true, the Lustre CSI driver will initialize LNet (the virtual network layer for Lustre kernel module) using port 6988.
+										This flag is required to workaround a port conflict with the gke-metadata-server on GKE nodes.`,
+									},
+								},
+							},
+						},
 						"istio_config": {
 							Type:         schema.TypeList,
 							Optional:     true,
@@ -5251,6 +5275,20 @@ func expandClusterAddonsConfig(configured interface{}) *container.AddonsConfig {
 		}
 	}
 
+	if v, ok := config["lustre_csi_driver_config"]; ok && len(v.([]interface{})) > 0 {
+		lustreConfig := v.([]interface{})[0].(map[string]interface{})
+		ac.LustreCsiDriverConfig = &container.LustreCsiDriverConfig{
+			Enabled:         lustreConfig["enabled"].(bool),
+			ForceSendFields: []string{"Enabled"},
+		}
+
+		// Check for enable_legacy_lustre_port
+		if val, ok := lustreConfig["enable_legacy_lustre_port"]; ok {
+			ac.LustreCsiDriverConfig.EnableLegacyLustrePort = val.(bool)
+			ac.LustreCsiDriverConfig.ForceSendFields = append(ac.LustreCsiDriverConfig.ForceSendFields, "EnableLegacyLustrePort")
+		}
+	}
+
 	if v, ok := config["istio_config"]; ok && len(v.([]interface{})) > 0 {
 		addon := v.([]interface{})[0].(map[string]interface{})
 		ac.IstioConfig = &container.IstioConfig{
@@ -6665,6 +6703,15 @@ func flattenClusterAddonsConfig(c *container.AddonsConfig) []map[string]interfac
 			},
 		}
 	}
+	if c.LustreCsiDriverConfig != nil {
+		lustreConfig := c.LustreCsiDriverConfig
+		result["lustre_csi_driver_config"] = []map[string]interface{}{
+			{
+				"enabled":                   lustreConfig.Enabled,
+				"enable_legacy_lustre_port": lustreConfig.EnableLegacyLustrePort,
+			},
+		}
+	}
 
 	if c.IstioConfig != nil {
 		result["istio_config"] = []map[string]interface{}{

google-beta/services/container/resource_container_cluster_test.go

@@ -6882,6 +6882,9 @@ resource "google_container_cluster" "primary" {
 	parallelstore_csi_driver_config {
       enabled = false
     }
+    lustre_csi_driver_config {
+      enabled = false
+    }
     istio_config {
       disabled = true
       auth     = "AUTH_MUTUAL_TLS"
@@ -6955,8 +6958,12 @@ resource "google_container_cluster" "primary" {
         enabled = true
       }
     }
-	parallelstore_csi_driver_config {
+    parallelstore_csi_driver_config {
+      enabled = true
+    }
+    lustre_csi_driver_config {
       enabled = true
+      enable_legacy_lustre_port=true
     }
     istio_config {
       disabled = false

website/docs/r/container_cluster.html.markdown

@@ -527,6 +527,15 @@ Fleet configuration for the cluster. Structure is [documented below](#nested_fle
    It is enabled by default for Autopilot clusters with version 1.29 or later; set `enabled = true` to enable it explicitly.
    See [Enable the Parallelstore CSI driver](https://cloud.google.com/kubernetes-engine/docs/how-to/persistent-volumes/parallelstore-csi-new-volume#enable) for more information.
 
+*  `lustre_csi_driver_config` - (Optional) The status of the Lustre CSI driver addon,
+   which allows the usage of a Lustre instances as volumes.
+   It is disabled by default for Standard clusters; set `enabled = true` to enable.
+   It is disabled by default for Autopilot clusters; set `enabled = true` to enable.
+   Lustre CSI Driver Config has optional subfield
+   `enable_legacy_lustre_port` which allows the Lustre CSI driver to initialize LNet (the virtual networklayer for Lustre kernel module) using port 6988. 
+   This flag is required to workaround a port conflict with the gke-metadata-server on GKE nodes.
+   See [Enable Lustre CSI driver](https://cloud.google.com/kubernetes-engine/docs/how-to/persistent-volumes/lustre-csi-driver-new-volume) for more information.
+
 This example `addons_config` disables two addons:
 
 ```hcl