diff --git a/google/resource_container_cluster.go b/google/resource_container_cluster.go index a582a0ca876..19c34f1fd0d 100644 --- a/google/resource_container_cluster.go +++ b/google/resource_container_cluster.go @@ -328,11 +328,11 @@ func resourceContainerCluster() *schema.Resource { }, "network": { - Type: schema.TypeString, - Optional: true, - Default: "default", - ForceNew: true, - StateFunc: StoreResourceName, + Type: schema.TypeString, + Optional: true, + Default: "default", + ForceNew: true, + DiffSuppressFunc: compareSelfLinkOrResourceName, }, "network_policy": { @@ -566,7 +566,7 @@ func resourceContainerClusterCreate(d *schema.ResourceData, meta interface{}) er if err != nil { return err } - cluster.Network = network.Name + cluster.Network = network.RelativeLink() } if v, ok := d.GetOk("network_policy"); ok && len(v.([]interface{})) > 0 { @@ -574,7 +574,11 @@ func resourceContainerClusterCreate(d *schema.ResourceData, meta interface{}) er } if v, ok := d.GetOk("subnetwork"); ok { - cluster.Subnetwork = v.(string) + subnetwork, err := ParseSubnetworkFieldValue(v.(string), d, config) + if err != nil { + return err + } + cluster.Subnetwork = subnetwork.RelativeLink() } if v, ok := d.GetOk("addons_config"); ok { @@ -747,8 +751,8 @@ func resourceContainerClusterRead(d *schema.ResourceData, meta interface{}) erro d.Set("enable_legacy_abac", cluster.LegacyAbac.Enabled) d.Set("logging_service", cluster.LoggingService) d.Set("monitoring_service", cluster.MonitoringService) - d.Set("network", cluster.Network) - d.Set("subnetwork", cluster.Subnetwork) + d.Set("network", cluster.NetworkConfig.Network) + d.Set("subnetwork", cluster.NetworkConfig.Subnetwork) if err := d.Set("node_config", flattenNodeConfig(cluster.NodeConfig)); err != nil { return err } diff --git a/google/resource_container_cluster_test.go b/google/resource_container_cluster_test.go index 390a564c551..6632e359096 100644 --- a/google/resource_container_cluster_test.go +++ b/google/resource_container_cluster_test.go @@ -1134,6 +1134,32 @@ func TestAccContainerCluster_withPodSecurityPolicy(t *testing.T) { }) } +func TestAccContainerCluster_sharedVpc(t *testing.T) { + t.Parallel() + + clusterName := fmt.Sprintf("cluster-test-%s", acctest.RandString(10)) + org := getTestOrgFromEnv(t) + billingId := getTestBillingAccountFromEnv(t) + projectName := fmt.Sprintf("tf-xpntest-%s", acctest.RandString(10)) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckContainerClusterDestroy, + Steps: []resource.TestStep{ + { + Config: testAccContainerCluster_sharedVpc(org, billingId, projectName, clusterName), + }, + { + ResourceName: "google_container_cluster.shared_vpc_cluster", + ImportStateIdPrefix: fmt.Sprintf("%s-service/us-central1-a/", projectName), + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + func testAccCheckContainerClusterDestroy(s *terraform.State) error { config := testAccProvider.Meta().(*Config) @@ -2099,3 +2125,107 @@ resource "google_container_cluster" "with_private_cluster" { } }`, clusterName, clusterName) } + +func testAccContainerCluster_sharedVpc(org, billingId, projectName, name string) string { + return fmt.Sprintf(` +resource "google_project" "host_project" { + name = "Test Project XPN Host" + project_id = "%s-host" + org_id = "%s" + billing_account = "%s" +} + +resource "google_project_service" "host_project" { + project = "${google_project.host_project.project_id}" + service = "container.googleapis.com" +} + +resource "google_compute_shared_vpc_host_project" "host_project" { + project = "${google_project_service.host_project.project}" +} + +resource "google_project" "service_project" { + name = "Test Project XPN Service" + project_id = "%s-service" + org_id = "%s" + billing_account = "%s" +} + +resource "google_project_service" "service_project" { + project = "${google_project.service_project.project_id}" + service = "container.googleapis.com" +} + +resource "google_compute_shared_vpc_service_project" "service_project" { + host_project = "${google_compute_shared_vpc_host_project.host_project.project}" + service_project = "${google_project_service.service_project.project}" +} + +resource "google_project_iam_member" "host_service_agent" { + project = "${google_project_service.host_project.project}" + role = "roles/container.hostServiceAgentUser" + member = "serviceAccount:service-${google_project.service_project.number}@container-engine-robot.iam.gserviceaccount.com" + + depends_on = ["google_project_service.service_project"] +} + +resource "google_compute_subnetwork_iam_member" "service_network_cloud_services" { + project = "${google_compute_shared_vpc_host_project.host_project.project}" + subnetwork = "${google_compute_subnetwork.shared_subnetwork.name}" + role = "roles/compute.networkUser" + member = "serviceAccount:${google_project.service_project.number}@cloudservices.gserviceaccount.com" +} + +resource "google_compute_subnetwork_iam_member" "service_network_gke_user" { + project = "${google_compute_shared_vpc_host_project.host_project.project}" + subnetwork = "${google_compute_subnetwork.shared_subnetwork.name}" + role = "roles/compute.networkUser" + member = "serviceAccount:service-${google_project.service_project.number}@container-engine-robot.iam.gserviceaccount.com" +} + +resource "google_compute_network" "shared_network" { + name = "test-%s" + project = "${google_compute_shared_vpc_host_project.host_project.project}" + + auto_create_subnetworks = false +} + +resource "google_compute_subnetwork" "shared_subnetwork" { + name = "test-%s" + ip_cidr_range = "10.0.0.0/16" + region = "us-central1" + network = "${google_compute_network.shared_network.self_link}" + project = "${google_compute_shared_vpc_host_project.host_project.project}" + + secondary_ip_range { + range_name = "pods" + ip_cidr_range = "10.1.0.0/16" + } + + secondary_ip_range { + range_name = "services" + ip_cidr_range = "10.2.0.0/20" + } +} + +resource "google_container_cluster" "shared_vpc_cluster" { + name = "%s" + zone = "us-central1-a" + initial_node_count = 1 + project = "${google_compute_shared_vpc_service_project.service_project.service_project}" + + network = "${google_compute_network.shared_network.self_link}" + subnetwork = "${google_compute_subnetwork.shared_subnetwork.self_link}" + + ip_allocation_policy { + cluster_secondary_range_name = "${google_compute_subnetwork.shared_subnetwork.secondary_ip_range.0.range_name}" + services_secondary_range_name = "${google_compute_subnetwork.shared_subnetwork.secondary_ip_range.1.range_name}" + } + + depends_on = [ + "google_project_iam_member.host_service_agent", + "google_compute_subnetwork_iam_member.service_network_cloud_services", + "google_compute_subnetwork_iam_member.service_network_gke_user" + ] +}`, projectName, org, billingId, projectName, org, billingId, acctest.RandString(10), acctest.RandString(10), name) +} diff --git a/vendor/google.golang.org/api/container/v1beta1/container-api.json b/vendor/google.golang.org/api/container/v1beta1/container-api.json index 37784ba7376..de641cc10db 100644 --- a/vendor/google.golang.org/api/container/v1beta1/container-api.json +++ b/vendor/google.golang.org/api/container/v1beta1/container-api.json @@ -117,6 +117,55 @@ "resources": { "projects": { "resources": { + "aggregated": { + "resources": { + "usableSubnetworks": { + "methods": { + "list": { + "description": "Lists subnetworks that are usable for creating clusters in a project.", + "flatPath": "v1beta1/projects/{projectsId}/aggregated/usableSubnetworks", + "httpMethod": "GET", + "id": "container.projects.aggregated.usableSubnetworks.list", + "parameterOrder": [ + "parent" + ], + "parameters": { + "filter": { + "description": "Filtering currently only supports equality on the networkProjectId and must\nbe in the form: \"networkProjectId=[PROJECTID]\", where `networkProjectId`\nis the project which owns the listed subnetworks. This defaults to the\nparent project ID.", + "location": "query", + "type": "string" + }, + "pageSize": { + "description": "The max number of results per page that should be returned. If the number\nof available results is larger than `page_size`, a `next_page_token` is\nreturned which can be used to get the next page of results in subsequent\nrequests. Acceptable values are 0 to 500, inclusive. (Default: 500)", + "format": "int32", + "location": "query", + "type": "integer" + }, + "pageToken": { + "description": "Specifies a page token to use. Set this to the nextPageToken returned by\nprevious list requests to get the next page of results.", + "location": "query", + "type": "string" + }, + "parent": { + "description": "The parent project where subnetworks are usable.\nSpecified in the format 'projects/*'.", + "location": "path", + "pattern": "^projects/[^/]+$", + "required": true, + "type": "string" + } + }, + "path": "v1beta1/{+parent}/aggregated/usableSubnetworks", + "response": { + "$ref": "ListUsableSubnetworksResponse" + }, + "scopes": [ + "https://www.googleapis.com/auth/cloud-platform" + ] + } + } + } + } + }, "locations": { "methods": { "getServerConfig": { @@ -153,6 +202,31 @@ "scopes": [ "https://www.googleapis.com/auth/cloud-platform" ] + }, + "list": { + "description": "", + "flatPath": "v1beta1/projects/{projectsId}/locations", + "httpMethod": "GET", + "id": "container.projects.locations.list", + "parameterOrder": [ + "parent" + ], + "parameters": { + "parent": { + "description": "Contains the name of the resource requested.\nSpecific in the format 'projects/*/locations'.", + "location": "path", + "pattern": "^projects/[^/]+$", + "required": true, + "type": "string" + } + }, + "path": "v1beta1/{+parent}/locations", + "response": { + "$ref": "ListLocationsResponse" + }, + "scopes": [ + "https://www.googleapis.com/auth/cloud-platform" + ] } }, "resources": { @@ -168,7 +242,7 @@ ], "parameters": { "name": { - "description": "The name (project, location, cluster id) of the cluster to complete IP rotation.\nSpecified in the format 'projects/*/locations/*/clusters/*'.", + "description": "The name (project, location, cluster id) of the cluster to complete IP\nrotation. Specified in the format 'projects/*/locations/*/clusters/*'.", "location": "path", "pattern": "^projects/[^/]+/locations/[^/]+/clusters/[^/]+$", "required": true, @@ -255,7 +329,7 @@ ] }, "get": { - "description": "Gets the details of a specific cluster.", + "description": "Gets the details for a specific cluster.", "flatPath": "v1beta1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}", "httpMethod": "GET", "id": "container.projects.locations.clusters.get", @@ -330,7 +404,7 @@ ] }, "setAddons": { - "description": "Sets the addons of a specific cluster.", + "description": "Sets the addons for a specific cluster.", "flatPath": "v1beta1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:setAddons", "httpMethod": "POST", "id": "container.projects.locations.clusters.setAddons", @@ -386,7 +460,7 @@ ] }, "setLocations": { - "description": "Sets the locations of a specific cluster.", + "description": "Sets the locations for a specific cluster.", "flatPath": "v1beta1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:setLocations", "httpMethod": "POST", "id": "container.projects.locations.clusters.setLocations", @@ -414,7 +488,7 @@ ] }, "setLogging": { - "description": "Sets the logging service of a specific cluster.", + "description": "Sets the logging service for a specific cluster.", "flatPath": "v1beta1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:setLogging", "httpMethod": "POST", "id": "container.projects.locations.clusters.setLogging", @@ -470,7 +544,7 @@ ] }, "setMasterAuth": { - "description": "Used to set master auth materials. Currently supports :-\nChanging the admin password of a specific cluster.\nThis can be either via password generation or explicitly set.\nModify basic_auth.csv and reset the K8S API server.", + "description": "Used to set master auth materials. Currently supports :-\nChanging the admin password for a specific cluster.\nThis can be either via password generation or explicitly set.\nModify basic_auth.csv and reset the K8S API server.", "flatPath": "v1beta1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:setMasterAuth", "httpMethod": "POST", "id": "container.projects.locations.clusters.setMasterAuth", @@ -498,7 +572,7 @@ ] }, "setMonitoring": { - "description": "Sets the monitoring service of a specific cluster.", + "description": "Sets the monitoring service for a specific cluster.", "flatPath": "v1beta1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:setMonitoring", "httpMethod": "POST", "id": "container.projects.locations.clusters.setMonitoring", @@ -535,7 +609,7 @@ ], "parameters": { "name": { - "description": "The name (project, location, cluster id) of the cluster to set networking policy.\nSpecified in the format 'projects/*/locations/*/clusters/*'.", + "description": "The name (project, location, cluster id) of the cluster to set networking\npolicy. Specified in the format 'projects/*/locations/*/clusters/*'.", "location": "path", "pattern": "^projects/[^/]+/locations/[^/]+/clusters/[^/]+$", "required": true, @@ -591,7 +665,7 @@ ], "parameters": { "name": { - "description": "The name (project, location, cluster id) of the cluster to start IP rotation.\nSpecified in the format 'projects/*/locations/*/clusters/*'.", + "description": "The name (project, location, cluster id) of the cluster to start IP\nrotation. Specified in the format 'projects/*/locations/*/clusters/*'.", "location": "path", "pattern": "^projects/[^/]+/locations/[^/]+/clusters/[^/]+$", "required": true, @@ -610,7 +684,7 @@ ] }, "update": { - "description": "Updates the settings of a specific cluster.", + "description": "Updates the settings for a specific cluster.", "flatPath": "v1beta1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}", "httpMethod": "PUT", "id": "container.projects.locations.clusters.update", @@ -638,7 +712,7 @@ ] }, "updateMaster": { - "description": "Updates the master of a specific cluster.", + "description": "Updates the master for a specific cluster.", "flatPath": "v1beta1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:updateMaster", "httpMethod": "POST", "id": "container.projects.locations.clusters.updateMaster", @@ -679,7 +753,7 @@ ], "parameters": { "parent": { - "description": "The parent (project, location, cluster id) where the node pool will be created.\nSpecified in the format 'projects/*/locations/*/clusters/*/nodePools/*'.", + "description": "The parent (project, location, cluster id) where the node pool will be\ncreated. Specified in the format\n'projects/*/locations/*/clusters/*/nodePools/*'.", "location": "path", "pattern": "^projects/[^/]+/locations/[^/]+/clusters/[^/]+$", "required": true, @@ -712,7 +786,7 @@ "type": "string" }, "name": { - "description": "The name (project, location, cluster, node pool id) of the node pool to delete.\nSpecified in the format 'projects/*/locations/*/clusters/*/nodePools/*'.", + "description": "The name (project, location, cluster, node pool id) of the node pool to\ndelete. Specified in the format\n'projects/*/locations/*/clusters/*/nodePools/*'.", "location": "path", "pattern": "^projects/[^/]+/locations/[^/]+/clusters/[^/]+/nodePools/[^/]+$", "required": true, @@ -757,7 +831,7 @@ "type": "string" }, "name": { - "description": "The name (project, location, cluster, node pool id) of the node pool to get.\nSpecified in the format 'projects/*/locations/*/clusters/*/nodePools/*'.", + "description": "The name (project, location, cluster, node pool id) of the node pool to\nget. Specified in the format\n'projects/*/locations/*/clusters/*/nodePools/*'.", "location": "path", "pattern": "^projects/[^/]+/locations/[^/]+/clusters/[^/]+/nodePools/[^/]+$", "required": true, @@ -802,7 +876,7 @@ "type": "string" }, "parent": { - "description": "The parent (project, location, cluster id) where the node pools will be listed.\nSpecified in the format 'projects/*/locations/*/clusters/*'.", + "description": "The parent (project, location, cluster id) where the node pools will be\nlisted. Specified in the format 'projects/*/locations/*/clusters/*'.", "location": "path", "pattern": "^projects/[^/]+/locations/[^/]+/clusters/[^/]+$", "required": true, @@ -912,7 +986,7 @@ ] }, "setSize": { - "description": "Sets the size of a specific node pool.", + "description": "Sets the size for a specific node pool.", "flatPath": "v1beta1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}/nodePools/{nodePoolsId}:setSize", "httpMethod": "POST", "id": "container.projects.locations.clusters.nodePools.setSize", @@ -949,7 +1023,7 @@ ], "parameters": { "name": { - "description": "The name (project, location, cluster, node pool) of the node pool to update.\nSpecified in the format 'projects/*/locations/*/clusters/*/nodePools/*'.", + "description": "The name (project, location, cluster, node pool) of the node pool to\nupdate. Specified in the format\n'projects/*/locations/*/clusters/*/nodePools/*'.", "location": "path", "pattern": "^projects/[^/]+/locations/[^/]+/clusters/[^/]+/nodePools/[^/]+$", "required": true, @@ -1063,7 +1137,7 @@ "type": "string" }, "zone": { - "description": "Deprecated. The name of the Google Compute Engine [zone](/compute/docs/zones#available)\nto return operations for, or `-` for all zones.\nThis field has been deprecated and replaced by the parent field.", + "description": "Deprecated. The name of the Google Compute Engine\n[zone](/compute/docs/zones#available) to return operations for, or `-` for\nall zones. This field has been deprecated and replaced by the parent field.", "location": "query", "type": "string" } @@ -1123,7 +1197,7 @@ "clusters": { "methods": { "addons": { - "description": "Sets the addons of a specific cluster.", + "description": "Sets the addons for a specific cluster.", "flatPath": "v1beta1/projects/{projectId}/zones/{zone}/clusters/{clusterId}/addons", "httpMethod": "POST", "id": "container.projects.zones.clusters.addons", @@ -1282,7 +1356,7 @@ ] }, "get": { - "description": "Gets the details of a specific cluster.", + "description": "Gets the details for a specific cluster.", "flatPath": "v1beta1/projects/{projectId}/zones/{zone}/clusters/{clusterId}", "httpMethod": "GET", "id": "container.projects.zones.clusters.get", @@ -1402,7 +1476,7 @@ ] }, "locations": { - "description": "Sets the locations of a specific cluster.", + "description": "Sets the locations for a specific cluster.", "flatPath": "v1beta1/projects/{projectId}/zones/{zone}/clusters/{clusterId}/locations", "httpMethod": "POST", "id": "container.projects.zones.clusters.locations", @@ -1443,7 +1517,7 @@ ] }, "logging": { - "description": "Sets the logging service of a specific cluster.", + "description": "Sets the logging service for a specific cluster.", "flatPath": "v1beta1/projects/{projectId}/zones/{zone}/clusters/{clusterId}/logging", "httpMethod": "POST", "id": "container.projects.zones.clusters.logging", @@ -1484,7 +1558,7 @@ ] }, "master": { - "description": "Updates the master of a specific cluster.", + "description": "Updates the master for a specific cluster.", "flatPath": "v1beta1/projects/{projectId}/zones/{zone}/clusters/{clusterId}/master", "httpMethod": "POST", "id": "container.projects.zones.clusters.master", @@ -1525,7 +1599,7 @@ ] }, "monitoring": { - "description": "Sets the monitoring service of a specific cluster.", + "description": "Sets the monitoring service for a specific cluster.", "flatPath": "v1beta1/projects/{projectId}/zones/{zone}/clusters/{clusterId}/monitoring", "httpMethod": "POST", "id": "container.projects.zones.clusters.monitoring", @@ -1648,7 +1722,7 @@ ] }, "setMasterAuth": { - "description": "Used to set master auth materials. Currently supports :-\nChanging the admin password of a specific cluster.\nThis can be either via password generation or explicitly set.\nModify basic_auth.csv and reset the K8S API server.", + "description": "Used to set master auth materials. Currently supports :-\nChanging the admin password for a specific cluster.\nThis can be either via password generation or explicitly set.\nModify basic_auth.csv and reset the K8S API server.", "flatPath": "v1beta1/projects/{projectId}/zones/{zone}/clusters/{clusterId}:setMasterAuth", "httpMethod": "POST", "id": "container.projects.zones.clusters.setMasterAuth", @@ -1771,7 +1845,7 @@ ] }, "update": { - "description": "Updates the settings of a specific cluster.", + "description": "Updates the settings for a specific cluster.", "flatPath": "v1beta1/projects/{projectId}/zones/{zone}/clusters/{clusterId}", "httpMethod": "PUT", "id": "container.projects.zones.clusters.update", @@ -1923,7 +1997,7 @@ "type": "string" }, "name": { - "description": "The name (project, location, cluster, node pool id) of the node pool to delete.\nSpecified in the format 'projects/*/locations/*/clusters/*/nodePools/*'.", + "description": "The name (project, location, cluster, node pool id) of the node pool to\ndelete. Specified in the format\n'projects/*/locations/*/clusters/*/nodePools/*'.", "location": "query", "type": "string" }, @@ -1973,7 +2047,7 @@ "type": "string" }, "name": { - "description": "The name (project, location, cluster, node pool id) of the node pool to get.\nSpecified in the format 'projects/*/locations/*/clusters/*/nodePools/*'.", + "description": "The name (project, location, cluster, node pool id) of the node pool to\nget. Specified in the format\n'projects/*/locations/*/clusters/*/nodePools/*'.", "location": "query", "type": "string" }, @@ -2022,7 +2096,7 @@ "type": "string" }, "parent": { - "description": "The parent (project, location, cluster id) where the node pools will be listed.\nSpecified in the format 'projects/*/locations/*/clusters/*'.", + "description": "The parent (project, location, cluster id) where the node pools will be\nlisted. Specified in the format 'projects/*/locations/*/clusters/*'.", "location": "query", "type": "string" }, @@ -2144,7 +2218,7 @@ ] }, "setSize": { - "description": "Sets the size of a specific node pool.", + "description": "Sets the size for a specific node pool.", "flatPath": "v1beta1/projects/{projectId}/zones/{zone}/clusters/{clusterId}/nodePools/{nodePoolId}/setSize", "httpMethod": "POST", "id": "container.projects.zones.clusters.nodePools.setSize", @@ -2351,7 +2425,7 @@ "type": "string" }, "zone": { - "description": "Deprecated. The name of the Google Compute Engine [zone](/compute/docs/zones#available)\nto return operations for, or `-` for all zones.\nThis field has been deprecated and replaced by the parent field.", + "description": "Deprecated. The name of the Google Compute Engine\n[zone](/compute/docs/zones#available) to return operations for, or `-` for\nall zones. This field has been deprecated and replaced by the parent field.", "location": "path", "required": true, "type": "string" @@ -2372,7 +2446,7 @@ } } }, - "revision": "20180312", + "revision": "20180504", "rootUrl": "https://container.googleapis.com/", "schemas": { "AcceleratorConfig": { @@ -2524,7 +2598,7 @@ "type": "string" }, "initialClusterVersion": { - "description": "The initial Kubernetes version for this cluster. Valid versions are those\nfound in validMasterVersions returned by getServerConfig. The version can\nbe upgraded over time; such upgrades are reflected in\ncurrentMasterVersion and currentNodeVersion.", + "description": "The initial Kubernetes version for this cluster. Valid versions are those\nfound in validMasterVersions returned by getServerConfig. The version can\nbe upgraded over time; such upgrades are reflected in\ncurrentMasterVersion and currentNodeVersion.\n\nUsers may specify either explicit versions offered by\nKubernetes Engine or version aliases, which have the following behavior:\n\n- \"latest\": picks the highest valid Kubernetes version\n- \"1.X\": picks the highest valid patch+gke.N patch in the 1.X version\n- \"1.X.Y\": picks the highest valid gke.N patch in the 1.X.Y version\n- \"1.X.Y-gke.N\": picks an explicit Kubernetes version\n- \"\",\"-\": picks the default Kubernetes version", "type": "string" }, "initialNodeCount": { @@ -2591,9 +2665,13 @@ "type": "string" }, "network": { - "description": "The name of the Google Compute Engine\n[network](/compute/docs/networks-and-firewalls#networks) to which the\ncluster is connected. If left unspecified, the `default` network\nwill be used.", + "description": "The name of the Google Compute Engine\n[network](/compute/docs/networks-and-firewalls#networks) to which the\ncluster is connected. If left unspecified, the `default` network\nwill be used. On output this shows the network ID instead of\nthe name.", "type": "string" }, + "networkConfig": { + "$ref": "NetworkConfig", + "description": "Configuration for cluster networking." + }, "networkPolicy": { "$ref": "NetworkPolicy", "description": "Configuration options for the NetworkPolicy feature." @@ -2626,7 +2704,7 @@ "additionalProperties": { "type": "string" }, - "description": "The resource labels for the cluster to use to annotate any related GCE\nresources.", + "description": "The resource labels for the cluster to use to annotate any related\nGoogle Compute Engine resources.", "type": "object" }, "selfLink": { @@ -2664,7 +2742,7 @@ "type": "string" }, "subnetwork": { - "description": "The name of the Google Compute Engine\n[subnetwork](/compute/docs/subnetworks) to which the\ncluster is connected.", + "description": "The name of the Google Compute Engine\n[subnetwork](/compute/docs/subnetworks) to which the\ncluster is connected. On output this shows the subnetwork ID instead of\nthe name.", "type": "string" }, "zone": { @@ -2698,7 +2776,7 @@ "description": "The desired configuration options for master authorized networks feature." }, "desiredMasterVersion": { - "description": "The Kubernetes version to change the master to. The only valid value is the\nlatest supported version. Use \"-\" to have the server automatically select\nthe latest version.", + "description": "The Kubernetes version to change the master to. The only valid value is the\nlatest supported version.\n\nUsers may specify either explicit versions offered by\nKubernetes Engine or version aliases, which have the following behavior:\n\n- \"latest\": picks the highest valid Kubernetes version\n- \"1.X\": picks the highest valid patch+gke.N patch in the 1.X version\n- \"1.X.Y\": picks the highest valid gke.N patch in the 1.X.Y version\n- \"1.X.Y-gke.N\": picks an explicit Kubernetes version\n- \"-\": picks the default Kubernetes version", "type": "string" }, "desiredMonitoringService": { @@ -2714,7 +2792,7 @@ "type": "string" }, "desiredNodeVersion": { - "description": "The Kubernetes version to change the nodes to (typically an\nupgrade). Use `-` to upgrade to the latest version supported by\nthe server.", + "description": "The Kubernetes version to change the nodes to (typically an\nupgrade).\n\nUsers may specify either explicit versions offered by\nKubernetes Engine or version aliases, which have the following behavior:\n\n- \"latest\": picks the highest valid Kubernetes version\n- \"1.X\": picks the highest valid patch+gke.N patch in the 1.X version\n- \"1.X.Y\": picks the highest valid gke.N patch in the 1.X.Y version\n- \"1.X.Y-gke.N\": picks an explicit Kubernetes version\n- \"-\": picks the Kubernetes master version", "type": "string" }, "desiredPodSecurityPolicyConfig": { @@ -2733,7 +2811,7 @@ "type": "string" }, "name": { - "description": "The name (project, location, cluster id) of the cluster to complete IP rotation.\nSpecified in the format 'projects/*/locations/*/clusters/*'.", + "description": "The name (project, location, cluster id) of the cluster to complete IP\nrotation. Specified in the format 'projects/*/locations/*/clusters/*'.", "type": "string" }, "projectId": { @@ -2783,7 +2861,7 @@ "description": "The node pool to create." }, "parent": { - "description": "The parent (project, location, cluster id) where the node pool will be created.\nSpecified in the format 'projects/*/locations/*/clusters/*/nodePools/*'.", + "description": "The parent (project, location, cluster id) where the node pool will be\ncreated. Specified in the format\n'projects/*/locations/*/clusters/*/nodePools/*'.", "type": "string" }, "projectId": { @@ -2938,6 +3016,24 @@ }, "type": "object" }, + "ListLocationsResponse": { + "description": "ListLocationsResponse returns the list of all GKE locations and their\nrecommendation state.", + "id": "ListLocationsResponse", + "properties": { + "locations": { + "description": "A full list of GKE locations.", + "items": { + "$ref": "Location" + }, + "type": "array" + }, + "nextPageToken": { + "description": "Only return ListLocationsResponse that occur after the page_token. This\nvalue should be populated from the ListLocationsResponse.next_page_token if\nthat response token was set (which happens when listing more Locations than\nfit in a single ListLocationsResponse).", + "type": "string" + } + }, + "type": "object" + }, "ListNodePoolsResponse": { "description": "ListNodePoolsResponse is the result of ListNodePoolsRequest.", "id": "ListNodePoolsResponse", @@ -2973,6 +3069,53 @@ }, "type": "object" }, + "ListUsableSubnetworksResponse": { + "description": "ListUsableSubnetworksResponse is the response of\nListUsableSubnetworksRequest.", + "id": "ListUsableSubnetworksResponse", + "properties": { + "nextPageToken": { + "description": "This token allows you to get the next page of results for list requests.\nIf the number of results is larger than `page_size`, use the\n`next_page_token` as a value for the query parameter `page_token` in the\nnext request. The value will become empty when there are no more pages.", + "type": "string" + }, + "subnetworks": { + "description": "A list of usable subnetworks in the specified network project.", + "items": { + "$ref": "UsableSubnetwork" + }, + "type": "array" + } + }, + "type": "object" + }, + "Location": { + "description": "Location returns the location name, and if the location is recommended\nfor GKE cluster scheduling.", + "id": "Location", + "properties": { + "name": { + "description": "Contains the name of the resource requested.\nSpecific in the format 'projects/*/locations/*'.", + "type": "string" + }, + "recommended": { + "description": "Recommended is a bool combining the drain state of the location (ie- has\nthe region been drained manually?), and the stockout status of any zone\naccording to Zone Advisor. This will be internal only for use by pantheon.", + "type": "boolean" + }, + "type": { + "description": "Contains the type of location this Location is for.\nRegional or Zonal.", + "enum": [ + "LOCATION_TYPE_UNSPECIFIED", + "ZONE", + "REGION" + ], + "enumDescriptions": [ + "LOCATION_TYPE_UNSPECIFIED means the location type was not determined.", + "A GKE Location where Zonal clusters can be created.", + "A GKE Location where Regional clusters can be created." + ], + "type": "string" + } + }, + "type": "object" + }, "MaintenancePolicy": { "description": "MaintenancePolicy defines the maintenance policy to be used for the cluster.", "id": "MaintenancePolicy", @@ -3044,6 +3187,21 @@ }, "type": "object" }, + "NetworkConfig": { + "description": "NetworkConfig reports the relative names of network \u0026 subnetwork.", + "id": "NetworkConfig", + "properties": { + "network": { + "description": "Output only. The name of the Google Compute Engine\nnetwork(/compute/docs/networks-and-firewalls#networks).\nExample: projects/my-project/global/networks/my-network", + "type": "string" + }, + "subnetwork": { + "description": "Output only. The name of the Google Compute Engine\n[subnetwork](/compute/docs/vpc).\nExample: projects/my-project/regions/us-central1/subnetworks/my-subnet", + "type": "string" + } + }, + "type": "object" + }, "NetworkPolicy": { "description": "Configuration options for the NetworkPolicy feature.\nhttps://kubernetes.io/docs/concepts/services-networking/networkpolicies/", "id": "NetworkPolicy", @@ -3094,6 +3252,10 @@ "format": "int32", "type": "integer" }, + "diskType": { + "description": "Type of the disk attached to each node (e.g. 'pd-standard' or 'pd-ssd')\n\nIf unspecified, the default disk type is 'pd-standard'", + "type": "string" + }, "imageType": { "description": "The image type to use for this node. Note that for a given image type,\nthe latest version of it will be used.", "type": "string" @@ -3122,7 +3284,7 @@ "type": "object" }, "minCpuPlatform": { - "description": "Minimum CPU platform to be used by this instance. The instance may be\nscheduled on the specified or newer CPU platform. Applicable values are the\nfriendly names of CPU platforms, such as\n\u003ccode\u003eminCpuPlatform: \u0026quot;Intel Haswell\u0026quot;\u003c/code\u003e or\n\u003ccode\u003eminCpuPlatform: \u0026quot;Intel Sandy Bridge\u0026quot;\u003c/code\u003e. For more\ninformation, read [how to specify min CPU platform](https://cloud.google.com/compute/docs/instances/specify-min-cpu-platform)", + "description": "Minimum CPU platform to be used by this instance. The instance may be\nscheduled on the specified or newer CPU platform. Applicable values are the\nfriendly names of CPU platforms, such as\n\u003ccode\u003eminCpuPlatform: \u0026quot;Intel Haswell\u0026quot;\u003c/code\u003e or\n\u003ccode\u003eminCpuPlatform: \u0026quot;Intel Sandy Bridge\u0026quot;\u003c/code\u003e. For more\ninformation, read [how to specify min CPU\nplatform](https://cloud.google.com/compute/docs/instances/specify-min-cpu-platform)", "type": "string" }, "oauthScopes": { @@ -3729,7 +3891,7 @@ "type": "string" }, "name": { - "description": "The name (project, location, cluster id) of the cluster to set networking policy.\nSpecified in the format 'projects/*/locations/*/clusters/*'.", + "description": "The name (project, location, cluster id) of the cluster to set networking\npolicy. Specified in the format 'projects/*/locations/*/clusters/*'.", "type": "string" }, "networkPolicy": { @@ -3850,13 +4012,17 @@ "type": "string" }, "name": { - "description": "The name (project, location, cluster id) of the cluster to start IP rotation.\nSpecified in the format 'projects/*/locations/*/clusters/*'.", + "description": "The name (project, location, cluster id) of the cluster to start IP\nrotation. Specified in the format 'projects/*/locations/*/clusters/*'.", "type": "string" }, "projectId": { "description": "Deprecated. The Google Developers Console [project ID or project\nnumber](https://developers.google.com/console/help/new/#projectnumber).\nThis field has been deprecated and replaced by the name field.", "type": "string" }, + "rotateCredentials": { + "description": "Whether to rotate credentials during IP rotation.", + "type": "boolean" + }, "zone": { "description": "Deprecated. The name of the Google Compute Engine\n[zone](/compute/docs/zones#available) in which the cluster\nresides.\nThis field has been deprecated and replaced by the name field.", "type": "string" @@ -3900,7 +4066,7 @@ "type": "string" }, "masterVersion": { - "description": "The Kubernetes version to change the master to. The only valid value is the\nlatest supported version. Use \"-\" to have the server automatically select\nthe latest version.", + "description": "The Kubernetes version to change the master to.\n\nUsers may specify either explicit versions offered by\nKubernetes Engine or version aliases, which have the following behavior:\n\n- \"latest\": picks the highest valid Kubernetes version\n- \"1.X\": picks the highest valid patch+gke.N patch in the 1.X version\n- \"1.X.Y\": picks the highest valid gke.N patch in the 1.X.Y version\n- \"1.X.Y-gke.N\": picks an explicit Kubernetes version\n- \"-\": picks the default Kubernetes version", "type": "string" }, "name": { @@ -3931,7 +4097,7 @@ "type": "string" }, "name": { - "description": "The name (project, location, cluster, node pool) of the node pool to update.\nSpecified in the format 'projects/*/locations/*/clusters/*/nodePools/*'.", + "description": "The name (project, location, cluster, node pool) of the node pool to\nupdate. Specified in the format\n'projects/*/locations/*/clusters/*/nodePools/*'.", "type": "string" }, "nodePoolId": { @@ -3939,7 +4105,7 @@ "type": "string" }, "nodeVersion": { - "description": "The Kubernetes version to change the nodes to (typically an\nupgrade). Use `-` to upgrade to the latest version supported by\nthe server.", + "description": "The Kubernetes version to change the nodes to (typically an\nupgrade).\n\nUsers may specify either explicit versions offered by Kubernetes Engine or\nversion aliases, which have the following behavior:\n\n- \"latest\": picks the highest valid Kubernetes version\n- \"1.X\": picks the highest valid patch+gke.N patch in the 1.X version\n- \"1.X.Y\": picks the highest valid gke.N patch in the 1.X.Y version\n- \"1.X.Y-gke.N\": picks an explicit Kubernetes version\n- \"-\": picks the Kubernetes master version", "type": "string" }, "projectId": { @@ -3953,6 +4119,25 @@ }, "type": "object" }, + "UsableSubnetwork": { + "description": "UsableSubnetwork resource returns the subnetwork name, its associated network\nand the primary CIDR range.", + "id": "UsableSubnetwork", + "properties": { + "ipCidrRange": { + "description": "The range of internal addresses that are owned by this subnetwork.", + "type": "string" + }, + "network": { + "description": "Network Name.\nExample: projects/my-project/global/networks/my-network", + "type": "string" + }, + "subnetwork": { + "description": "Subnetwork Name.\nExample: projects/my-project/regions/us-central1/subnetworks/my-subnet", + "type": "string" + } + }, + "type": "object" + }, "WorkloadMetadataConfig": { "description": "WorkloadMetadataConfig defines the metadata configuration to expose to\nworkloads on the node pool.", "id": "WorkloadMetadataConfig", @@ -3976,7 +4161,7 @@ } }, "servicePath": "", - "title": "Google Kubernetes Engine API", + "title": "Kubernetes Engine API", "version": "v1beta1", "version_module": true } \ No newline at end of file diff --git a/vendor/google.golang.org/api/container/v1beta1/container-gen.go b/vendor/google.golang.org/api/container/v1beta1/container-gen.go index ce7aca10f50..c72f05e6e00 100644 --- a/vendor/google.golang.org/api/container/v1beta1/container-gen.go +++ b/vendor/google.golang.org/api/container/v1beta1/container-gen.go @@ -1,4 +1,4 @@ -// Package container provides access to the Google Kubernetes Engine API. +// Package container provides access to the Kubernetes Engine API. // // See https://cloud.google.com/container-engine/ // @@ -77,6 +77,7 @@ func (s *Service) userAgent() string { func NewProjectsService(s *Service) *ProjectsService { rs := &ProjectsService{s: s} + rs.Aggregated = NewProjectsAggregatedService(s) rs.Locations = NewProjectsLocationsService(s) rs.Zones = NewProjectsZonesService(s) return rs @@ -85,11 +86,34 @@ func NewProjectsService(s *Service) *ProjectsService { type ProjectsService struct { s *Service + Aggregated *ProjectsAggregatedService + Locations *ProjectsLocationsService Zones *ProjectsZonesService } +func NewProjectsAggregatedService(s *Service) *ProjectsAggregatedService { + rs := &ProjectsAggregatedService{s: s} + rs.UsableSubnetworks = NewProjectsAggregatedUsableSubnetworksService(s) + return rs +} + +type ProjectsAggregatedService struct { + s *Service + + UsableSubnetworks *ProjectsAggregatedUsableSubnetworksService +} + +func NewProjectsAggregatedUsableSubnetworksService(s *Service) *ProjectsAggregatedUsableSubnetworksService { + rs := &ProjectsAggregatedUsableSubnetworksService{s: s} + return rs +} + +type ProjectsAggregatedUsableSubnetworksService struct { + s *Service +} + func NewProjectsLocationsService(s *Service) *ProjectsLocationsService { rs := &ProjectsLocationsService{s: s} rs.Clusters = NewProjectsLocationsClustersService(s) @@ -496,6 +520,17 @@ type Cluster struct { // be upgraded over time; such upgrades are reflected // in // currentMasterVersion and currentNodeVersion. + // + // Users may specify either explicit versions offered by + // Kubernetes Engine or version aliases, which have the following + // behavior: + // + // - "latest": picks the highest valid Kubernetes version + // - "1.X": picks the highest valid patch+gke.N patch in the 1.X + // version + // - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version + // - "1.X.Y-gke.N": picks an explicit Kubernetes version + // - "","-": picks the default Kubernetes version InitialClusterVersion string `json:"initialClusterVersion,omitempty"` // InitialNodeCount: The number of nodes to create in this cluster. You @@ -596,9 +631,13 @@ type Cluster struct { // [network](/compute/docs/networks-and-firewalls#networks) to which // the // cluster is connected. If left unspecified, the `default` network - // will be used. + // will be used. On output this shows the network ID instead of + // the name. Network string `json:"network,omitempty"` + // NetworkConfig: Configuration for cluster networking. + NetworkConfig *NetworkConfig `json:"networkConfig,omitempty"` + // NetworkPolicy: Configuration options for the NetworkPolicy feature. NetworkPolicy *NetworkPolicy `json:"networkPolicy,omitempty"` @@ -643,8 +682,8 @@ type Cluster struct { PrivateCluster bool `json:"privateCluster,omitempty"` // ResourceLabels: The resource labels for the cluster to use to - // annotate any related GCE - // resources. + // annotate any related + // Google Compute Engine resources. ResourceLabels map[string]string `json:"resourceLabels,omitempty"` // SelfLink: [Output only] Server-defined URL for the resource. @@ -693,7 +732,9 @@ type Cluster struct { // Subnetwork: The name of the Google Compute // Engine // [subnetwork](/compute/docs/subnetworks) to which the - // cluster is connected. + // cluster is connected. On output this shows the subnetwork ID instead + // of + // the name. Subnetwork string `json:"subnetwork,omitempty"` // Zone: [Output only] The name of the Google Compute @@ -764,9 +805,18 @@ type ClusterUpdate struct { // DesiredMasterVersion: The Kubernetes version to change the master to. // The only valid value is the - // latest supported version. Use "-" to have the server automatically - // select - // the latest version. + // latest supported version. + // + // Users may specify either explicit versions offered by + // Kubernetes Engine or version aliases, which have the following + // behavior: + // + // - "latest": picks the highest valid Kubernetes version + // - "1.X": picks the highest valid patch+gke.N patch in the 1.X + // version + // - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version + // - "1.X.Y-gke.N": picks an explicit Kubernetes version + // - "-": picks the default Kubernetes version DesiredMasterVersion string `json:"desiredMasterVersion,omitempty"` // DesiredMonitoringService: The monitoring service the cluster should @@ -795,8 +845,18 @@ type ClusterUpdate struct { // DesiredNodeVersion: The Kubernetes version to change the nodes to // (typically an - // upgrade). Use `-` to upgrade to the latest version supported by - // the server. + // upgrade). + // + // Users may specify either explicit versions offered by + // Kubernetes Engine or version aliases, which have the following + // behavior: + // + // - "latest": picks the highest valid Kubernetes version + // - "1.X": picks the highest valid patch+gke.N patch in the 1.X + // version + // - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version + // - "1.X.Y-gke.N": picks an explicit Kubernetes version + // - "-": picks the Kubernetes master version DesiredNodeVersion string `json:"desiredNodeVersion,omitempty"` // DesiredPodSecurityPolicyConfig: The desired configuration options for @@ -835,8 +895,9 @@ type CompleteIPRotationRequest struct { ClusterId string `json:"clusterId,omitempty"` // Name: The name (project, location, cluster id) of the cluster to - // complete IP rotation. - // Specified in the format 'projects/*/locations/*/clusters/*'. + // complete IP + // rotation. Specified in the format + // 'projects/*/locations/*/clusters/*'. Name string `json:"name,omitempty"` // ProjectId: Deprecated. The Google Developers Console [project ID or @@ -939,8 +1000,9 @@ type CreateNodePoolRequest struct { NodePool *NodePool `json:"nodePool,omitempty"` // Parent: The parent (project, location, cluster id) where the node - // pool will be created. - // Specified in the format + // pool will be + // created. Specified in the + // format // 'projects/*/locations/*/clusters/*/nodePools/*'. Parent string `json:"parent,omitempty"` @@ -1378,6 +1440,49 @@ func (s *ListClustersResponse) MarshalJSON() ([]byte, error) { return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) } +// ListLocationsResponse: ListLocationsResponse returns the list of all +// GKE locations and their +// recommendation state. +type ListLocationsResponse struct { + // Locations: A full list of GKE locations. + Locations []*Location `json:"locations,omitempty"` + + // NextPageToken: Only return ListLocationsResponse that occur after the + // page_token. This + // value should be populated from the + // ListLocationsResponse.next_page_token if + // that response token was set (which happens when listing more + // Locations than + // fit in a single ListLocationsResponse). + NextPageToken string `json:"nextPageToken,omitempty"` + + // ServerResponse contains the HTTP response code and headers from the + // server. + googleapi.ServerResponse `json:"-"` + + // ForceSendFields is a list of field names (e.g. "Locations") to + // unconditionally include in API requests. By default, fields with + // empty values are omitted from API requests. However, any non-pointer, + // non-interface field appearing in ForceSendFields will be sent to the + // server regardless of whether the field is empty or not. This may be + // used to include empty fields in Patch requests. + ForceSendFields []string `json:"-"` + + // NullFields is a list of field names (e.g. "Locations") to include in + // API requests with the JSON null value. By default, fields with empty + // values are omitted from API requests. However, any field with an + // empty value appearing in NullFields will be sent to the server as + // null. It is an error if a field in this list has a non-empty value. + // This may be used to include null fields in Patch requests. + NullFields []string `json:"-"` +} + +func (s *ListLocationsResponse) MarshalJSON() ([]byte, error) { + type NoMethod ListLocationsResponse + raw := NoMethod(*s) + return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) +} + // ListNodePoolsResponse: ListNodePoolsResponse is the result of // ListNodePoolsRequest. type ListNodePoolsResponse struct { @@ -1450,6 +1555,100 @@ func (s *ListOperationsResponse) MarshalJSON() ([]byte, error) { return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) } +// ListUsableSubnetworksResponse: ListUsableSubnetworksResponse is the +// response of +// ListUsableSubnetworksRequest. +type ListUsableSubnetworksResponse struct { + // NextPageToken: This token allows you to get the next page of results + // for list requests. + // If the number of results is larger than `page_size`, use + // the + // `next_page_token` as a value for the query parameter `page_token` in + // the + // next request. The value will become empty when there are no more + // pages. + NextPageToken string `json:"nextPageToken,omitempty"` + + // Subnetworks: A list of usable subnetworks in the specified network + // project. + Subnetworks []*UsableSubnetwork `json:"subnetworks,omitempty"` + + // ServerResponse contains the HTTP response code and headers from the + // server. + googleapi.ServerResponse `json:"-"` + + // ForceSendFields is a list of field names (e.g. "NextPageToken") to + // unconditionally include in API requests. By default, fields with + // empty values are omitted from API requests. However, any non-pointer, + // non-interface field appearing in ForceSendFields will be sent to the + // server regardless of whether the field is empty or not. This may be + // used to include empty fields in Patch requests. + ForceSendFields []string `json:"-"` + + // NullFields is a list of field names (e.g. "NextPageToken") to include + // in API requests with the JSON null value. By default, fields with + // empty values are omitted from API requests. However, any field with + // an empty value appearing in NullFields will be sent to the server as + // null. It is an error if a field in this list has a non-empty value. + // This may be used to include null fields in Patch requests. + NullFields []string `json:"-"` +} + +func (s *ListUsableSubnetworksResponse) MarshalJSON() ([]byte, error) { + type NoMethod ListUsableSubnetworksResponse + raw := NoMethod(*s) + return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) +} + +// Location: Location returns the location name, and if the location is +// recommended +// for GKE cluster scheduling. +type Location struct { + // Name: Contains the name of the resource requested. + // Specific in the format 'projects/*/locations/*'. + Name string `json:"name,omitempty"` + + // Recommended: Recommended is a bool combining the drain state of the + // location (ie- has + // the region been drained manually?), and the stockout status of any + // zone + // according to Zone Advisor. This will be internal only for use by + // pantheon. + Recommended bool `json:"recommended,omitempty"` + + // Type: Contains the type of location this Location is for. + // Regional or Zonal. + // + // Possible values: + // "LOCATION_TYPE_UNSPECIFIED" - LOCATION_TYPE_UNSPECIFIED means the + // location type was not determined. + // "ZONE" - A GKE Location where Zonal clusters can be created. + // "REGION" - A GKE Location where Regional clusters can be created. + Type string `json:"type,omitempty"` + + // ForceSendFields is a list of field names (e.g. "Name") to + // unconditionally include in API requests. By default, fields with + // empty values are omitted from API requests. However, any non-pointer, + // non-interface field appearing in ForceSendFields will be sent to the + // server regardless of whether the field is empty or not. This may be + // used to include empty fields in Patch requests. + ForceSendFields []string `json:"-"` + + // NullFields is a list of field names (e.g. "Name") to include in API + // requests with the JSON null value. By default, fields with empty + // values are omitted from API requests. However, any field with an + // empty value appearing in NullFields will be sent to the server as + // null. It is an error if a field in this list has a non-empty value. + // This may be used to include null fields in Patch requests. + NullFields []string `json:"-"` +} + +func (s *Location) MarshalJSON() ([]byte, error) { + type NoMethod Location + raw := NoMethod(*s) + return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) +} + // MaintenancePolicy: MaintenancePolicy defines the maintenance policy // to be used for the cluster. type MaintenancePolicy struct { @@ -1617,6 +1816,46 @@ func (s *MasterAuthorizedNetworksConfig) MarshalJSON() ([]byte, error) { return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) } +// NetworkConfig: NetworkConfig reports the relative names of network & +// subnetwork. +type NetworkConfig struct { + // Network: Output only. The name of the Google Compute + // Engine + // network(/compute/docs/networks-and-firewalls#networks). + // Example + // : projects/my-project/global/networks/my-network + Network string `json:"network,omitempty"` + + // Subnetwork: Output only. The name of the Google Compute + // Engine + // [subnetwork](/compute/docs/vpc). + // Example: + // projects/my-project/regions/us-central1/subnetworks/my-subnet + Subnetwork string `json:"subnetwork,omitempty"` + + // ForceSendFields is a list of field names (e.g. "Network") to + // unconditionally include in API requests. By default, fields with + // empty values are omitted from API requests. However, any non-pointer, + // non-interface field appearing in ForceSendFields will be sent to the + // server regardless of whether the field is empty or not. This may be + // used to include empty fields in Patch requests. + ForceSendFields []string `json:"-"` + + // NullFields is a list of field names (e.g. "Network") to include in + // API requests with the JSON null value. By default, fields with empty + // values are omitted from API requests. However, any field with an + // empty value appearing in NullFields will be sent to the server as + // null. It is an error if a field in this list has a non-empty value. + // This may be used to include null fields in Patch requests. + NullFields []string `json:"-"` +} + +func (s *NetworkConfig) MarshalJSON() ([]byte, error) { + type NoMethod NetworkConfig + raw := NoMethod(*s) + return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) +} + // NetworkPolicy: Configuration options for the NetworkPolicy // feature. // https://kubernetes.io/docs/concepts/services-networking/netwo @@ -1703,6 +1942,12 @@ type NodeConfig struct { // If unspecified, the default disk size is 100GB. DiskSizeGb int64 `json:"diskSizeGb,omitempty"` + // DiskType: Type of the disk attached to each node (e.g. 'pd-standard' + // or 'pd-ssd') + // + // If unspecified, the default disk type is 'pd-standard' + DiskType string `json:"diskType,omitempty"` + // ImageType: The image type to use for this node. Note that for a given // image type, // the latest version of it will be used. @@ -1783,9 +2028,10 @@ type NodeConfig struct { // or // minCpuPlatform: "Intel Sandy Bridge". For // more - // information, read [how to specify min CPU - // platform](https://cloud.google.com/compute/docs/instances/specify-min- - // cpu-platform) + // information, read [how to specify min + // CPU + // platform](https://cloud.google.com/compute/docs/instances/specify- + // min-cpu-platform) MinCpuPlatform string `json:"minCpuPlatform,omitempty"` // OauthScopes: The set of Google API scopes to be made available on all @@ -2825,8 +3071,8 @@ type SetNetworkPolicyRequest struct { ClusterId string `json:"clusterId,omitempty"` // Name: The name (project, location, cluster id) of the cluster to set - // networking policy. - // Specified in the format 'projects/*/locations/*/clusters/*'. + // networking + // policy. Specified in the format 'projects/*/locations/*/clusters/*'. Name string `json:"name,omitempty"` // NetworkPolicy: Configuration options for the NetworkPolicy feature. @@ -3058,8 +3304,9 @@ type StartIPRotationRequest struct { ClusterId string `json:"clusterId,omitempty"` // Name: The name (project, location, cluster id) of the cluster to - // start IP rotation. - // Specified in the format 'projects/*/locations/*/clusters/*'. + // start IP + // rotation. Specified in the format + // 'projects/*/locations/*/clusters/*'. Name string `json:"name,omitempty"` // ProjectId: Deprecated. The Google Developers Console [project ID or @@ -3069,6 +3316,9 @@ type StartIPRotationRequest struct { // This field has been deprecated and replaced by the name field. ProjectId string `json:"projectId,omitempty"` + // RotateCredentials: Whether to rotate credentials during IP rotation. + RotateCredentials bool `json:"rotateCredentials,omitempty"` + // Zone: Deprecated. The name of the Google Compute // Engine // [zone](/compute/docs/zones#available) in which the @@ -3160,11 +3410,18 @@ type UpdateMasterRequest struct { // This field has been deprecated and replaced by the name field. ClusterId string `json:"clusterId,omitempty"` - // MasterVersion: The Kubernetes version to change the master to. The - // only valid value is the - // latest supported version. Use "-" to have the server automatically - // select - // the latest version. + // MasterVersion: The Kubernetes version to change the master to. + // + // Users may specify either explicit versions offered by + // Kubernetes Engine or version aliases, which have the following + // behavior: + // + // - "latest": picks the highest valid Kubernetes version + // - "1.X": picks the highest valid patch+gke.N patch in the 1.X + // version + // - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version + // - "1.X.Y-gke.N": picks an explicit Kubernetes version + // - "-": picks the default Kubernetes version MasterVersion string `json:"masterVersion,omitempty"` // Name: The name (project, location, cluster) of the cluster to @@ -3221,8 +3478,9 @@ type UpdateNodePoolRequest struct { ImageType string `json:"imageType,omitempty"` // Name: The name (project, location, cluster, node pool) of the node - // pool to update. - // Specified in the format + // pool to + // update. Specified in the + // format // 'projects/*/locations/*/clusters/*/nodePools/*'. Name string `json:"name,omitempty"` @@ -3232,8 +3490,18 @@ type UpdateNodePoolRequest struct { // NodeVersion: The Kubernetes version to change the nodes to (typically // an - // upgrade). Use `-` to upgrade to the latest version supported by - // the server. + // upgrade). + // + // Users may specify either explicit versions offered by Kubernetes + // Engine or + // version aliases, which have the following behavior: + // + // - "latest": picks the highest valid Kubernetes version + // - "1.X": picks the highest valid patch+gke.N patch in the 1.X + // version + // - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version + // - "1.X.Y-gke.N": picks an explicit Kubernetes version + // - "-": picks the Kubernetes master version NodeVersion string `json:"nodeVersion,omitempty"` // ProjectId: Deprecated. The Google Developers Console [project ID or @@ -3274,6 +3542,46 @@ func (s *UpdateNodePoolRequest) MarshalJSON() ([]byte, error) { return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) } +// UsableSubnetwork: UsableSubnetwork resource returns the subnetwork +// name, its associated network +// and the primary CIDR range. +type UsableSubnetwork struct { + // IpCidrRange: The range of internal addresses that are owned by this + // subnetwork. + IpCidrRange string `json:"ipCidrRange,omitempty"` + + // Network: Network Name. + // Example: projects/my-project/global/networks/my-network + Network string `json:"network,omitempty"` + + // Subnetwork: Subnetwork Name. + // Example: + // projects/my-project/regions/us-central1/subnetworks/my-subnet + Subnetwork string `json:"subnetwork,omitempty"` + + // ForceSendFields is a list of field names (e.g. "IpCidrRange") to + // unconditionally include in API requests. By default, fields with + // empty values are omitted from API requests. However, any non-pointer, + // non-interface field appearing in ForceSendFields will be sent to the + // server regardless of whether the field is empty or not. This may be + // used to include empty fields in Patch requests. + ForceSendFields []string `json:"-"` + + // NullFields is a list of field names (e.g. "IpCidrRange") to include + // in API requests with the JSON null value. By default, fields with + // empty values are omitted from API requests. However, any field with + // an empty value appearing in NullFields will be sent to the server as + // null. It is an error if a field in this list has a non-empty value. + // This may be used to include null fields in Patch requests. + NullFields []string `json:"-"` +} + +func (s *UsableSubnetwork) MarshalJSON() ([]byte, error) { + type NoMethod UsableSubnetwork + raw := NoMethod(*s) + return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) +} + // WorkloadMetadataConfig: WorkloadMetadataConfig defines the metadata // configuration to expose to // workloads on the node pool. @@ -3323,6 +3631,215 @@ func (s *WorkloadMetadataConfig) MarshalJSON() ([]byte, error) { return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) } +// method id "container.projects.aggregated.usableSubnetworks.list": + +type ProjectsAggregatedUsableSubnetworksListCall struct { + s *Service + parent string + urlParams_ gensupport.URLParams + ifNoneMatch_ string + ctx_ context.Context + header_ http.Header +} + +// List: Lists subnetworks that are usable for creating clusters in a +// project. +func (r *ProjectsAggregatedUsableSubnetworksService) List(parent string) *ProjectsAggregatedUsableSubnetworksListCall { + c := &ProjectsAggregatedUsableSubnetworksListCall{s: r.s, urlParams_: make(gensupport.URLParams)} + c.parent = parent + return c +} + +// Filter sets the optional parameter "filter": Filtering currently only +// supports equality on the networkProjectId and must +// be in the form: "networkProjectId=[PROJECTID]", where +// `networkProjectId` +// is the project which owns the listed subnetworks. This defaults to +// the +// parent project ID. +func (c *ProjectsAggregatedUsableSubnetworksListCall) Filter(filter string) *ProjectsAggregatedUsableSubnetworksListCall { + c.urlParams_.Set("filter", filter) + return c +} + +// PageSize sets the optional parameter "pageSize": The max number of +// results per page that should be returned. If the number +// of available results is larger than `page_size`, a `next_page_token` +// is +// returned which can be used to get the next page of results in +// subsequent +// requests. Acceptable values are 0 to 500, inclusive. (Default: 500) +func (c *ProjectsAggregatedUsableSubnetworksListCall) PageSize(pageSize int64) *ProjectsAggregatedUsableSubnetworksListCall { + c.urlParams_.Set("pageSize", fmt.Sprint(pageSize)) + return c +} + +// PageToken sets the optional parameter "pageToken": Specifies a page +// token to use. Set this to the nextPageToken returned by +// previous list requests to get the next page of results. +func (c *ProjectsAggregatedUsableSubnetworksListCall) PageToken(pageToken string) *ProjectsAggregatedUsableSubnetworksListCall { + c.urlParams_.Set("pageToken", pageToken) + return c +} + +// Fields allows partial responses to be retrieved. See +// https://developers.google.com/gdata/docs/2.0/basics#PartialResponse +// for more information. +func (c *ProjectsAggregatedUsableSubnetworksListCall) Fields(s ...googleapi.Field) *ProjectsAggregatedUsableSubnetworksListCall { + c.urlParams_.Set("fields", googleapi.CombineFields(s)) + return c +} + +// IfNoneMatch sets the optional parameter which makes the operation +// fail if the object's ETag matches the given value. This is useful for +// getting updates only after the object has changed since the last +// request. Use googleapi.IsNotModified to check whether the response +// error from Do is the result of In-None-Match. +func (c *ProjectsAggregatedUsableSubnetworksListCall) IfNoneMatch(entityTag string) *ProjectsAggregatedUsableSubnetworksListCall { + c.ifNoneMatch_ = entityTag + return c +} + +// Context sets the context to be used in this call's Do method. Any +// pending HTTP request will be aborted if the provided context is +// canceled. +func (c *ProjectsAggregatedUsableSubnetworksListCall) Context(ctx context.Context) *ProjectsAggregatedUsableSubnetworksListCall { + c.ctx_ = ctx + return c +} + +// Header returns an http.Header that can be modified by the caller to +// add HTTP headers to the request. +func (c *ProjectsAggregatedUsableSubnetworksListCall) Header() http.Header { + if c.header_ == nil { + c.header_ = make(http.Header) + } + return c.header_ +} + +func (c *ProjectsAggregatedUsableSubnetworksListCall) doRequest(alt string) (*http.Response, error) { + reqHeaders := make(http.Header) + for k, v := range c.header_ { + reqHeaders[k] = v + } + reqHeaders.Set("User-Agent", c.s.userAgent()) + if c.ifNoneMatch_ != "" { + reqHeaders.Set("If-None-Match", c.ifNoneMatch_) + } + var body io.Reader = nil + c.urlParams_.Set("alt", alt) + urls := googleapi.ResolveRelative(c.s.BasePath, "v1beta1/{+parent}/aggregated/usableSubnetworks") + urls += "?" + c.urlParams_.Encode() + req, _ := http.NewRequest("GET", urls, body) + req.Header = reqHeaders + googleapi.Expand(req.URL, map[string]string{ + "parent": c.parent, + }) + return gensupport.SendRequest(c.ctx_, c.s.client, req) +} + +// Do executes the "container.projects.aggregated.usableSubnetworks.list" call. +// Exactly one of *ListUsableSubnetworksResponse or error will be +// non-nil. Any non-2xx status code is an error. Response headers are in +// either *ListUsableSubnetworksResponse.ServerResponse.Header or (if a +// response was returned at all) in error.(*googleapi.Error).Header. Use +// googleapi.IsNotModified to check whether the returned error was +// because http.StatusNotModified was returned. +func (c *ProjectsAggregatedUsableSubnetworksListCall) Do(opts ...googleapi.CallOption) (*ListUsableSubnetworksResponse, error) { + gensupport.SetOptions(c.urlParams_, opts...) + res, err := c.doRequest("json") + if res != nil && res.StatusCode == http.StatusNotModified { + if res.Body != nil { + res.Body.Close() + } + return nil, &googleapi.Error{ + Code: res.StatusCode, + Header: res.Header, + } + } + if err != nil { + return nil, err + } + defer googleapi.CloseBody(res) + if err := googleapi.CheckResponse(res); err != nil { + return nil, err + } + ret := &ListUsableSubnetworksResponse{ + ServerResponse: googleapi.ServerResponse{ + Header: res.Header, + HTTPStatusCode: res.StatusCode, + }, + } + target := &ret + if err := gensupport.DecodeResponse(target, res); err != nil { + return nil, err + } + return ret, nil + // { + // "description": "Lists subnetworks that are usable for creating clusters in a project.", + // "flatPath": "v1beta1/projects/{projectsId}/aggregated/usableSubnetworks", + // "httpMethod": "GET", + // "id": "container.projects.aggregated.usableSubnetworks.list", + // "parameterOrder": [ + // "parent" + // ], + // "parameters": { + // "filter": { + // "description": "Filtering currently only supports equality on the networkProjectId and must\nbe in the form: \"networkProjectId=[PROJECTID]\", where `networkProjectId`\nis the project which owns the listed subnetworks. This defaults to the\nparent project ID.", + // "location": "query", + // "type": "string" + // }, + // "pageSize": { + // "description": "The max number of results per page that should be returned. If the number\nof available results is larger than `page_size`, a `next_page_token` is\nreturned which can be used to get the next page of results in subsequent\nrequests. Acceptable values are 0 to 500, inclusive. (Default: 500)", + // "format": "int32", + // "location": "query", + // "type": "integer" + // }, + // "pageToken": { + // "description": "Specifies a page token to use. Set this to the nextPageToken returned by\nprevious list requests to get the next page of results.", + // "location": "query", + // "type": "string" + // }, + // "parent": { + // "description": "The parent project where subnetworks are usable.\nSpecified in the format 'projects/*'.", + // "location": "path", + // "pattern": "^projects/[^/]+$", + // "required": true, + // "type": "string" + // } + // }, + // "path": "v1beta1/{+parent}/aggregated/usableSubnetworks", + // "response": { + // "$ref": "ListUsableSubnetworksResponse" + // }, + // "scopes": [ + // "https://www.googleapis.com/auth/cloud-platform" + // ] + // } + +} + +// Pages invokes f for each page of results. +// A non-nil error returned from f will halt the iteration. +// The provided context supersedes any context provided to the Context method. +func (c *ProjectsAggregatedUsableSubnetworksListCall) Pages(ctx context.Context, f func(*ListUsableSubnetworksResponse) error) error { + c.ctx_ = ctx + defer c.PageToken(c.urlParams_.Get("pageToken")) // reset paging to original point + for { + x, err := c.Do() + if err != nil { + return err + } + if err := f(x); err != nil { + return err + } + if x.NextPageToken == "" { + return nil + } + c.PageToken(x.NextPageToken) + } +} + // method id "container.projects.locations.getServerConfig": type ProjectsLocationsGetServerConfigCall struct { @@ -3493,6 +4010,145 @@ func (c *ProjectsLocationsGetServerConfigCall) Do(opts ...googleapi.CallOption) } +// method id "container.projects.locations.list": + +type ProjectsLocationsListCall struct { + s *Service + parent string + urlParams_ gensupport.URLParams + ifNoneMatch_ string + ctx_ context.Context + header_ http.Header +} + +// List: +func (r *ProjectsLocationsService) List(parent string) *ProjectsLocationsListCall { + c := &ProjectsLocationsListCall{s: r.s, urlParams_: make(gensupport.URLParams)} + c.parent = parent + return c +} + +// Fields allows partial responses to be retrieved. See +// https://developers.google.com/gdata/docs/2.0/basics#PartialResponse +// for more information. +func (c *ProjectsLocationsListCall) Fields(s ...googleapi.Field) *ProjectsLocationsListCall { + c.urlParams_.Set("fields", googleapi.CombineFields(s)) + return c +} + +// IfNoneMatch sets the optional parameter which makes the operation +// fail if the object's ETag matches the given value. This is useful for +// getting updates only after the object has changed since the last +// request. Use googleapi.IsNotModified to check whether the response +// error from Do is the result of In-None-Match. +func (c *ProjectsLocationsListCall) IfNoneMatch(entityTag string) *ProjectsLocationsListCall { + c.ifNoneMatch_ = entityTag + return c +} + +// Context sets the context to be used in this call's Do method. Any +// pending HTTP request will be aborted if the provided context is +// canceled. +func (c *ProjectsLocationsListCall) Context(ctx context.Context) *ProjectsLocationsListCall { + c.ctx_ = ctx + return c +} + +// Header returns an http.Header that can be modified by the caller to +// add HTTP headers to the request. +func (c *ProjectsLocationsListCall) Header() http.Header { + if c.header_ == nil { + c.header_ = make(http.Header) + } + return c.header_ +} + +func (c *ProjectsLocationsListCall) doRequest(alt string) (*http.Response, error) { + reqHeaders := make(http.Header) + for k, v := range c.header_ { + reqHeaders[k] = v + } + reqHeaders.Set("User-Agent", c.s.userAgent()) + if c.ifNoneMatch_ != "" { + reqHeaders.Set("If-None-Match", c.ifNoneMatch_) + } + var body io.Reader = nil + c.urlParams_.Set("alt", alt) + urls := googleapi.ResolveRelative(c.s.BasePath, "v1beta1/{+parent}/locations") + urls += "?" + c.urlParams_.Encode() + req, _ := http.NewRequest("GET", urls, body) + req.Header = reqHeaders + googleapi.Expand(req.URL, map[string]string{ + "parent": c.parent, + }) + return gensupport.SendRequest(c.ctx_, c.s.client, req) +} + +// Do executes the "container.projects.locations.list" call. +// Exactly one of *ListLocationsResponse or error will be non-nil. Any +// non-2xx status code is an error. Response headers are in either +// *ListLocationsResponse.ServerResponse.Header or (if a response was +// returned at all) in error.(*googleapi.Error).Header. Use +// googleapi.IsNotModified to check whether the returned error was +// because http.StatusNotModified was returned. +func (c *ProjectsLocationsListCall) Do(opts ...googleapi.CallOption) (*ListLocationsResponse, error) { + gensupport.SetOptions(c.urlParams_, opts...) + res, err := c.doRequest("json") + if res != nil && res.StatusCode == http.StatusNotModified { + if res.Body != nil { + res.Body.Close() + } + return nil, &googleapi.Error{ + Code: res.StatusCode, + Header: res.Header, + } + } + if err != nil { + return nil, err + } + defer googleapi.CloseBody(res) + if err := googleapi.CheckResponse(res); err != nil { + return nil, err + } + ret := &ListLocationsResponse{ + ServerResponse: googleapi.ServerResponse{ + Header: res.Header, + HTTPStatusCode: res.StatusCode, + }, + } + target := &ret + if err := gensupport.DecodeResponse(target, res); err != nil { + return nil, err + } + return ret, nil + // { + // "description": "", + // "flatPath": "v1beta1/projects/{projectsId}/locations", + // "httpMethod": "GET", + // "id": "container.projects.locations.list", + // "parameterOrder": [ + // "parent" + // ], + // "parameters": { + // "parent": { + // "description": "Contains the name of the resource requested.\nSpecific in the format 'projects/*/locations'.", + // "location": "path", + // "pattern": "^projects/[^/]+$", + // "required": true, + // "type": "string" + // } + // }, + // "path": "v1beta1/{+parent}/locations", + // "response": { + // "$ref": "ListLocationsResponse" + // }, + // "scopes": [ + // "https://www.googleapis.com/auth/cloud-platform" + // ] + // } + +} + // method id "container.projects.locations.clusters.completeIpRotation": type ProjectsLocationsClustersCompleteIpRotationCall struct { @@ -3607,7 +4263,7 @@ func (c *ProjectsLocationsClustersCompleteIpRotationCall) Do(opts ...googleapi.C // ], // "parameters": { // "name": { - // "description": "The name (project, location, cluster id) of the cluster to complete IP rotation.\nSpecified in the format 'projects/*/locations/*/clusters/*'.", + // "description": "The name (project, location, cluster id) of the cluster to complete IP\nrotation. Specified in the format 'projects/*/locations/*/clusters/*'.", // "location": "path", // "pattern": "^projects/[^/]+/locations/[^/]+/clusters/[^/]+$", // "required": true, @@ -3971,7 +4627,7 @@ type ProjectsLocationsClustersGetCall struct { header_ http.Header } -// Get: Gets the details of a specific cluster. +// Get: Gets the details for a specific cluster. func (r *ProjectsLocationsClustersService) Get(name string) *ProjectsLocationsClustersGetCall { c := &ProjectsLocationsClustersGetCall{s: r.s, urlParams_: make(gensupport.URLParams)} c.name = name @@ -4102,7 +4758,7 @@ func (c *ProjectsLocationsClustersGetCall) Do(opts ...googleapi.CallOption) (*Cl } return ret, nil // { - // "description": "Gets the details of a specific cluster.", + // "description": "Gets the details for a specific cluster.", // "flatPath": "v1beta1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}", // "httpMethod": "GET", // "id": "container.projects.locations.clusters.get", @@ -4327,7 +4983,7 @@ type ProjectsLocationsClustersSetAddonsCall struct { header_ http.Header } -// SetAddons: Sets the addons of a specific cluster. +// SetAddons: Sets the addons for a specific cluster. func (r *ProjectsLocationsClustersService) SetAddons(name string, setaddonsconfigrequest *SetAddonsConfigRequest) *ProjectsLocationsClustersSetAddonsCall { c := &ProjectsLocationsClustersSetAddonsCall{s: r.s, urlParams_: make(gensupport.URLParams)} c.name = name @@ -4421,7 +5077,7 @@ func (c *ProjectsLocationsClustersSetAddonsCall) Do(opts ...googleapi.CallOption } return ret, nil // { - // "description": "Sets the addons of a specific cluster.", + // "description": "Sets the addons for a specific cluster.", // "flatPath": "v1beta1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:setAddons", // "httpMethod": "POST", // "id": "container.projects.locations.clusters.setAddons", @@ -4598,7 +5254,7 @@ type ProjectsLocationsClustersSetLocationsCall struct { header_ http.Header } -// SetLocations: Sets the locations of a specific cluster. +// SetLocations: Sets the locations for a specific cluster. func (r *ProjectsLocationsClustersService) SetLocations(name string, setlocationsrequest *SetLocationsRequest) *ProjectsLocationsClustersSetLocationsCall { c := &ProjectsLocationsClustersSetLocationsCall{s: r.s, urlParams_: make(gensupport.URLParams)} c.name = name @@ -4692,7 +5348,7 @@ func (c *ProjectsLocationsClustersSetLocationsCall) Do(opts ...googleapi.CallOpt } return ret, nil // { - // "description": "Sets the locations of a specific cluster.", + // "description": "Sets the locations for a specific cluster.", // "flatPath": "v1beta1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:setLocations", // "httpMethod": "POST", // "id": "container.projects.locations.clusters.setLocations", @@ -4733,7 +5389,7 @@ type ProjectsLocationsClustersSetLoggingCall struct { header_ http.Header } -// SetLogging: Sets the logging service of a specific cluster. +// SetLogging: Sets the logging service for a specific cluster. func (r *ProjectsLocationsClustersService) SetLogging(name string, setloggingservicerequest *SetLoggingServiceRequest) *ProjectsLocationsClustersSetLoggingCall { c := &ProjectsLocationsClustersSetLoggingCall{s: r.s, urlParams_: make(gensupport.URLParams)} c.name = name @@ -4827,7 +5483,7 @@ func (c *ProjectsLocationsClustersSetLoggingCall) Do(opts ...googleapi.CallOptio } return ret, nil // { - // "description": "Sets the logging service of a specific cluster.", + // "description": "Sets the logging service for a specific cluster.", // "flatPath": "v1beta1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:setLogging", // "httpMethod": "POST", // "id": "container.projects.locations.clusters.setLogging", @@ -5005,7 +5661,7 @@ type ProjectsLocationsClustersSetMasterAuthCall struct { // SetMasterAuth: Used to set master auth materials. Currently supports // :- -// Changing the admin password of a specific cluster. +// Changing the admin password for a specific cluster. // This can be either via password generation or explicitly set. // Modify basic_auth.csv and reset the K8S API server. func (r *ProjectsLocationsClustersService) SetMasterAuth(name string, setmasterauthrequest *SetMasterAuthRequest) *ProjectsLocationsClustersSetMasterAuthCall { @@ -5101,7 +5757,7 @@ func (c *ProjectsLocationsClustersSetMasterAuthCall) Do(opts ...googleapi.CallOp } return ret, nil // { - // "description": "Used to set master auth materials. Currently supports :-\nChanging the admin password of a specific cluster.\nThis can be either via password generation or explicitly set.\nModify basic_auth.csv and reset the K8S API server.", + // "description": "Used to set master auth materials. Currently supports :-\nChanging the admin password for a specific cluster.\nThis can be either via password generation or explicitly set.\nModify basic_auth.csv and reset the K8S API server.", // "flatPath": "v1beta1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:setMasterAuth", // "httpMethod": "POST", // "id": "container.projects.locations.clusters.setMasterAuth", @@ -5142,7 +5798,7 @@ type ProjectsLocationsClustersSetMonitoringCall struct { header_ http.Header } -// SetMonitoring: Sets the monitoring service of a specific cluster. +// SetMonitoring: Sets the monitoring service for a specific cluster. func (r *ProjectsLocationsClustersService) SetMonitoring(name string, setmonitoringservicerequest *SetMonitoringServiceRequest) *ProjectsLocationsClustersSetMonitoringCall { c := &ProjectsLocationsClustersSetMonitoringCall{s: r.s, urlParams_: make(gensupport.URLParams)} c.name = name @@ -5236,7 +5892,7 @@ func (c *ProjectsLocationsClustersSetMonitoringCall) Do(opts ...googleapi.CallOp } return ret, nil // { - // "description": "Sets the monitoring service of a specific cluster.", + // "description": "Sets the monitoring service for a specific cluster.", // "flatPath": "v1beta1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:setMonitoring", // "httpMethod": "POST", // "id": "container.projects.locations.clusters.setMonitoring", @@ -5380,7 +6036,7 @@ func (c *ProjectsLocationsClustersSetNetworkPolicyCall) Do(opts ...googleapi.Cal // ], // "parameters": { // "name": { - // "description": "The name (project, location, cluster id) of the cluster to set networking policy.\nSpecified in the format 'projects/*/locations/*/clusters/*'.", + // "description": "The name (project, location, cluster id) of the cluster to set networking\npolicy. Specified in the format 'projects/*/locations/*/clusters/*'.", // "location": "path", // "pattern": "^projects/[^/]+/locations/[^/]+/clusters/[^/]+$", // "required": true, @@ -5650,7 +6306,7 @@ func (c *ProjectsLocationsClustersStartIpRotationCall) Do(opts ...googleapi.Call // ], // "parameters": { // "name": { - // "description": "The name (project, location, cluster id) of the cluster to start IP rotation.\nSpecified in the format 'projects/*/locations/*/clusters/*'.", + // "description": "The name (project, location, cluster id) of the cluster to start IP\nrotation. Specified in the format 'projects/*/locations/*/clusters/*'.", // "location": "path", // "pattern": "^projects/[^/]+/locations/[^/]+/clusters/[^/]+$", // "required": true, @@ -5682,7 +6338,7 @@ type ProjectsLocationsClustersUpdateCall struct { header_ http.Header } -// Update: Updates the settings of a specific cluster. +// Update: Updates the settings for a specific cluster. func (r *ProjectsLocationsClustersService) Update(name string, updateclusterrequest *UpdateClusterRequest) *ProjectsLocationsClustersUpdateCall { c := &ProjectsLocationsClustersUpdateCall{s: r.s, urlParams_: make(gensupport.URLParams)} c.name = name @@ -5776,7 +6432,7 @@ func (c *ProjectsLocationsClustersUpdateCall) Do(opts ...googleapi.CallOption) ( } return ret, nil // { - // "description": "Updates the settings of a specific cluster.", + // "description": "Updates the settings for a specific cluster.", // "flatPath": "v1beta1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}", // "httpMethod": "PUT", // "id": "container.projects.locations.clusters.update", @@ -5817,7 +6473,7 @@ type ProjectsLocationsClustersUpdateMasterCall struct { header_ http.Header } -// UpdateMaster: Updates the master of a specific cluster. +// UpdateMaster: Updates the master for a specific cluster. func (r *ProjectsLocationsClustersService) UpdateMaster(name string, updatemasterrequest *UpdateMasterRequest) *ProjectsLocationsClustersUpdateMasterCall { c := &ProjectsLocationsClustersUpdateMasterCall{s: r.s, urlParams_: make(gensupport.URLParams)} c.name = name @@ -5911,7 +6567,7 @@ func (c *ProjectsLocationsClustersUpdateMasterCall) Do(opts ...googleapi.CallOpt } return ret, nil // { - // "description": "Updates the master of a specific cluster.", + // "description": "Updates the master for a specific cluster.", // "flatPath": "v1beta1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:updateMaster", // "httpMethod": "POST", // "id": "container.projects.locations.clusters.updateMaster", @@ -6055,7 +6711,7 @@ func (c *ProjectsLocationsClustersNodePoolsCreateCall) Do(opts ...googleapi.Call // ], // "parameters": { // "parent": { - // "description": "The parent (project, location, cluster id) where the node pool will be created.\nSpecified in the format 'projects/*/locations/*/clusters/*/nodePools/*'.", + // "description": "The parent (project, location, cluster id) where the node pool will be\ncreated. Specified in the format\n'projects/*/locations/*/clusters/*/nodePools/*'.", // "location": "path", // "pattern": "^projects/[^/]+/locations/[^/]+/clusters/[^/]+$", // "required": true, @@ -6226,7 +6882,7 @@ func (c *ProjectsLocationsClustersNodePoolsDeleteCall) Do(opts ...googleapi.Call // "type": "string" // }, // "name": { - // "description": "The name (project, location, cluster, node pool id) of the node pool to delete.\nSpecified in the format 'projects/*/locations/*/clusters/*/nodePools/*'.", + // "description": "The name (project, location, cluster, node pool id) of the node pool to\ndelete. Specified in the format\n'projects/*/locations/*/clusters/*/nodePools/*'.", // "location": "path", // "pattern": "^projects/[^/]+/locations/[^/]+/clusters/[^/]+/nodePools/[^/]+$", // "required": true, @@ -6423,7 +7079,7 @@ func (c *ProjectsLocationsClustersNodePoolsGetCall) Do(opts ...googleapi.CallOpt // "type": "string" // }, // "name": { - // "description": "The name (project, location, cluster, node pool id) of the node pool to get.\nSpecified in the format 'projects/*/locations/*/clusters/*/nodePools/*'.", + // "description": "The name (project, location, cluster, node pool id) of the node pool to\nget. Specified in the format\n'projects/*/locations/*/clusters/*/nodePools/*'.", // "location": "path", // "pattern": "^projects/[^/]+/locations/[^/]+/clusters/[^/]+/nodePools/[^/]+$", // "required": true, @@ -6612,7 +7268,7 @@ func (c *ProjectsLocationsClustersNodePoolsListCall) Do(opts ...googleapi.CallOp // "type": "string" // }, // "parent": { - // "description": "The parent (project, location, cluster id) where the node pools will be listed.\nSpecified in the format 'projects/*/locations/*/clusters/*'.", + // "description": "The parent (project, location, cluster id) where the node pools will be\nlisted. Specified in the format 'projects/*/locations/*/clusters/*'.", // "location": "path", // "pattern": "^projects/[^/]+/locations/[^/]+/clusters/[^/]+$", // "required": true, @@ -7059,7 +7715,7 @@ type ProjectsLocationsClustersNodePoolsSetSizeCall struct { header_ http.Header } -// SetSize: Sets the size of a specific node pool. +// SetSize: Sets the size for a specific node pool. func (r *ProjectsLocationsClustersNodePoolsService) SetSize(name string, setnodepoolsizerequest *SetNodePoolSizeRequest) *ProjectsLocationsClustersNodePoolsSetSizeCall { c := &ProjectsLocationsClustersNodePoolsSetSizeCall{s: r.s, urlParams_: make(gensupport.URLParams)} c.name = name @@ -7153,7 +7809,7 @@ func (c *ProjectsLocationsClustersNodePoolsSetSizeCall) Do(opts ...googleapi.Cal } return ret, nil // { - // "description": "Sets the size of a specific node pool.", + // "description": "Sets the size for a specific node pool.", // "flatPath": "v1beta1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}/nodePools/{nodePoolsId}:setSize", // "httpMethod": "POST", // "id": "container.projects.locations.clusters.nodePools.setSize", @@ -7298,7 +7954,7 @@ func (c *ProjectsLocationsClustersNodePoolsUpdateCall) Do(opts ...googleapi.Call // ], // "parameters": { // "name": { - // "description": "The name (project, location, cluster, node pool) of the node pool to update.\nSpecified in the format 'projects/*/locations/*/clusters/*/nodePools/*'.", + // "description": "The name (project, location, cluster, node pool) of the node pool to\nupdate. Specified in the format\n'projects/*/locations/*/clusters/*/nodePools/*'.", // "location": "path", // "pattern": "^projects/[^/]+/locations/[^/]+/clusters/[^/]+/nodePools/[^/]+$", // "required": true, @@ -7669,9 +8325,11 @@ func (c *ProjectsLocationsOperationsListCall) ProjectId(projectId string) *Proje } // Zone sets the optional parameter "zone": Deprecated. The name of the -// Google Compute Engine [zone](/compute/docs/zones#available) -// to return operations for, or `-` for all zones. -// This field has been deprecated and replaced by the parent field. +// Google Compute Engine +// [zone](/compute/docs/zones#available) to return operations for, or +// `-` for +// all zones. This field has been deprecated and replaced by the parent +// field. func (c *ProjectsLocationsOperationsListCall) Zone(zone string) *ProjectsLocationsOperationsListCall { c.urlParams_.Set("zone", zone) return c @@ -7792,7 +8450,7 @@ func (c *ProjectsLocationsOperationsListCall) Do(opts ...googleapi.CallOption) ( // "type": "string" // }, // "zone": { - // "description": "Deprecated. The name of the Google Compute Engine [zone](/compute/docs/zones#available)\nto return operations for, or `-` for all zones.\nThis field has been deprecated and replaced by the parent field.", + // "description": "Deprecated. The name of the Google Compute Engine\n[zone](/compute/docs/zones#available) to return operations for, or `-` for\nall zones. This field has been deprecated and replaced by the parent field.", // "location": "query", // "type": "string" // } @@ -7983,7 +8641,7 @@ type ProjectsZonesClustersAddonsCall struct { header_ http.Header } -// Addons: Sets the addons of a specific cluster. +// Addons: Sets the addons for a specific cluster. func (r *ProjectsZonesClustersService) Addons(projectId string, zone string, clusterId string, setaddonsconfigrequest *SetAddonsConfigRequest) *ProjectsZonesClustersAddonsCall { c := &ProjectsZonesClustersAddonsCall{s: r.s, urlParams_: make(gensupport.URLParams)} c.projectId = projectId @@ -8081,7 +8739,7 @@ func (c *ProjectsZonesClustersAddonsCall) Do(opts ...googleapi.CallOption) (*Ope } return ret, nil // { - // "description": "Sets the addons of a specific cluster.", + // "description": "Sets the addons for a specific cluster.", // "flatPath": "v1beta1/projects/{projectId}/zones/{zone}/clusters/{clusterId}/addons", // "httpMethod": "POST", // "id": "container.projects.zones.clusters.addons", @@ -8619,7 +9277,7 @@ type ProjectsZonesClustersGetCall struct { header_ http.Header } -// Get: Gets the details of a specific cluster. +// Get: Gets the details for a specific cluster. func (r *ProjectsZonesClustersService) Get(projectId string, zone string, clusterId string) *ProjectsZonesClustersGetCall { c := &ProjectsZonesClustersGetCall{s: r.s, urlParams_: make(gensupport.URLParams)} c.projectId = projectId @@ -8732,7 +9390,7 @@ func (c *ProjectsZonesClustersGetCall) Do(opts ...googleapi.CallOption) (*Cluste } return ret, nil // { - // "description": "Gets the details of a specific cluster.", + // "description": "Gets the details for a specific cluster.", // "flatPath": "v1beta1/projects/{projectId}/zones/{zone}/clusters/{clusterId}", // "httpMethod": "GET", // "id": "container.projects.zones.clusters.get", @@ -9109,7 +9767,7 @@ type ProjectsZonesClustersLocationsCall struct { header_ http.Header } -// Locations: Sets the locations of a specific cluster. +// Locations: Sets the locations for a specific cluster. func (r *ProjectsZonesClustersService) Locations(projectId string, zone string, clusterId string, setlocationsrequest *SetLocationsRequest) *ProjectsZonesClustersLocationsCall { c := &ProjectsZonesClustersLocationsCall{s: r.s, urlParams_: make(gensupport.URLParams)} c.projectId = projectId @@ -9207,7 +9865,7 @@ func (c *ProjectsZonesClustersLocationsCall) Do(opts ...googleapi.CallOption) (* } return ret, nil // { - // "description": "Sets the locations of a specific cluster.", + // "description": "Sets the locations for a specific cluster.", // "flatPath": "v1beta1/projects/{projectId}/zones/{zone}/clusters/{clusterId}/locations", // "httpMethod": "POST", // "id": "container.projects.zones.clusters.locations", @@ -9263,7 +9921,7 @@ type ProjectsZonesClustersLoggingCall struct { header_ http.Header } -// Logging: Sets the logging service of a specific cluster. +// Logging: Sets the logging service for a specific cluster. func (r *ProjectsZonesClustersService) Logging(projectId string, zone string, clusterId string, setloggingservicerequest *SetLoggingServiceRequest) *ProjectsZonesClustersLoggingCall { c := &ProjectsZonesClustersLoggingCall{s: r.s, urlParams_: make(gensupport.URLParams)} c.projectId = projectId @@ -9361,7 +10019,7 @@ func (c *ProjectsZonesClustersLoggingCall) Do(opts ...googleapi.CallOption) (*Op } return ret, nil // { - // "description": "Sets the logging service of a specific cluster.", + // "description": "Sets the logging service for a specific cluster.", // "flatPath": "v1beta1/projects/{projectId}/zones/{zone}/clusters/{clusterId}/logging", // "httpMethod": "POST", // "id": "container.projects.zones.clusters.logging", @@ -9417,7 +10075,7 @@ type ProjectsZonesClustersMasterCall struct { header_ http.Header } -// Master: Updates the master of a specific cluster. +// Master: Updates the master for a specific cluster. func (r *ProjectsZonesClustersService) Master(projectId string, zone string, clusterId string, updatemasterrequest *UpdateMasterRequest) *ProjectsZonesClustersMasterCall { c := &ProjectsZonesClustersMasterCall{s: r.s, urlParams_: make(gensupport.URLParams)} c.projectId = projectId @@ -9515,7 +10173,7 @@ func (c *ProjectsZonesClustersMasterCall) Do(opts ...googleapi.CallOption) (*Ope } return ret, nil // { - // "description": "Updates the master of a specific cluster.", + // "description": "Updates the master for a specific cluster.", // "flatPath": "v1beta1/projects/{projectId}/zones/{zone}/clusters/{clusterId}/master", // "httpMethod": "POST", // "id": "container.projects.zones.clusters.master", @@ -9571,7 +10229,7 @@ type ProjectsZonesClustersMonitoringCall struct { header_ http.Header } -// Monitoring: Sets the monitoring service of a specific cluster. +// Monitoring: Sets the monitoring service for a specific cluster. func (r *ProjectsZonesClustersService) Monitoring(projectId string, zone string, clusterId string, setmonitoringservicerequest *SetMonitoringServiceRequest) *ProjectsZonesClustersMonitoringCall { c := &ProjectsZonesClustersMonitoringCall{s: r.s, urlParams_: make(gensupport.URLParams)} c.projectId = projectId @@ -9669,7 +10327,7 @@ func (c *ProjectsZonesClustersMonitoringCall) Do(opts ...googleapi.CallOption) ( } return ret, nil // { - // "description": "Sets the monitoring service of a specific cluster.", + // "description": "Sets the monitoring service for a specific cluster.", // "flatPath": "v1beta1/projects/{projectId}/zones/{zone}/clusters/{clusterId}/monitoring", // "httpMethod": "POST", // "id": "container.projects.zones.clusters.monitoring", @@ -10035,7 +10693,7 @@ type ProjectsZonesClustersSetMasterAuthCall struct { // SetMasterAuth: Used to set master auth materials. Currently supports // :- -// Changing the admin password of a specific cluster. +// Changing the admin password for a specific cluster. // This can be either via password generation or explicitly set. // Modify basic_auth.csv and reset the K8S API server. func (r *ProjectsZonesClustersService) SetMasterAuth(projectId string, zone string, clusterId string, setmasterauthrequest *SetMasterAuthRequest) *ProjectsZonesClustersSetMasterAuthCall { @@ -10135,7 +10793,7 @@ func (c *ProjectsZonesClustersSetMasterAuthCall) Do(opts ...googleapi.CallOption } return ret, nil // { - // "description": "Used to set master auth materials. Currently supports :-\nChanging the admin password of a specific cluster.\nThis can be either via password generation or explicitly set.\nModify basic_auth.csv and reset the K8S API server.", + // "description": "Used to set master auth materials. Currently supports :-\nChanging the admin password for a specific cluster.\nThis can be either via password generation or explicitly set.\nModify basic_auth.csv and reset the K8S API server.", // "flatPath": "v1beta1/projects/{projectId}/zones/{zone}/clusters/{clusterId}:setMasterAuth", // "httpMethod": "POST", // "id": "container.projects.zones.clusters.setMasterAuth", @@ -10499,7 +11157,7 @@ type ProjectsZonesClustersUpdateCall struct { header_ http.Header } -// Update: Updates the settings of a specific cluster. +// Update: Updates the settings for a specific cluster. func (r *ProjectsZonesClustersService) Update(projectId string, zone string, clusterId string, updateclusterrequest *UpdateClusterRequest) *ProjectsZonesClustersUpdateCall { c := &ProjectsZonesClustersUpdateCall{s: r.s, urlParams_: make(gensupport.URLParams)} c.projectId = projectId @@ -10597,7 +11255,7 @@ func (c *ProjectsZonesClustersUpdateCall) Do(opts ...googleapi.CallOption) (*Ope } return ret, nil // { - // "description": "Updates the settings of a specific cluster.", + // "description": "Updates the settings for a specific cluster.", // "flatPath": "v1beta1/projects/{projectId}/zones/{zone}/clusters/{clusterId}", // "httpMethod": "PUT", // "id": "container.projects.zones.clusters.update", @@ -10982,8 +11640,9 @@ func (r *ProjectsZonesClustersNodePoolsService) Delete(projectId string, zone st } // Name sets the optional parameter "name": The name (project, location, -// cluster, node pool id) of the node pool to delete. -// Specified in the format +// cluster, node pool id) of the node pool to +// delete. Specified in the +// format // 'projects/*/locations/*/clusters/*/nodePools/*'. func (c *ProjectsZonesClustersNodePoolsDeleteCall) Name(name string) *ProjectsZonesClustersNodePoolsDeleteCall { c.urlParams_.Set("name", name) @@ -11092,7 +11751,7 @@ func (c *ProjectsZonesClustersNodePoolsDeleteCall) Do(opts ...googleapi.CallOpti // "type": "string" // }, // "name": { - // "description": "The name (project, location, cluster, node pool id) of the node pool to delete.\nSpecified in the format 'projects/*/locations/*/clusters/*/nodePools/*'.", + // "description": "The name (project, location, cluster, node pool id) of the node pool to\ndelete. Specified in the format\n'projects/*/locations/*/clusters/*/nodePools/*'.", // "location": "query", // "type": "string" // }, @@ -11151,8 +11810,9 @@ func (r *ProjectsZonesClustersNodePoolsService) Get(projectId string, zone strin } // Name sets the optional parameter "name": The name (project, location, -// cluster, node pool id) of the node pool to get. -// Specified in the format +// cluster, node pool id) of the node pool to +// get. Specified in the +// format // 'projects/*/locations/*/clusters/*/nodePools/*'. func (c *ProjectsZonesClustersNodePoolsGetCall) Name(name string) *ProjectsZonesClustersNodePoolsGetCall { c.urlParams_.Set("name", name) @@ -11274,7 +11934,7 @@ func (c *ProjectsZonesClustersNodePoolsGetCall) Do(opts ...googleapi.CallOption) // "type": "string" // }, // "name": { - // "description": "The name (project, location, cluster, node pool id) of the node pool to get.\nSpecified in the format 'projects/*/locations/*/clusters/*/nodePools/*'.", + // "description": "The name (project, location, cluster, node pool id) of the node pool to\nget. Specified in the format\n'projects/*/locations/*/clusters/*/nodePools/*'.", // "location": "query", // "type": "string" // }, @@ -11331,8 +11991,8 @@ func (r *ProjectsZonesClustersNodePoolsService) List(projectId string, zone stri } // Parent sets the optional parameter "parent": The parent (project, -// location, cluster id) where the node pools will be listed. -// Specified in the format 'projects/*/locations/*/clusters/*'. +// location, cluster id) where the node pools will be +// listed. Specified in the format 'projects/*/locations/*/clusters/*'. func (c *ProjectsZonesClustersNodePoolsListCall) Parent(parent string) *ProjectsZonesClustersNodePoolsListCall { c.urlParams_.Set("parent", parent) return c @@ -11451,7 +12111,7 @@ func (c *ProjectsZonesClustersNodePoolsListCall) Do(opts ...googleapi.CallOption // "type": "string" // }, // "parent": { - // "description": "The parent (project, location, cluster id) where the node pools will be listed.\nSpecified in the format 'projects/*/locations/*/clusters/*'.", + // "description": "The parent (project, location, cluster id) where the node pools will be\nlisted. Specified in the format 'projects/*/locations/*/clusters/*'.", // "location": "query", // "type": "string" // }, @@ -11823,7 +12483,7 @@ type ProjectsZonesClustersNodePoolsSetSizeCall struct { header_ http.Header } -// SetSize: Sets the size of a specific node pool. +// SetSize: Sets the size for a specific node pool. func (r *ProjectsZonesClustersNodePoolsService) SetSize(projectId string, zone string, clusterId string, nodePoolId string, setnodepoolsizerequest *SetNodePoolSizeRequest) *ProjectsZonesClustersNodePoolsSetSizeCall { c := &ProjectsZonesClustersNodePoolsSetSizeCall{s: r.s, urlParams_: make(gensupport.URLParams)} c.projectId = projectId @@ -11923,7 +12583,7 @@ func (c *ProjectsZonesClustersNodePoolsSetSizeCall) Do(opts ...googleapi.CallOpt } return ret, nil // { - // "description": "Sets the size of a specific node pool.", + // "description": "Sets the size for a specific node pool.", // "flatPath": "v1beta1/projects/{projectId}/zones/{zone}/clusters/{clusterId}/nodePools/{nodePoolId}/setSize", // "httpMethod": "POST", // "id": "container.projects.zones.clusters.nodePools.setSize", @@ -12609,7 +13269,7 @@ func (c *ProjectsZonesOperationsListCall) Do(opts ...googleapi.CallOption) (*Lis // "type": "string" // }, // "zone": { - // "description": "Deprecated. The name of the Google Compute Engine [zone](/compute/docs/zones#available)\nto return operations for, or `-` for all zones.\nThis field has been deprecated and replaced by the parent field.", + // "description": "Deprecated. The name of the Google Compute Engine\n[zone](/compute/docs/zones#available) to return operations for, or `-` for\nall zones. This field has been deprecated and replaced by the parent field.", // "location": "path", // "required": true, // "type": "string" diff --git a/vendor/vendor.json b/vendor/vendor.json index 4de6df7b250..d2019912f46 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -1304,10 +1304,10 @@ "revisionTime": "2017-10-21T00:03:56Z" }, { - "checksumSHA1": "Bwdk1H9PYdjqw6l/1To/9ql0eII=", + "checksumSHA1": "yZERJY3ohvczGG15QPUyUh6VlFQ=", "path": "google.golang.org/api/container/v1beta1", - "revision": "24928b980e6919be4c72647aacd53ebcbb8c4bab", - "revisionTime": "2018-03-16T22:16:32Z" + "revision": "348810ff778af56686d572415ce79e6c9fad9613", + "revisionTime": "2018-05-08T15:48:10Z" }, { "checksumSHA1": "pxXDGWhDrfcAOCQCjgxLfZA4NOw=", diff --git a/website/docs/r/container_cluster.html.markdown b/website/docs/r/container_cluster.html.markdown index 0f010bc9394..1c27e639b01 100644 --- a/website/docs/r/container_cluster.html.markdown +++ b/website/docs/r/container_cluster.html.markdown @@ -141,7 +141,8 @@ output "cluster_ca_certificate" { `monitoring.googleapis.com` * `network` - (Optional) The name or self_link of the Google Compute Engine - network to which the cluster is connected. + network to which the cluster is connected. For Shared VPC, set this to the self link of the + shared network. * `network_policy` - (Optional) Configuration options for the [NetworkPolicy](https://kubernetes.io/docs/concepts/services-networking/networkpolicies/) @@ -171,7 +172,7 @@ output "cluster_ca_certificate" { * `remove_default_node_pool` - (Optional) If true, deletes the default node pool upon cluster creation. -* `subnetwork` - (Optional) The name of the Google Compute Engine subnetwork in +* `subnetwork` - (Optional) The name or self_link of the Google Compute Engine subnetwork in which the cluster's instances are launched. The `addons_config` block supports: