Add Managed OpenTelemetry config to google_container_cluster.

Author: giuliano-sider

mmv1/third_party/terraform/services/container/resource_container_cluster.go.tmpl

@@ -1957,6 +1957,26 @@ func ResourceContainerCluster() *schema.Resource {
 				},
 			},
 
+{{- if ne $.TargetVersionName "ga" }}
+			"managed_opentelemetry_config": {
+				Type:        schema.TypeList,
+				Optional:    true,
+				Computed:    true,
+				MaxItems:    1,
+				Description: "The configuration for the Managed OpenTelemetry pipeline inside the cluster.",
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"scope": {
+							Type:         schema.TypeString,
+							Optional:     true,
+							Description:  "The scope of the Managed OpenTelemetry pipeline. Available options include OPENTELEMETRY_SCOPE_UNSPECIFIED, NONE, and COLLECTION_AND_INSTRUMENTATION_COMPONENTS.",
+							ValidateFunc: validation.StringInSlice([]string{"OPENTELEMETRY_SCOPE_UNSPECIFIED", "NONE", "COLLECTION_AND_INSTRUMENTATION_COMPONENTS"}, false),
+						},
+					},
+				},
+			},
+{{- end }}
+
 			// Defaults to "VPC_NATIVE" during create only
 			"networking_mode": {
 				Type:         schema.TypeString,
@@ -2847,6 +2867,9 @@ func resourceContainerClusterCreate(d *schema.ResourceData, meta interface{}) er
 		MonitoringService:       d.Get("monitoring_service").(string),
 		NetworkPolicy:           expandNetworkPolicy(d.Get("network_policy")),
 		AddonsConfig:            expandClusterAddonsConfig(d.Get("addons_config")),
+{{- if ne $.TargetVersionName "ga" }}
+		ManagedOpentelemetryConfig: expandManagedOpenTelemetryConfig(d.Get("managed_opentelemetry_config")),
+{{- end }}
 		EnableKubernetesAlpha:   d.Get("enable_kubernetes_alpha").(bool),
 		IpAllocationPolicy:      ipAllocationBlock,
 {{- if ne $.TargetVersionName "ga" }}
@@ -3622,6 +3645,12 @@ func resourceContainerClusterRead(d *schema.ResourceData, meta interface{}) erro
 		return err
 	}
 
+{{ if ne $.TargetVersionName "ga" }}
+	if err := d.Set("managed_opentelemetry_config", flattenManagedOpenTelemetryConfig(cluster.ManagedOpentelemetryConfig)); err != nil {
+		return err
+	}
+{{- end }}
+
 	if err := d.Set("node_pool_auto_config", flattenNodePoolAutoConfig(cluster.NodePoolAutoConfig)); err != nil {
 		return err
 	}
@@ -4899,6 +4928,23 @@ func resourceContainerClusterUpdate(d *schema.ResourceData, meta interface{}) er
 		log.Printf("[INFO] GKE cluster %s monitoring config has been updated", d.Id())
 	}
 
+{{ if ne $.TargetVersionName `ga` -}}
+	if d.HasChange("managed_opentelemetry_config") {
+		req := &container.UpdateClusterRequest{
+			Update: &container.ClusterUpdate{
+				DesiredManagedOpentelemetryConfig: expandManagedOpenTelemetryConfig(d.Get("managed_opentelemetry_config")),
+			},
+		}
+		updateF := updateFunc(req, "updating GKE cluster managed opentelemetry config")
+		// Call update serially.
+		if err := transport_tpg.LockedCall(lockKey, updateF); err != nil {
+			return err
+		}
+
+		log.Printf("[INFO] GKE cluster %s managed opentelemetry config has been updated", d.Id())
+	}
+{{- end }}
+
 	if d.HasChange("effective_labels") {
 		resourceLabels := d.Get("effective_labels").(map[string]interface{})
 		labelFingerprint := d.Get("label_fingerprint").(string)
@@ -6342,6 +6388,30 @@ func expandManCidrBlocks(configured interface{}) []*container.CidrBlock {
 	return result
 }
 
+{{- if ne $.TargetVersionName "ga" }}
+func expandManagedOpenTelemetryConfig(configured interface{}) *container.ManagedOpenTelemetryConfig {
+	l := configured.([]interface{})
+	if len(l) == 0 || l[0] == nil {
+		return nil
+	}
+	config := l[0].(map[string]interface{})
+	return &container.ManagedOpenTelemetryConfig{
+		Scope: config["scope"].(string),
+	}
+}
+
+func flattenManagedOpenTelemetryConfig(c *container.ManagedOpenTelemetryConfig) []map[string]interface{} {
+	if c == nil {
+		return nil
+	}
+	return []map[string]interface{}{
+		{
+			"scope": c.Scope,
+		},
+	}
+}
+{{- end }}
+
 func expandNetworkPolicy(configured interface{}) *container.NetworkPolicy {
 	result := &container.NetworkPolicy{}
 	l := configured.([]interface{})

mmv1/third_party/terraform/services/container/resource_container_cluster_meta.yaml.tmpl

@@ -209,6 +209,10 @@ fields:
     api_field: 'maintenancePolicy.window.recurringWindow.recurrence'
   - field: 'maintenance_policy.recurring_window.start_time'
     api_field: 'maintenancePolicy.window.recurringWindow.window.startTime'
+{{- if ne $.TargetVersionName "ga" }}
+  - field: 'managed_opentelemetry_config.scope'
+    api_field: 'managedOpentelemetryConfig.scope'
+{{- end }}
   - api_field: 'masterAuth.clientCertificate'
   - api_field: 'masterAuth.clientCertificateConfig.issueClientCertificate'
   - api_field: 'masterAuth.clientKey'

mmv1/third_party/terraform/services/container/resource_container_cluster_test.go.tmpl

@@ -1463,6 +1463,74 @@ func TestAccContainerCluster_withTelemetryEnabled(t *testing.T) {
 }
 {{- end }}
 
+{{- if ne $.TargetVersionName "ga" }}
+func TestAccContainerCluster_withManagedOpenTelemetryConfig(t *testing.T) {
+	t.Parallel()
+
+	clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10))
+	networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster")
+	subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName)
+
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:     func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		CheckDestroy: testAccCheckContainerClusterDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccContainerCluster_withManagedOpenTelemetryConfig(clusterName, networkName, subnetworkName, "COLLECTION_AND_INSTRUMENTATION_COMPONENTS"),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr("google_container_cluster.with_managed_opentelemetry",
+						"managed_opentelemetry_config.0.scope", "COLLECTION_AND_INSTRUMENTATION_COMPONENTS"),
+				),
+			},
+			{
+				ResourceName:            "google_container_cluster.with_managed_opentelemetry",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"min_master_version", "deletion_protection"},
+			},
+			{
+				Config: testAccContainerCluster_withManagedOpenTelemetryConfig(clusterName, networkName, subnetworkName, "NONE"),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr("google_container_cluster.with_managed_opentelemetry",
+						"managed_opentelemetry_config.0.scope", "NONE"),
+				),
+			},
+			{
+				ResourceName:            "google_container_cluster.with_managed_opentelemetry",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"min_master_version", "deletion_protection"},
+			},
+		},
+	})
+}
+
+func testAccContainerCluster_withManagedOpenTelemetryConfig(clusterName, networkName, subnetworkName, scope string) string {
+	return fmt.Sprintf(`
+data "google_container_engine_versions" "uscentral1a" {
+  location       = "us-central1-a"
+  version_prefix = "1.34."
+}
+
+resource "google_container_cluster" "with_managed_opentelemetry" {
+  name               = "%s"
+  location           = "us-central1-a"
+  initial_node_count = 1
+  network            = "%s"
+  subnetwork         = "%s"
+  min_master_version = data.google_container_engine_versions.uscentral1a.latest_master_version
+
+  managed_opentelemetry_config {
+    scope = "%s"
+  }
+
+  deletion_protection = false
+}
+`, clusterName, networkName, subnetworkName, scope)
+}
+{{- end }}
+
 func TestAccContainerCluster_withMasterAuthorizedNetworksConfig(t *testing.T) {
 	t.Parallel()
 

mmv1/third_party/terraform/website/docs/r/container_cluster.html.markdown

@@ -210,6 +210,8 @@ Options are `VPC_NATIVE` or `ROUTES`. `VPC_NATIVE` enables [IP aliasing](https:/
 * `maintenance_policy` - (Optional) The maintenance policy to use for the cluster. Structure is
     [documented below](#nested_maintenance_policy).
 
+* `managed_opentelemetry_config` - (Optional) Configuration for the [GKE Managed OpenTelemetry](https://docs.cloud.google.com/kubernetes-engine/docs/concepts/managed-otel-gke) feature. Structure is [documented below](#nested_managed_opentelemetry_config).
+
 * `master_auth` - (Optional) The authentication information for accessing the
 Kubernetes master. Some values in this block are only returned by the API if
 your service account has permission to get credentials for your GKE cluster. If
@@ -697,6 +699,10 @@ This block also contains several computed attributes, documented below.
 
 * `advanced_datapath_observability_config` - (Optional) Configuration for Advanced Datapath Monitoring. Structure is [documented below](#nested_advanced_datapath_observability_config).
 
+<a name="nested_managed_opentelemetry_config"></a>The `managed_opentelemetry_config` block supports:
+
+*  `scope` - (Required) The scope of the Managed OpenTelemetry pipeline. Supported values include: `OPENTELEMETRY_SCOPE_UNSPECIFIED`, `NONE`, `COLLECTION_AND_INSTRUMENTATION_COMPONENTS`.
+
 <a name="nested_managed_prometheus"></a>The `managed_prometheus` block supports:
 
 * `enabled` - (Required) Whether or not the managed collection is enabled.