diff --git a/google/resource_container_cluster.go b/google/resource_container_cluster.go index 8ee43c4b..552c4ca9 100644 --- a/google/resource_container_cluster.go +++ b/google/resource_container_cluster.go @@ -1106,6 +1106,33 @@ func resourceContainerClusterUpdate(d *schema.ResourceData, meta interface{}) er d.SetPartial("monitoring_service") } + if d.HasChange("logging_service") { + logging := d.Get("logging_service").(string) + + req := &containerBeta.SetLoggingServiceRequest{ + LoggingService: logging, + } + updateF := func() error { + name := containerClusterFullName(project, location, clusterName) + op, err := config.clientContainerBeta.Projects.Locations.Clusters.SetLogging(name, req).Do() + if err != nil { + return err + } + + // Wait until it's updated + return containerSharedOperationWait(config, op, project, location, "updating GKE logging service", timeoutInMinutes, 2) + } + + // Call update serially. + if err := lockedCall(lockKey, updateF); err != nil { + return err + } + + log.Printf("[INFO] GKE cluster %s: logging service has been updated to %s", d.Id(), + logging) + d.SetPartial("logging_service") + } + if d.HasChange("network_policy") { np := d.Get("network_policy") req := &containerBeta.SetNetworkPolicyRequest{ @@ -1151,33 +1178,6 @@ func resourceContainerClusterUpdate(d *schema.ResourceData, meta interface{}) er d.SetPartial("node_pool") } - if d.HasChange("logging_service") { - logging := d.Get("logging_service").(string) - - req := &containerBeta.SetLoggingServiceRequest{ - LoggingService: logging, - } - updateF := func() error { - name := containerClusterFullName(project, location, clusterName) - op, err := config.clientContainerBeta.Projects.Locations.Clusters.SetLogging(name, req).Do() - if err != nil { - return err - } - - // Wait until it's updated - return containerSharedOperationWait(config, op, project, location, "updating GKE logging service", timeoutInMinutes, 2) - } - - // Call update serially. - if err := lockedCall(lockKey, updateF); err != nil { - return err - } - - log.Printf("[INFO] GKE cluster %s: logging service has been updated to %s", d.Id(), - logging) - d.SetPartial("logging_service") - } - if d.HasChange("node_config") { if d.HasChange("node_config.0.image_type") { it := d.Get("node_config.0.image_type").(string)