diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 29e31912272..55d29ed532c 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -1,6 +1,6 @@ { "ImportPath": "k8s.io/kubernetes", - "GoVersion": "go1.5.1", + "GoVersion": "go1.4.3", "Packages": [ "./..." ], @@ -772,7 +772,7 @@ "Rev": "0c2979aeaa5b573e60d3ddffe5ce8dca8df309bd" }, { - "ImportPath": "google.golang.org/api/container/v1beta1", + "ImportPath": "google.golang.org/api/container/v1", "Rev": "0c2979aeaa5b573e60d3ddffe5ce8dca8df309bd" }, { diff --git a/Godeps/_workspace/src/google.golang.org/api/container/v1beta1/container-api.json b/Godeps/_workspace/src/google.golang.org/api/container/v1/container-api.json similarity index 50% rename from Godeps/_workspace/src/google.golang.org/api/container/v1beta1/container-api.json rename to Godeps/_workspace/src/google.golang.org/api/container/v1/container-api.json index ba1f850e72b..291ff9dd7c9 100644 --- a/Godeps/_workspace/src/google.golang.org/api/container/v1beta1/container-api.json +++ b/Godeps/_workspace/src/google.golang.org/api/container/v1/container-api.json @@ -1,11 +1,11 @@ { "kind": "discovery#restDescription", - "etag": "\"ye6orv2F-1npMW3u9suM3a7C5Bo/H5vlYxYcjMuH0uPSZu-WXGARHps\"", + "etag": "\"ye6orv2F-1npMW3u9suM3a7C5Bo/6g1NnM2JgMMXgWbO_PX25Eu0zKs\"", "discoveryVersion": "v1", - "id": "container:v1beta1", + "id": "container:v1", "name": "container", - "version": "v1beta1", - "revision": "20150326", + "version": "v1", + "revision": "20150605", "title": "Google Container Engine API", "description": "The Google Container Engine API is used for building and managing container based applications, powered by the open source Kubernetes technology.", "ownerDomain": "google.com", @@ -14,26 +14,40 @@ "x16": "http://www.google.com/images/icons/product/search-16.gif", "x32": "http://www.google.com/images/icons/product/search-32.gif" }, - "documentationLink": "https://cloud.google.com/container-engine/docs/v1beta1/", + "documentationLink": "https://cloud.google.com/container-engine/", "protocol": "rest", - "baseUrl": "https://www.googleapis.com/container/v1beta1/projects/", - "basePath": "/container/v1beta1/projects/", - "rootUrl": "https://www.googleapis.com/", - "servicePath": "container/v1beta1/projects/", + "baseUrl": "https://container.googleapis.com/", + "basePath": "", + "rootUrl": "https://container.googleapis.com/", + "servicePath": "", "batchPath": "batch", "parameters": { + "access_token": { + "type": "string", + "description": "OAuth access token.", + "location": "query" + }, "alt": { "type": "string", - "description": "Data format for the response.", + "description": "Data format for response.", "default": "json", - "enum": [ - "json" - ], "enumDescriptions": [ - "Responses with Content-Type of application/json" + "Responses with Content-Type of application/json", + "Media download with context-dependent Content-Type", + "Responses with Content-Type of application/x-protobuf" ], "location": "query" }, + "bearer_token": { + "type": "string", + "description": "OAuth bearer token.", + "location": "query" + }, + "callback": { + "type": "string", + "description": "JSONP", + "location": "query" + }, "fields": { "type": "string", "description": "Selector specifying which fields to include in a partial response.", @@ -49,6 +63,12 @@ "description": "OAuth 2.0 token for the current user.", "location": "query" }, + "pp": { + "type": "boolean", + "description": "Pretty-print response.", + "default": "true", + "location": "query" + }, "prettyPrint": { "type": "boolean", "description": "Returns response with indentations and line breaks.", @@ -57,12 +77,26 @@ }, "quotaUser": { "type": "string", - "description": "Available to use for quota purposes for server-side applications. Can be any arbitrary string assigned to a user, but should not exceed 40 characters. Overrides userIp if both are provided.", + "description": "Available to use for quota purposes for server-side applications. Can be any arbitrary string assigned to a user, but should not exceed 40 characters.", "location": "query" }, - "userIp": { + "upload_protocol": { "type": "string", - "description": "IP address of the site where the request originates. Use this if you want to enforce per-user limits.", + "description": "Upload protocol for media (e.g. \"raw\", \"multipart\").", + "location": "query" + }, + "uploadType": { + "type": "string", + "description": "Legacy upload protocol for media (e.g. \"media\", \"multipart\").", + "location": "query" + }, + "$.xgafv": { + "type": "string", + "description": "V1 error format.", + "enumDescriptions": [ + "v1 error format", + "v2 error format" + ], "location": "query" } }, @@ -76,157 +110,260 @@ } }, "schemas": { + "ListClustersResponse": { + "id": "ListClustersResponse", + "type": "object", + "description": "ListClustersResponse is the result of ListClustersRequest.", + "properties": { + "clusters": { + "type": "array", + "description": "A list of clusters in the project in the specified zone, or across all ones.", + "items": { + "$ref": "Cluster" + } + } + } + }, "Cluster": { "id": "Cluster", "type": "object", + "description": "A Google Container Engine cluster.", "properties": { - "clusterApiVersion": { + "name": { "type": "string", - "description": "The API version of the Kubernetes master and kubelets running in this cluster. Leave blank to pick up the latest stable release, or specify a version of the form \"x.y.z\". The Google Container Engine release notes lists the currently supported versions. If an incorrect version is specified, the server returns an error listing the currently supported versions." - }, - "containerIpv4Cidr": { - "type": "string", - "description": "The IP address range of the container pods in this cluster, in CIDR notation (e.g. 10.96.0.0/14). Leave blank to have one automatically chosen or specify a /14 block in 10.0.0.0/8 or 172.16.0.0/12." - }, - "creationTimestamp": { - "type": "string", - "description": "[Output only] The time the cluster was created, in RFC3339 text format." + "description": "The name of this cluster. The name must be unique within this project and zone, and can be up to 40 characters with the following restrictions: * Lowercase letters, numbers, and hyphens only. * Must start with a letter. * Must end with a number or a letter." }, "description": { "type": "string", "description": "An optional description of this cluster." }, - "enableCloudLogging": { - "type": "boolean", - "description": "Whether logs from the cluster should be made available via the Google Cloud Logging service. This includes both logs from your applications running in the cluster as well as logs from the Kubernetes components themselves." + "initialNodeCount": { + "type": "integer", + "description": "The number of nodes to create in this cluster. You must ensure that your Compute Engine [resource quota](/compute/docs/resource-quotas) is sufficient for this number of instances. You must also have available firewall and routes quota.", + "format": "int32" }, - "enableCloudMonitoring": { - "type": "boolean", - "description": "Whether metrics from the cluster should be made available via the Google Cloud Monitoring service." - }, - "endpoint": { - "type": "string", - "description": "[Output only] The IP address of this cluster's Kubernetes master. The endpoint can be accessed from the internet at https://username:password@endpoint/.\n\nSee the masterAuth property of this resource for username and password information." - }, - "instanceGroupUrls": { - "type": "array", - "description": "[Output only] The resource URLs of [instance groups](/compute/docs/instance-groups/) associated with this cluster.", - "items": { - "type": "string" - } + "nodeConfig": { + "$ref": "NodeConfig", + "description": "Parameters used in creating the cluster's nodes. See the descriptions of the child properties of `nodeConfig`." }, "masterAuth": { "$ref": "MasterAuth", "description": "The authentication information for accessing the master." }, - "name": { + "loggingService": { "type": "string", - "description": "The name of this cluster. The name must be unique within this project and zone, and can be up to 40 characters with the following restrictions: \n- Lowercase letters, numbers, and hyphens only.\n- Must start with a letter.\n- Must end with a number or a letter." + "description": "The logging service that the cluster should write logs to. Currently available options: * \"logging.googleapis.com\" - the Google Cloud Logging service * \"none\" - no logs will be exported from the cluster * \"\" - default value; the default is \"logging.googleapis.com\"" + }, + "monitoringService": { + "type": "string", + "description": "The monitoring service that the cluster should write metrics to. Currently available options: * \"monitoring.googleapis.com\" - the Google Cloud Monitoring service * \"none\" - no metrics will be exported from the cluster * \"\" - default value; the default is \"monitoring.googleapis.com\"" }, "network": { "type": "string", - "description": "The name of the Google Compute Engine network to which the cluster is connected." + "description": "The name of the Google Compute Engine [network](/compute/docs/networking#networks_1) to which the cluster is connected. If left unspecified, the \"default\" network will be used." }, - "nodeConfig": { - "$ref": "NodeConfig", - "description": "The machine type and image to use for all nodes in this cluster. See the descriptions of the child properties of nodeConfig." - }, - "nodeRoutingPrefixSize": { - "type": "integer", - "description": "[Output only] The size of the address space on each node for hosting containers.", - "format": "int32" - }, - "numNodes": { - "type": "integer", - "description": "The number of nodes to create in this cluster. You must ensure that your Compute Engine resource quota is sufficient for this number of instances plus one (to include the master). You must also have available firewall and routes quota.", - "format": "int32" + "clusterIpv4Cidr": { + "type": "string", + "description": "The IP address range of the container pods in this cluster, in [CIDR](http://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing) notation (e.g. `10.96.0.0/14`). Leave blank to have one automatically chosen or specify a `/14` block in `10.0.0.0/8` or `172.16.0.0/12`." }, "selfLink": { "type": "string", - "description": "[Output only] Server-defined URL for the resource." + "description": "[Output only] Server-defined URL for the resource. @OutputOnly." }, - "servicesIpv4Cidr": { + "zone": { "type": "string", - "description": "[Output only] The IP address range of the Kubernetes services in this cluster, in CIDR notation (e.g. 1.2.3.4/29). Service addresses are typically put in the last /16 from the container CIDR." + "description": "[Output only] The name of the Google Compute Engine [zone](/compute/docs/zones#available) in which the cluster resides. @OutputOnly." + }, + "endpoint": { + "type": "string", + "description": "[Output only] The IP address of this cluster's Kubernetes master endpoint. The endpoint can be accessed from the internet at `https://username:password@endpoint/`. @OutputOnly. See the `masterAuth` property of this resource for username and password information." + }, + "initialClusterVersion": { + "type": "string", + "description": "[Output only] The software version of Kubernetes master and kubelets used in the cluster when it was first created. The version can be upgraded over time. @OutputOnly." + }, + "currentMasterVersion": { + "type": "string", + "description": "[Output only] The current software version of the master endpoint. @OutputOnly." + }, + "currentNodeVersion": { + "type": "string", + "description": "[Output only] The current version of the node software components. If they are currently at different versions because they're in the process of being upgraded, this reflects the minimum version of any of them. @OutputOnly." + }, + "createTime": { + "type": "string", + "description": "[Output only] The time the cluster was created, in [RFC3339](href='https://www.ietf.org/rfc/rfc3339.txt) text format. @OutputOnly." }, "status": { "type": "string", - "description": "[Output only] The current status of this cluster.", + "description": "[Output only] The current status of this cluster. @OutputOnly.", "enum": [ - "error", - "provisioning", - "running", - "stopping" - ], - "enumDescriptions": [ - "", - "", - "", - "" + "STATUS_UNSPECIFIED", + "PROVISIONING", + "RUNNING", + "RECONCILING", + "STOPPING", + "ERROR" ] }, "statusMessage": { "type": "string", - "description": "[Output only] Additional information about the current status of this cluster, if available." + "description": "[Output only] Additional information about the current status of this cluster, if available. @OutputOnly." }, - "zone": { + "nodeIpv4CidrSize": { + "type": "integer", + "description": "[Output only] The size of the address space on each node for hosting containers. This is provisioned from within the container_ipv4_cidr range. @OutputOnly.", + "format": "int32" + }, + "servicesIpv4Cidr": { "type": "string", - "description": "[Output only] The name of the Google Compute Engine zone in which the cluster resides." + "description": "[Output only] The IP address range of the Kubernetes services in this cluster, in [CIDR](http://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing) notation (e.g. `1.2.3.4/29`). Service addresses are typically put in the last /16 from the container CIDR. @OutputOnly." + }, + "instanceGroupUrls": { + "type": "array", + "description": "[Output only] The resource URLs of [instance groups](/compute/docs/instance-groups/) associated with this cluster. @OutputOnly.", + "items": { + "type": "string" + } + } + } + }, + "NodeConfig": { + "id": "NodeConfig", + "type": "object", + "description": "Per-node parameters.", + "properties": { + "machineType": { + "type": "string", + "description": "The name of a Google Compute Engine [machine type](/compute/docs/machine-types) (e.g. `n1-standard-1`). If unspecified, the default machine type is `n1-standard-1`." + }, + "diskSizeGb": { + "type": "integer", + "description": "Size of the disk attached to each node, specified in GB. The smallest allowed disk size is 10GB, and the default is 100GB.", + "format": "int32" + }, + "oauthScopes": { + "type": "array", + "description": "The set of Google API scopes to be made available on all of the node VMs under the \"default\" service account. Currently, the following scopes are necessary to ensure the correct functioning of the cluster: * \"https://www.googleapis.com/auth/compute\" * \"https://www.googleapis.com/auth/devstorage.read_only\"", + "items": { + "type": "string" + } + } + } + }, + "MasterAuth": { + "id": "MasterAuth", + "type": "object", + "description": "The authentication information for accessing the master endpoint. Authentication can be done using HTTP basic auth or using client certificates.", + "properties": { + "username": { + "type": "string", + "description": "The username to use for HTTP basic authentication when accessing the Kubernetes master endpoint." + }, + "password": { + "type": "string", + "description": "The password to use for HTTP basic authentication when accessing the Kubernetes master endpoint. Because the master endpoint is open to the internet, you should create a strong password." + }, + "clusterCaCertificate": { + "type": "string", + "description": "[Output only] Base64 encoded public certificate that is the root of trust for the cluster. @OutputOnly." + }, + "clientCertificate": { + "type": "string", + "description": "[Output only] Base64 encoded public certificate used by clients to authenticate to the cluster endpoint. @OutputOnly." + }, + "clientKey": { + "type": "string", + "description": "[Output only] Base64 encoded private key used by clients to authenticate to the cluster endpoint. @OutputOnly." } } }, "CreateClusterRequest": { "id": "CreateClusterRequest", "type": "object", + "description": "CreateClusterRequest creates a cluster.", "properties": { "cluster": { "$ref": "Cluster", - "description": "A cluster resource." + "description": "A [cluster resource](/container-engine/docs/v1/projects/zones/clusters)" } } }, - "ListAggregatedClustersResponse": { - "id": "ListAggregatedClustersResponse", + "Operation": { + "id": "Operation", "type": "object", + "description": "Defines the operation resource. All fields are output only.", "properties": { - "clusters": { - "type": "array", - "description": "A list of clusters in the project, across all zones.", - "items": { - "$ref": "Cluster" - } + "name": { + "type": "string", + "description": "The server-assigned ID for the operation. @OutputOnly." + }, + "zone": { + "type": "string", + "description": "The name of the Google Compute Engine [zone](/compute/docs/zones#available) in which the operation is taking place. @OutputOnly." + }, + "operationType": { + "type": "string", + "description": "The operation type. @OutputOnly.", + "enum": [ + "TYPE_UNSPECIFIED", + "CREATE_CLUSTER", + "DELETE_CLUSTER", + "UPGRADE_MASTER", + "UPGRADE_NODES", + "REPAIR_CLUSTER" + ] + }, + "status": { + "type": "string", + "description": "The current status of the operation. @OutputOnly.", + "enum": [ + "STATUS_UNSPECIFIED", + "PENDING", + "RUNNING", + "DONE" + ] + }, + "statusMessage": { + "type": "string", + "description": "If an error has occurred, a textual description of the error. @OutputOnly." + }, + "selfLink": { + "type": "string", + "description": "Server-defined URL for the resource. @OutputOnly." + }, + "targetLink": { + "type": "string", + "description": "Server-defined URL for the target of the operation. @OutputOnly." } } }, - "ListAggregatedOperationsResponse": { - "id": "ListAggregatedOperationsResponse", + "UpdateClusterRequest": { + "id": "UpdateClusterRequest", "type": "object", + "description": "UpdateClusterRequest updates a cluster.", "properties": { - "operations": { - "type": "array", - "description": "A list of operations in the project, across all zones.", - "items": { - "$ref": "Operation" - } + "update": { + "$ref": "ClusterUpdate", + "description": "A description of the update." } } }, - "ListClustersResponse": { - "id": "ListClustersResponse", + "ClusterUpdate": { + "id": "ClusterUpdate", "type": "object", + "description": "ClusterUpdate describes an update to the cluster.", "properties": { - "clusters": { - "type": "array", - "description": "A list of clusters in the project in the specified zone.", - "items": { - "$ref": "Cluster" - } + "desiredNodeVersion": { + "type": "string", + "description": "The Kubernetes version to change the nodes to (typically an upgrade). Use \"-\" to upgrade to the latest version supported by the server." } } }, "ListOperationsResponse": { "id": "ListOperationsResponse", "type": "object", + "description": "ListOperationsResponse is the result of ListOperationsRequest.", "properties": { "operations": { "type": "array", @@ -236,218 +373,104 @@ } } } - }, - "MasterAuth": { - "id": "MasterAuth", - "type": "object", - "description": "The authentication information for accessing the master. Authentication is either done using HTTP basic authentication or using a bearer token.", - "properties": { - "bearerToken": { - "type": "string", - "description": "The token used to authenticate API requests to the master. The token is to be included in an HTTP Authorization Header in all requests to the master endpoint. The format of the header is: \"Authorization: Bearer \"." - }, - "clientCertificate": { - "type": "string", - "description": "[Output only] Base64 encoded public certificate used by clients to authenticate to the cluster endpoint." - }, - "clientKey": { - "type": "string", - "description": "[Output only] Base64 encoded private key used by clients to authenticate to the cluster endpoint." - }, - "clusterCaCertificate": { - "type": "string", - "description": "[Output only] Base64 encoded public certificate that is the root of trust for the cluster." - }, - "password": { - "type": "string", - "description": "The password to use for HTTP basic authentication when accessing the Kubernetes master endpoint. Because the master endpoint is open to the internet, you should create a strong password." - }, - "user": { - "type": "string", - "description": "The username to use for HTTP basic authentication when accessing the Kubernetes master endpoint." - } - } - }, - "NodeConfig": { - "id": "NodeConfig", - "type": "object", - "properties": { - "machineType": { - "type": "string", - "description": "The name of a Google Compute Engine machine type (e.g. n1-standard-1).\n\nIf unspecified, the default machine type is n1-standard-1." - }, - "serviceAccounts": { - "type": "array", - "description": "The optional list of ServiceAccounts, each with their specified scopes, to be made available on all of the node VMs. In addition to the service accounts and scopes specified, the \"default\" account will always be created with the following scopes to ensure the correct functioning of the cluster: \n- https://www.googleapis.com/auth/compute,\n- https://www.googleapis.com/auth/devstorage.read_only", - "items": { - "$ref": "ServiceAccount" - } - }, - "sourceImage": { - "type": "string", - "description": "The fully-specified name of a Google Compute Engine image. For example: https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/backports-debian-7-wheezy-vYYYYMMDD (where YYYMMDD is the version date).\n\nIf specifying an image, you are responsible for ensuring its compatibility with the Debian 7 backports image. We recommend leaving this field blank to accept the default backports-debian-7-wheezy value." - } - } - }, - "Operation": { - "id": "Operation", - "type": "object", - "description": "Defines the operation resource. All fields are output only.", - "properties": { - "errorMessage": { - "type": "string", - "description": "If an error has occurred, a textual description of the error." - }, - "name": { - "type": "string", - "description": "The server-assigned ID for the operation." - }, - "operationType": { - "type": "string", - "description": "The operation type.", - "enum": [ - "createCluster", - "deleteCluster" - ], - "enumDescriptions": [ - "", - "" - ] - }, - "selfLink": { - "type": "string", - "description": "Server-defined URL for the resource." - }, - "status": { - "type": "string", - "description": "The current status of the operation.", - "enum": [ - "done", - "pending", - "running" - ], - "enumDescriptions": [ - "", - "", - "" - ] - }, - "target": { - "type": "string", - "description": "[Optional] The URL of the cluster resource that this operation is associated with." - }, - "targetLink": { - "type": "string", - "description": "Server-defined URL for the target of the operation." - }, - "zone": { - "type": "string", - "description": "The name of the Google Compute Engine zone in which the operation is taking place." - } - } - }, - "ServiceAccount": { - "id": "ServiceAccount", - "type": "object", - "description": "A Compute Engine service account.", - "properties": { - "email": { - "type": "string", - "description": "Email address of the service account." - }, - "scopes": { - "type": "array", - "description": "The list of scopes to be made available for this service account.", - "items": { - "type": "string" - } - } - } } }, "resources": { "projects": { "resources": { - "clusters": { - "methods": { - "list": { - "id": "container.projects.clusters.list", - "path": "{projectId}/clusters", - "httpMethod": "GET", - "description": "Lists all clusters owned by a project across all zones.", - "parameters": { - "projectId": { - "type": "string", - "description": "The Google Developers Console project ID or project number.", - "required": true, - "location": "path" - } - }, - "parameterOrder": [ - "projectId" - ], - "response": { - "$ref": "ListAggregatedClustersResponse" - }, - "scopes": [ - "https://www.googleapis.com/auth/cloud-platform" - ] - } - } - }, - "operations": { - "methods": { - "list": { - "id": "container.projects.operations.list", - "path": "{projectId}/operations", - "httpMethod": "GET", - "description": "Lists all operations in a project, across all zones.", - "parameters": { - "projectId": { - "type": "string", - "description": "The Google Developers Console project ID or project number.", - "required": true, - "location": "path" - } - }, - "parameterOrder": [ - "projectId" - ], - "response": { - "$ref": "ListAggregatedOperationsResponse" - }, - "scopes": [ - "https://www.googleapis.com/auth/cloud-platform" - ] - } - } - }, "zones": { "resources": { "clusters": { "methods": { - "create": { - "id": "container.projects.zones.clusters.create", - "path": "{projectId}/zones/{zoneId}/clusters", - "httpMethod": "POST", - "description": "Creates a cluster, consisting of the specified number and type of Google Compute Engine instances, plus a Kubernetes master instance.\n\nThe cluster is created in the project's default network.\n\nA firewall is added that allows traffic into port 443 on the master, which enables HTTPS. A firewall and a route is added for each node to allow the containers on that node to communicate with all other instances in the cluster.\n\nFinally, an entry is added to the project's global metadata indicating which CIDR range is being used by the cluster.", + "list": { + "id": "container.projects.zones.clusters.list", + "path": "v1/projects/{projectId}/zones/{zone}/clusters", + "httpMethod": "GET", + "description": "Lists all clusters owned by a project in either the specified zone or all zones.", "parameters": { "projectId": { "type": "string", - "description": "The Google Developers Console project ID or project number.", + "description": "The Google Developers Console [project ID](https://console.developers.google.com/project) or [project number](https://developers.google.com/console/help/project-number)", "required": true, "location": "path" }, - "zoneId": { + "zone": { "type": "string", - "description": "The name of the Google Compute Engine zone in which the cluster resides.", + "description": "The name of the Google Compute Engine [zone](/compute/docs/zones#available) in which the cluster resides, or \"-\" for all zones.", "required": true, "location": "path" } }, "parameterOrder": [ "projectId", - "zoneId" + "zone" + ], + "response": { + "$ref": "ListClustersResponse" + }, + "scopes": [ + "https://www.googleapis.com/auth/cloud-platform" + ] + }, + "get": { + "id": "container.projects.zones.clusters.get", + "path": "v1/projects/{projectId}/zones/{zone}/clusters/{clusterId}", + "httpMethod": "GET", + "description": "Gets a specific cluster.", + "parameters": { + "projectId": { + "type": "string", + "description": "The Google Developers Console A [project ID](https://console.developers.google.com/project) or [project number](https://developers.google.com/console/help/project-number)", + "required": true, + "location": "path" + }, + "zone": { + "type": "string", + "description": "The name of the Google Compute Engine [zone](/compute/docs/zones#available) in which the cluster resides.", + "required": true, + "location": "path" + }, + "clusterId": { + "type": "string", + "description": "The name of the cluster to retrieve.", + "required": true, + "location": "path" + } + }, + "parameterOrder": [ + "projectId", + "zone", + "clusterId" + ], + "response": { + "$ref": "Cluster" + }, + "scopes": [ + "https://www.googleapis.com/auth/cloud-platform" + ] + }, + "create": { + "id": "container.projects.zones.clusters.create", + "path": "v1/projects/{projectId}/zones/{zone}/clusters", + "httpMethod": "POST", + "description": "Creates a cluster, consisting of the specified number and type of Google Compute Engine instances, plus a Kubernetes master endpoint. By default, the cluster is created in the project's [default network]('/compute/docs/networking#networks_1'). One firewall is added for the cluster. After cluster creation, the cluster creates routes for each node to allow the containers on that node to communicate with all other instances in the cluster. Finally, an entry is added to the project's global metadata indicating which CIDR range is being used by the cluster.", + "parameters": { + "projectId": { + "type": "string", + "description": "The Google Developers Console [project ID](https://console.developers.google.com/project) or [project number](https://developers.google.com/console/help/project-number)", + "required": true, + "location": "path" + }, + "zone": { + "type": "string", + "description": "The name of the Google Compute Engine [zone](/compute/docs/zones#available) in which the cluster resides.", + "required": true, + "location": "path" + } + }, + "parameterOrder": [ + "projectId", + "zone" ], "request": { "$ref": "CreateClusterRequest" @@ -459,36 +482,39 @@ "https://www.googleapis.com/auth/cloud-platform" ] }, - "delete": { - "id": "container.projects.zones.clusters.delete", - "path": "{projectId}/zones/{zoneId}/clusters/{clusterId}", - "httpMethod": "DELETE", - "description": "Deletes the cluster, including the Kubernetes master and all worker nodes.\n\nFirewalls and routes that were configured at cluster creation are also deleted.", + "update": { + "id": "container.projects.zones.clusters.update", + "path": "v1/projects/{projectId}/zones/{zone}/clusters/{clusterId}", + "httpMethod": "PUT", + "description": "Update settings of a specific cluster.", "parameters": { - "clusterId": { - "type": "string", - "description": "The name of the cluster to delete.", - "required": true, - "location": "path" - }, "projectId": { "type": "string", - "description": "The Google Developers Console project ID or project number.", + "description": "The Google Developers Console [project ID](https://console.developers.google.com/project) or [project number](https://developers.google.com/console/help/project-number)", "required": true, "location": "path" }, - "zoneId": { + "zone": { "type": "string", - "description": "The name of the Google Compute Engine zone in which the cluster resides.", + "description": "The name of the Google Compute Engine [zone](/compute/docs/zones#available) in which the cluster resides.", + "required": true, + "location": "path" + }, + "clusterId": { + "type": "string", + "description": "The name of the cluster to upgrade.", "required": true, "location": "path" } }, "parameterOrder": [ "projectId", - "zoneId", + "zone", "clusterId" ], + "request": { + "$ref": "UpdateClusterRequest" + }, "response": { "$ref": "Operation" }, @@ -496,68 +522,38 @@ "https://www.googleapis.com/auth/cloud-platform" ] }, - "get": { - "id": "container.projects.zones.clusters.get", - "path": "{projectId}/zones/{zoneId}/clusters/{clusterId}", - "httpMethod": "GET", - "description": "Gets a specific cluster.", + "delete": { + "id": "container.projects.zones.clusters.delete", + "path": "v1/projects/{projectId}/zones/{zone}/clusters/{clusterId}", + "httpMethod": "DELETE", + "description": "Deletes the cluster, including the Kubernetes endpoint and all worker nodes. Firewalls and routes that were configured during cluster creation are also deleted.", "parameters": { - "clusterId": { - "type": "string", - "description": "The name of the cluster to retrieve.", - "required": true, - "location": "path" - }, "projectId": { "type": "string", - "description": "The Google Developers Console project ID or project number.", + "description": "The Google Developers Console [project ID](https://console.developers.google.com/project) or [project number](https://developers.google.com/console/help/project-number)", "required": true, "location": "path" }, - "zoneId": { + "zone": { "type": "string", - "description": "The name of the Google Compute Engine zone in which the cluster resides.", + "description": "The name of the Google Compute Engine [zone](/compute/docs/zones#available) in which the cluster resides.", + "required": true, + "location": "path" + }, + "clusterId": { + "type": "string", + "description": "The name of the cluster to delete.", "required": true, "location": "path" } }, "parameterOrder": [ "projectId", - "zoneId", + "zone", "clusterId" ], "response": { - "$ref": "Cluster" - }, - "scopes": [ - "https://www.googleapis.com/auth/cloud-platform" - ] - }, - "list": { - "id": "container.projects.zones.clusters.list", - "path": "{projectId}/zones/{zoneId}/clusters", - "httpMethod": "GET", - "description": "Lists all clusters owned by a project in the specified zone.", - "parameters": { - "projectId": { - "type": "string", - "description": "The Google Developers Console project ID or project number.", - "required": true, - "location": "path" - }, - "zoneId": { - "type": "string", - "description": "The name of the Google Compute Engine zone in which the cluster resides.", - "required": true, - "location": "path" - } - }, - "parameterOrder": [ - "projectId", - "zoneId" - ], - "response": { - "$ref": "ListClustersResponse" + "$ref": "Operation" }, "scopes": [ "https://www.googleapis.com/auth/cloud-platform" @@ -567,68 +563,68 @@ }, "operations": { "methods": { - "get": { - "id": "container.projects.zones.operations.get", - "path": "{projectId}/zones/{zoneId}/operations/{operationId}", + "list": { + "id": "container.projects.zones.operations.list", + "path": "v1/projects/{projectId}/zones/{zone}/operations", "httpMethod": "GET", - "description": "Gets the specified operation.", + "description": "Lists all operations in a project in a specific zone or all zones.", "parameters": { - "operationId": { - "type": "string", - "description": "The server-assigned name of the operation.", - "required": true, - "location": "path" - }, "projectId": { "type": "string", - "description": "The Google Developers Console project ID or project number.", + "description": "The Google Developers Console [project ID](https://console.developers.google.com/project) or [project number](https://developers.google.com/console/help/project-number)", "required": true, "location": "path" }, - "zoneId": { + "zone": { "type": "string", - "description": "The name of the Google Compute Engine zone in which the operation resides. This is always the same zone as the cluster with which the operation is associated.", + "description": "The name of the Google Compute Engine [zone](/compute/docs/zones#available) to return operations for, or \"-\" for all zones.", "required": true, "location": "path" } }, "parameterOrder": [ "projectId", - "zoneId", - "operationId" + "zone" ], "response": { - "$ref": "Operation" + "$ref": "ListOperationsResponse" }, "scopes": [ "https://www.googleapis.com/auth/cloud-platform" ] }, - "list": { - "id": "container.projects.zones.operations.list", - "path": "{projectId}/zones/{zoneId}/operations", + "get": { + "id": "container.projects.zones.operations.get", + "path": "v1/projects/{projectId}/zones/{zone}/operations/{operationId}", "httpMethod": "GET", - "description": "Lists all operations in a project in a specific zone.", + "description": "Gets the specified operation.", "parameters": { "projectId": { "type": "string", - "description": "The Google Developers Console project ID or project number.", + "description": "The Google Developers Console [project ID](https://console.developers.google.com/project) or [project number](https://developers.google.com/console/help/project-number)", "required": true, "location": "path" }, - "zoneId": { + "zone": { "type": "string", - "description": "The name of the Google Compute Engine zone to return operations for.", + "description": "The name of the Google Compute Engine [zone](/compute/docs/zones#available) in which the cluster resides.", + "required": true, + "location": "path" + }, + "operationId": { + "type": "string", + "description": "The server-assigned `name` of the operation.", "required": true, "location": "path" } }, "parameterOrder": [ "projectId", - "zoneId" + "zone", + "operationId" ], "response": { - "$ref": "ListOperationsResponse" + "$ref": "Operation" }, "scopes": [ "https://www.googleapis.com/auth/cloud-platform" diff --git a/Godeps/_workspace/src/google.golang.org/api/container/v1beta1/container-gen.go b/Godeps/_workspace/src/google.golang.org/api/container/v1/container-gen.go similarity index 59% rename from Godeps/_workspace/src/google.golang.org/api/container/v1beta1/container-gen.go rename to Godeps/_workspace/src/google.golang.org/api/container/v1/container-gen.go index f3a2f3e9eaf..67babb3fbc4 100644 --- a/Godeps/_workspace/src/google.golang.org/api/container/v1beta1/container-gen.go +++ b/Godeps/_workspace/src/google.golang.org/api/container/v1/container-gen.go @@ -1,10 +1,10 @@ // Package container provides access to the Google Container Engine API. // -// See https://cloud.google.com/container-engine/docs/v1beta1/ +// See https://cloud.google.com/container-engine/ // // Usage example: // -// import "google.golang.org/api/container/v1beta1" +// import "google.golang.org/api/container/v1" // ... // containerService, err := container.New(oauthHttpClient) package container @@ -36,10 +36,10 @@ var _ = errors.New var _ = strings.Replace var _ = context.Background -const apiId = "container:v1beta1" +const apiId = "container:v1" const apiName = "container" -const apiVersion = "v1beta1" -const basePath = "https://www.googleapis.com/container/v1beta1/projects/" +const apiVersion = "v1" +const basePath = "https://container.googleapis.com/" // OAuth2 scopes used by this API. const ( @@ -73,8 +73,6 @@ func (s *Service) userAgent() string { func NewProjectsService(s *Service) *ProjectsService { rs := &ProjectsService{s: s} - rs.Clusters = NewProjectsClustersService(s) - rs.Operations = NewProjectsOperationsService(s) rs.Zones = NewProjectsZonesService(s) return rs } @@ -82,31 +80,9 @@ func NewProjectsService(s *Service) *ProjectsService { type ProjectsService struct { s *Service - Clusters *ProjectsClustersService - - Operations *ProjectsOperationsService - Zones *ProjectsZonesService } -func NewProjectsClustersService(s *Service) *ProjectsClustersService { - rs := &ProjectsClustersService{s: s} - return rs -} - -type ProjectsClustersService struct { - s *Service -} - -func NewProjectsOperationsService(s *Service) *ProjectsOperationsService { - rs := &ProjectsOperationsService{s: s} - return rs -} - -type ProjectsOperationsService struct { - s *Service -} - func NewProjectsZonesService(s *Service) *ProjectsZonesService { rs := &ProjectsZonesService{s: s} rs.Clusters = NewProjectsZonesClustersService(s) @@ -140,152 +116,172 @@ type ProjectsZonesOperationsService struct { s *Service } +// Cluster: A Google Container Engine cluster. type Cluster struct { - // ClusterApiVersion: The API version of the Kubernetes master and - // kubelets running in this cluster. Leave blank to pick up the latest - // stable release, or specify a version of the form "x.y.z". The Google - // Container Engine release notes lists the currently supported - // versions. If an incorrect version is specified, the server returns an - // error listing the currently supported versions. - ClusterApiVersion string `json:"clusterApiVersion,omitempty"` + // ClusterIpv4Cidr: The IP address range of the container pods in this + // cluster, in + // [CIDR](http://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing) + // notation (e.g. `10.96.0.0/14`). Leave blank to have one automatically + // chosen or specify a `/14` block in `10.0.0.0/8` or `172.16.0.0/12`. + ClusterIpv4Cidr string `json:"clusterIpv4Cidr,omitempty"` - // ContainerIpv4Cidr: The IP address range of the container pods in this - // cluster, in CIDR notation (e.g. 10.96.0.0/14). Leave blank to have - // one automatically chosen or specify a /14 block in 10.0.0.0/8 or - // 172.16.0.0/12. - ContainerIpv4Cidr string `json:"containerIpv4Cidr,omitempty"` + // CreateTime: [Output only] The time the cluster was created, in + // [RFC3339](href='https://www.ietf.org/rfc/rfc3339.txt) text format. + // @OutputOnly. + CreateTime string `json:"createTime,omitempty"` - // CreationTimestamp: [Output only] The time the cluster was created, in - // RFC3339 text format. - CreationTimestamp string `json:"creationTimestamp,omitempty"` + // CurrentMasterVersion: [Output only] The current software version of + // the master endpoint. @OutputOnly. + CurrentMasterVersion string `json:"currentMasterVersion,omitempty"` + + // CurrentNodeVersion: [Output only] The current version of the node + // software components. If they are currently at different versions + // because they're in the process of being upgraded, this reflects the + // minimum version of any of them. @OutputOnly. + CurrentNodeVersion string `json:"currentNodeVersion,omitempty"` // Description: An optional description of this cluster. Description string `json:"description,omitempty"` - // EnableCloudLogging: Whether logs from the cluster should be made - // available via the Google Cloud Logging service. This includes both - // logs from your applications running in the cluster as well as logs - // from the Kubernetes components themselves. - EnableCloudLogging bool `json:"enableCloudLogging,omitempty"` - - // EnableCloudMonitoring: Whether metrics from the cluster should be - // made available via the Google Cloud Monitoring service. - EnableCloudMonitoring bool `json:"enableCloudMonitoring,omitempty"` - // Endpoint: [Output only] The IP address of this cluster's Kubernetes - // master. The endpoint can be accessed from the internet at - // https://username:password@endpoint/. - // - // See the masterAuth property of this resource for username and - // password information. + // master endpoint. The endpoint can be accessed from the internet at + // `https://username:password@endpoint/`. @OutputOnly. See the + // `masterAuth` property of this resource for username and password + // information. Endpoint string `json:"endpoint,omitempty"` + // InitialClusterVersion: [Output only] The software version of + // Kubernetes master and kubelets used in the cluster when it was first + // created. The version can be upgraded over time. @OutputOnly. + InitialClusterVersion string `json:"initialClusterVersion,omitempty"` + + // InitialNodeCount: The number of nodes to create in this cluster. You + // must ensure that your Compute Engine [resource + // quota](/compute/docs/resource-quotas) is sufficient for this number + // of instances. You must also have available firewall and routes quota. + InitialNodeCount int64 `json:"initialNodeCount,omitempty"` + // InstanceGroupUrls: [Output only] The resource URLs of [instance // groups](/compute/docs/instance-groups/) associated with this cluster. + // @OutputOnly. InstanceGroupUrls []string `json:"instanceGroupUrls,omitempty"` + // LoggingService: The logging service that the cluster should write + // logs to. Currently available options: * "logging.googleapis.com" - + // the Google Cloud Logging service * "none" - no logs will be exported + // from the cluster * "" - default value; the default is + // "logging.googleapis.com" + LoggingService string `json:"loggingService,omitempty"` + // MasterAuth: The authentication information for accessing the master. MasterAuth *MasterAuth `json:"masterAuth,omitempty"` + // MonitoringService: The monitoring service that the cluster should + // write metrics to. Currently available options: * + // "monitoring.googleapis.com" - the Google Cloud Monitoring service * + // "none" - no metrics will be exported from the cluster * "" - default + // value; the default is "monitoring.googleapis.com" + MonitoringService string `json:"monitoringService,omitempty"` + // Name: The name of this cluster. The name must be unique within this // project and zone, and can be up to 40 characters with the following - // restrictions: - // - Lowercase letters, numbers, and hyphens only. - // - Must start with a letter. - // - Must end with a number or a letter. + // restrictions: * Lowercase letters, numbers, and hyphens only. * Must + // start with a letter. * Must end with a number or a letter. Name string `json:"name,omitempty"` - // Network: The name of the Google Compute Engine network to which the - // cluster is connected. + // Network: The name of the Google Compute Engine + // [network](/compute/docs/networking#networks_1) to which the cluster + // is connected. If left unspecified, the "default" network will be + // used. Network string `json:"network,omitempty"` - // NodeConfig: The machine type and image to use for all nodes in this - // cluster. See the descriptions of the child properties of nodeConfig. + // NodeConfig: Parameters used in creating the cluster's nodes. See the + // descriptions of the child properties of `nodeConfig`. NodeConfig *NodeConfig `json:"nodeConfig,omitempty"` - // NodeRoutingPrefixSize: [Output only] The size of the address space on - // each node for hosting containers. - NodeRoutingPrefixSize int64 `json:"nodeRoutingPrefixSize,omitempty"` - - // NumNodes: The number of nodes to create in this cluster. You must - // ensure that your Compute Engine resource quota is sufficient for this - // number of instances plus one (to include the master). You must also - // have available firewall and routes quota. - NumNodes int64 `json:"numNodes,omitempty"` + // NodeIpv4CidrSize: [Output only] The size of the address space on each + // node for hosting containers. This is provisioned from within the + // container_ipv4_cidr range. @OutputOnly. + NodeIpv4CidrSize int64 `json:"nodeIpv4CidrSize,omitempty"` // SelfLink: [Output only] Server-defined URL for the resource. + // @OutputOnly. SelfLink string `json:"selfLink,omitempty"` // ServicesIpv4Cidr: [Output only] The IP address range of the - // Kubernetes services in this cluster, in CIDR notation (e.g. - // 1.2.3.4/29). Service addresses are typically put in the last /16 from - // the container CIDR. + // Kubernetes services in this cluster, in + // [CIDR](http://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing) + // notation (e.g. `1.2.3.4/29`). Service addresses are typically put in + // the last /16 from the container CIDR. @OutputOnly. ServicesIpv4Cidr string `json:"servicesIpv4Cidr,omitempty"` // Status: [Output only] The current status of this cluster. + // @OutputOnly. // // Possible values: - // "error" - // "provisioning" - // "running" - // "stopping" + // "STATUS_UNSPECIFIED" + // "PROVISIONING" + // "RUNNING" + // "RECONCILING" + // "STOPPING" + // "ERROR" Status string `json:"status,omitempty"` // StatusMessage: [Output only] Additional information about the current - // status of this cluster, if available. + // status of this cluster, if available. @OutputOnly. StatusMessage string `json:"statusMessage,omitempty"` - // Zone: [Output only] The name of the Google Compute Engine zone in - // which the cluster resides. + // Zone: [Output only] The name of the Google Compute Engine + // [zone](/compute/docs/zones#available) in which the cluster resides. + // @OutputOnly. Zone string `json:"zone,omitempty"` } +// ClusterUpdate: ClusterUpdate describes an update to the cluster. +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. + DesiredNodeVersion string `json:"desiredNodeVersion,omitempty"` +} + +// CreateClusterRequest: CreateClusterRequest creates a cluster. type CreateClusterRequest struct { - // Cluster: A cluster resource. + // Cluster: A [cluster + // resource](/container-engine/docs/v1/projects/zones/clusters) Cluster *Cluster `json:"cluster,omitempty"` } -type ListAggregatedClustersResponse struct { - // Clusters: A list of clusters in the project, across all zones. - Clusters []*Cluster `json:"clusters,omitempty"` -} - -type ListAggregatedOperationsResponse struct { - // Operations: A list of operations in the project, across all zones. - Operations []*Operation `json:"operations,omitempty"` -} - +// ListClustersResponse: ListClustersResponse is the result of +// ListClustersRequest. type ListClustersResponse struct { - // Clusters: A list of clusters in the project in the specified zone. + // Clusters: A list of clusters in the project in the specified zone, or + // across all ones. Clusters []*Cluster `json:"clusters,omitempty"` } +// ListOperationsResponse: ListOperationsResponse is the result of +// ListOperationsRequest. type ListOperationsResponse struct { // Operations: A list of operations in the project in the specified // zone. Operations []*Operation `json:"operations,omitempty"` } -// MasterAuth: The authentication information for accessing the master. -// Authentication is either done using HTTP basic authentication or -// using a bearer token. +// MasterAuth: The authentication information for accessing the master +// endpoint. Authentication can be done using HTTP basic auth or using +// client certificates. type MasterAuth struct { - // BearerToken: The token used to authenticate API requests to the - // master. The token is to be included in an HTTP Authorization Header - // in all requests to the master endpoint. The format of the header is: - // "Authorization: Bearer ". - BearerToken string `json:"bearerToken,omitempty"` - // ClientCertificate: [Output only] Base64 encoded public certificate - // used by clients to authenticate to the cluster endpoint. + // used by clients to authenticate to the cluster endpoint. @OutputOnly. ClientCertificate string `json:"clientCertificate,omitempty"` // ClientKey: [Output only] Base64 encoded private key used by clients - // to authenticate to the cluster endpoint. + // to authenticate to the cluster endpoint. @OutputOnly. ClientKey string `json:"clientKey,omitempty"` // ClusterCaCertificate: [Output only] Base64 encoded public certificate - // that is the root of trust for the cluster. + // that is the root of trust for the cluster. @OutputOnly. ClusterCaCertificate string `json:"clusterCaCertificate,omitempty"` // Password: The password to use for HTTP basic authentication when @@ -293,238 +289,77 @@ type MasterAuth struct { // is open to the internet, you should create a strong password. Password string `json:"password,omitempty"` - // User: The username to use for HTTP basic authentication when + // Username: The username to use for HTTP basic authentication when // accessing the Kubernetes master endpoint. - User string `json:"user,omitempty"` + Username string `json:"username,omitempty"` } +// NodeConfig: Per-node parameters. type NodeConfig struct { - // MachineType: The name of a Google Compute Engine machine type (e.g. - // n1-standard-1). - // - // If unspecified, the default machine type is n1-standard-1. + // DiskSizeGb: Size of the disk attached to each node, specified in GB. + // The smallest allowed disk size is 10GB, and the default is 100GB. + DiskSizeGb int64 `json:"diskSizeGb,omitempty"` + + // MachineType: The name of a Google Compute Engine [machine + // type](/compute/docs/machine-types) (e.g. `n1-standard-1`). If + // unspecified, the default machine type is `n1-standard-1`. MachineType string `json:"machineType,omitempty"` - // ServiceAccounts: The optional list of ServiceAccounts, each with - // their specified scopes, to be made available on all of the node VMs. - // In addition to the service accounts and scopes specified, the - // "default" account will always be created with the following scopes to - // ensure the correct functioning of the cluster: - // - https://www.googleapis.com/auth/compute, - // - https://www.googleapis.com/auth/devstorage.read_only - ServiceAccounts []*ServiceAccount `json:"serviceAccounts,omitempty"` - - // SourceImage: The fully-specified name of a Google Compute Engine - // image. For example: - // https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/backports-debian-7-wheezy-vYYYYMMDD (where YYYMMDD is the version date). - // - // If specifying an image, you are responsible for ensuring its - // compatibility with the Debian 7 backports image. We recommend leaving - // this field blank to accept the default backports-debian-7-wheezy - // value. - SourceImage string `json:"sourceImage,omitempty"` + // OauthScopes: The set of Google API scopes to be made available on all + // of the node VMs under the "default" service account. Currently, the + // following scopes are necessary to ensure the correct functioning of + // the cluster: * "https://www.googleapis.com/auth/compute" * + // "https://www.googleapis.com/auth/devstorage.read_only" + OauthScopes []string `json:"oauthScopes,omitempty"` } // Operation: Defines the operation resource. All fields are output // only. type Operation struct { - // ErrorMessage: If an error has occurred, a textual description of the - // error. - ErrorMessage string `json:"errorMessage,omitempty"` - - // Name: The server-assigned ID for the operation. + // Name: The server-assigned ID for the operation. @OutputOnly. Name string `json:"name,omitempty"` - // OperationType: The operation type. + // OperationType: The operation type. @OutputOnly. // // Possible values: - // "createCluster" - // "deleteCluster" + // "TYPE_UNSPECIFIED" + // "CREATE_CLUSTER" + // "DELETE_CLUSTER" + // "UPGRADE_MASTER" + // "UPGRADE_NODES" + // "REPAIR_CLUSTER" OperationType string `json:"operationType,omitempty"` - // SelfLink: Server-defined URL for the resource. + // SelfLink: Server-defined URL for the resource. @OutputOnly. SelfLink string `json:"selfLink,omitempty"` - // Status: The current status of the operation. + // Status: The current status of the operation. @OutputOnly. // // Possible values: - // "done" - // "pending" - // "running" + // "STATUS_UNSPECIFIED" + // "PENDING" + // "RUNNING" + // "DONE" Status string `json:"status,omitempty"` - // Target: [Optional] The URL of the cluster resource that this - // operation is associated with. - Target string `json:"target,omitempty"` + // StatusMessage: If an error has occurred, a textual description of the + // error. @OutputOnly. + StatusMessage string `json:"statusMessage,omitempty"` // TargetLink: Server-defined URL for the target of the operation. + // @OutputOnly. TargetLink string `json:"targetLink,omitempty"` - // Zone: The name of the Google Compute Engine zone in which the - // operation is taking place. + // Zone: The name of the Google Compute Engine + // [zone](/compute/docs/zones#available) in which the operation is + // taking place. @OutputOnly. Zone string `json:"zone,omitempty"` } -// ServiceAccount: A Compute Engine service account. -type ServiceAccount struct { - // Email: Email address of the service account. - Email string `json:"email,omitempty"` - - // Scopes: The list of scopes to be made available for this service - // account. - Scopes []string `json:"scopes,omitempty"` -} - -// method id "container.projects.clusters.list": - -type ProjectsClustersListCall struct { - s *Service - projectId string - opt_ map[string]interface{} -} - -// List: Lists all clusters owned by a project across all zones. -func (r *ProjectsClustersService) List(projectId string) *ProjectsClustersListCall { - c := &ProjectsClustersListCall{s: r.s, opt_: make(map[string]interface{})} - c.projectId = projectId - 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 *ProjectsClustersListCall) Fields(s ...googleapi.Field) *ProjectsClustersListCall { - c.opt_["fields"] = googleapi.CombineFields(s) - return c -} - -func (c *ProjectsClustersListCall) Do() (*ListAggregatedClustersResponse, error) { - var body io.Reader = nil - params := make(url.Values) - params.Set("alt", "json") - if v, ok := c.opt_["fields"]; ok { - params.Set("fields", fmt.Sprintf("%v", v)) - } - urls := googleapi.ResolveRelative(c.s.BasePath, "{projectId}/clusters") - urls += "?" + params.Encode() - req, _ := http.NewRequest("GET", urls, body) - googleapi.Expand(req.URL, map[string]string{ - "projectId": c.projectId, - }) - req.Header.Set("User-Agent", c.s.userAgent()) - res, err := c.s.client.Do(req) - if err != nil { - return nil, err - } - defer googleapi.CloseBody(res) - if err := googleapi.CheckResponse(res); err != nil { - return nil, err - } - var ret *ListAggregatedClustersResponse - if err := json.NewDecoder(res.Body).Decode(&ret); err != nil { - return nil, err - } - return ret, nil - // { - // "description": "Lists all clusters owned by a project across all zones.", - // "httpMethod": "GET", - // "id": "container.projects.clusters.list", - // "parameterOrder": [ - // "projectId" - // ], - // "parameters": { - // "projectId": { - // "description": "The Google Developers Console project ID or project number.", - // "location": "path", - // "required": true, - // "type": "string" - // } - // }, - // "path": "{projectId}/clusters", - // "response": { - // "$ref": "ListAggregatedClustersResponse" - // }, - // "scopes": [ - // "https://www.googleapis.com/auth/cloud-platform" - // ] - // } - -} - -// method id "container.projects.operations.list": - -type ProjectsOperationsListCall struct { - s *Service - projectId string - opt_ map[string]interface{} -} - -// List: Lists all operations in a project, across all zones. -func (r *ProjectsOperationsService) List(projectId string) *ProjectsOperationsListCall { - c := &ProjectsOperationsListCall{s: r.s, opt_: make(map[string]interface{})} - c.projectId = projectId - 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 *ProjectsOperationsListCall) Fields(s ...googleapi.Field) *ProjectsOperationsListCall { - c.opt_["fields"] = googleapi.CombineFields(s) - return c -} - -func (c *ProjectsOperationsListCall) Do() (*ListAggregatedOperationsResponse, error) { - var body io.Reader = nil - params := make(url.Values) - params.Set("alt", "json") - if v, ok := c.opt_["fields"]; ok { - params.Set("fields", fmt.Sprintf("%v", v)) - } - urls := googleapi.ResolveRelative(c.s.BasePath, "{projectId}/operations") - urls += "?" + params.Encode() - req, _ := http.NewRequest("GET", urls, body) - googleapi.Expand(req.URL, map[string]string{ - "projectId": c.projectId, - }) - req.Header.Set("User-Agent", c.s.userAgent()) - res, err := c.s.client.Do(req) - if err != nil { - return nil, err - } - defer googleapi.CloseBody(res) - if err := googleapi.CheckResponse(res); err != nil { - return nil, err - } - var ret *ListAggregatedOperationsResponse - if err := json.NewDecoder(res.Body).Decode(&ret); err != nil { - return nil, err - } - return ret, nil - // { - // "description": "Lists all operations in a project, across all zones.", - // "httpMethod": "GET", - // "id": "container.projects.operations.list", - // "parameterOrder": [ - // "projectId" - // ], - // "parameters": { - // "projectId": { - // "description": "The Google Developers Console project ID or project number.", - // "location": "path", - // "required": true, - // "type": "string" - // } - // }, - // "path": "{projectId}/operations", - // "response": { - // "$ref": "ListAggregatedOperationsResponse" - // }, - // "scopes": [ - // "https://www.googleapis.com/auth/cloud-platform" - // ] - // } - +// UpdateClusterRequest: UpdateClusterRequest updates a cluster. +type UpdateClusterRequest struct { + // Update: A description of the update. + Update *ClusterUpdate `json:"update,omitempty"` } // method id "container.projects.zones.clusters.create": @@ -532,28 +367,24 @@ func (c *ProjectsOperationsListCall) Do() (*ListAggregatedOperationsResponse, er type ProjectsZonesClustersCreateCall struct { s *Service projectId string - zoneId string + zone string createclusterrequest *CreateClusterRequest opt_ map[string]interface{} } // Create: Creates a cluster, consisting of the specified number and // type of Google Compute Engine instances, plus a Kubernetes master -// instance. -// -// The cluster is created in the project's default network. -// -// A firewall is added that allows traffic into port 443 on the master, -// which enables HTTPS. A firewall and a route is added for each node to -// allow the containers on that node to communicate with all other -// instances in the cluster. -// -// Finally, an entry is added to the project's global metadata -// indicating which CIDR range is being used by the cluster. -func (r *ProjectsZonesClustersService) Create(projectId string, zoneId string, createclusterrequest *CreateClusterRequest) *ProjectsZonesClustersCreateCall { +// endpoint. By default, the cluster is created in the project's +// [default network]('/compute/docs/networking#networks_1'). One +// firewall is added for the cluster. After cluster creation, the +// cluster creates routes for each node to allow the containers on that +// node to communicate with all other instances in the cluster. Finally, +// an entry is added to the project's global metadata indicating which +// CIDR range is being used by the cluster. +func (r *ProjectsZonesClustersService) Create(projectId string, zone string, createclusterrequest *CreateClusterRequest) *ProjectsZonesClustersCreateCall { c := &ProjectsZonesClustersCreateCall{s: r.s, opt_: make(map[string]interface{})} c.projectId = projectId - c.zoneId = zoneId + c.zone = zone c.createclusterrequest = createclusterrequest return c } @@ -578,12 +409,12 @@ func (c *ProjectsZonesClustersCreateCall) Do() (*Operation, error) { if v, ok := c.opt_["fields"]; ok { params.Set("fields", fmt.Sprintf("%v", v)) } - urls := googleapi.ResolveRelative(c.s.BasePath, "{projectId}/zones/{zoneId}/clusters") + urls := googleapi.ResolveRelative(c.s.BasePath, "v1/projects/{projectId}/zones/{zone}/clusters") urls += "?" + params.Encode() req, _ := http.NewRequest("POST", urls, body) googleapi.Expand(req.URL, map[string]string{ "projectId": c.projectId, - "zoneId": c.zoneId, + "zone": c.zone, }) req.Header.Set("Content-Type", ctype) req.Header.Set("User-Agent", c.s.userAgent()) @@ -601,28 +432,28 @@ func (c *ProjectsZonesClustersCreateCall) Do() (*Operation, error) { } return ret, nil // { - // "description": "Creates a cluster, consisting of the specified number and type of Google Compute Engine instances, plus a Kubernetes master instance.\n\nThe cluster is created in the project's default network.\n\nA firewall is added that allows traffic into port 443 on the master, which enables HTTPS. A firewall and a route is added for each node to allow the containers on that node to communicate with all other instances in the cluster.\n\nFinally, an entry is added to the project's global metadata indicating which CIDR range is being used by the cluster.", + // "description": "Creates a cluster, consisting of the specified number and type of Google Compute Engine instances, plus a Kubernetes master endpoint. By default, the cluster is created in the project's [default network]('/compute/docs/networking#networks_1'). One firewall is added for the cluster. After cluster creation, the cluster creates routes for each node to allow the containers on that node to communicate with all other instances in the cluster. Finally, an entry is added to the project's global metadata indicating which CIDR range is being used by the cluster.", // "httpMethod": "POST", // "id": "container.projects.zones.clusters.create", // "parameterOrder": [ // "projectId", - // "zoneId" + // "zone" // ], // "parameters": { // "projectId": { - // "description": "The Google Developers Console project ID or project number.", + // "description": "The Google Developers Console [project ID](https://console.developers.google.com/project) or [project number](https://developers.google.com/console/help/project-number)", // "location": "path", // "required": true, // "type": "string" // }, - // "zoneId": { - // "description": "The name of the Google Compute Engine zone in which the cluster resides.", + // "zone": { + // "description": "The name of the Google Compute Engine [zone](/compute/docs/zones#available) in which the cluster resides.", // "location": "path", // "required": true, // "type": "string" // } // }, - // "path": "{projectId}/zones/{zoneId}/clusters", + // "path": "v1/projects/{projectId}/zones/{zone}/clusters", // "request": { // "$ref": "CreateClusterRequest" // }, @@ -641,20 +472,18 @@ func (c *ProjectsZonesClustersCreateCall) Do() (*Operation, error) { type ProjectsZonesClustersDeleteCall struct { s *Service projectId string - zoneId string + zone string clusterId string opt_ map[string]interface{} } -// Delete: Deletes the cluster, including the Kubernetes master and all -// worker nodes. -// -// Firewalls and routes that were configured at cluster creation are -// also deleted. -func (r *ProjectsZonesClustersService) Delete(projectId string, zoneId string, clusterId string) *ProjectsZonesClustersDeleteCall { +// Delete: Deletes the cluster, including the Kubernetes endpoint and +// all worker nodes. Firewalls and routes that were configured during +// cluster creation are also deleted. +func (r *ProjectsZonesClustersService) Delete(projectId string, zone string, clusterId string) *ProjectsZonesClustersDeleteCall { c := &ProjectsZonesClustersDeleteCall{s: r.s, opt_: make(map[string]interface{})} c.projectId = projectId - c.zoneId = zoneId + c.zone = zone c.clusterId = clusterId return c } @@ -674,12 +503,12 @@ func (c *ProjectsZonesClustersDeleteCall) Do() (*Operation, error) { if v, ok := c.opt_["fields"]; ok { params.Set("fields", fmt.Sprintf("%v", v)) } - urls := googleapi.ResolveRelative(c.s.BasePath, "{projectId}/zones/{zoneId}/clusters/{clusterId}") + urls := googleapi.ResolveRelative(c.s.BasePath, "v1/projects/{projectId}/zones/{zone}/clusters/{clusterId}") urls += "?" + params.Encode() req, _ := http.NewRequest("DELETE", urls, body) googleapi.Expand(req.URL, map[string]string{ "projectId": c.projectId, - "zoneId": c.zoneId, + "zone": c.zone, "clusterId": c.clusterId, }) req.Header.Set("User-Agent", c.s.userAgent()) @@ -697,12 +526,12 @@ func (c *ProjectsZonesClustersDeleteCall) Do() (*Operation, error) { } return ret, nil // { - // "description": "Deletes the cluster, including the Kubernetes master and all worker nodes.\n\nFirewalls and routes that were configured at cluster creation are also deleted.", + // "description": "Deletes the cluster, including the Kubernetes endpoint and all worker nodes. Firewalls and routes that were configured during cluster creation are also deleted.", // "httpMethod": "DELETE", // "id": "container.projects.zones.clusters.delete", // "parameterOrder": [ // "projectId", - // "zoneId", + // "zone", // "clusterId" // ], // "parameters": { @@ -713,19 +542,19 @@ func (c *ProjectsZonesClustersDeleteCall) Do() (*Operation, error) { // "type": "string" // }, // "projectId": { - // "description": "The Google Developers Console project ID or project number.", + // "description": "The Google Developers Console [project ID](https://console.developers.google.com/project) or [project number](https://developers.google.com/console/help/project-number)", // "location": "path", // "required": true, // "type": "string" // }, - // "zoneId": { - // "description": "The name of the Google Compute Engine zone in which the cluster resides.", + // "zone": { + // "description": "The name of the Google Compute Engine [zone](/compute/docs/zones#available) in which the cluster resides.", // "location": "path", // "required": true, // "type": "string" // } // }, - // "path": "{projectId}/zones/{zoneId}/clusters/{clusterId}", + // "path": "v1/projects/{projectId}/zones/{zone}/clusters/{clusterId}", // "response": { // "$ref": "Operation" // }, @@ -741,16 +570,16 @@ func (c *ProjectsZonesClustersDeleteCall) Do() (*Operation, error) { type ProjectsZonesClustersGetCall struct { s *Service projectId string - zoneId string + zone string clusterId string opt_ map[string]interface{} } // Get: Gets a specific cluster. -func (r *ProjectsZonesClustersService) Get(projectId string, zoneId string, clusterId string) *ProjectsZonesClustersGetCall { +func (r *ProjectsZonesClustersService) Get(projectId string, zone string, clusterId string) *ProjectsZonesClustersGetCall { c := &ProjectsZonesClustersGetCall{s: r.s, opt_: make(map[string]interface{})} c.projectId = projectId - c.zoneId = zoneId + c.zone = zone c.clusterId = clusterId return c } @@ -770,12 +599,12 @@ func (c *ProjectsZonesClustersGetCall) Do() (*Cluster, error) { if v, ok := c.opt_["fields"]; ok { params.Set("fields", fmt.Sprintf("%v", v)) } - urls := googleapi.ResolveRelative(c.s.BasePath, "{projectId}/zones/{zoneId}/clusters/{clusterId}") + urls := googleapi.ResolveRelative(c.s.BasePath, "v1/projects/{projectId}/zones/{zone}/clusters/{clusterId}") urls += "?" + params.Encode() req, _ := http.NewRequest("GET", urls, body) googleapi.Expand(req.URL, map[string]string{ "projectId": c.projectId, - "zoneId": c.zoneId, + "zone": c.zone, "clusterId": c.clusterId, }) req.Header.Set("User-Agent", c.s.userAgent()) @@ -798,7 +627,7 @@ func (c *ProjectsZonesClustersGetCall) Do() (*Cluster, error) { // "id": "container.projects.zones.clusters.get", // "parameterOrder": [ // "projectId", - // "zoneId", + // "zone", // "clusterId" // ], // "parameters": { @@ -809,19 +638,19 @@ func (c *ProjectsZonesClustersGetCall) Do() (*Cluster, error) { // "type": "string" // }, // "projectId": { - // "description": "The Google Developers Console project ID or project number.", + // "description": "The Google Developers Console A [project ID](https://console.developers.google.com/project) or [project number](https://developers.google.com/console/help/project-number)", // "location": "path", // "required": true, // "type": "string" // }, - // "zoneId": { - // "description": "The name of the Google Compute Engine zone in which the cluster resides.", + // "zone": { + // "description": "The name of the Google Compute Engine [zone](/compute/docs/zones#available) in which the cluster resides.", // "location": "path", // "required": true, // "type": "string" // } // }, - // "path": "{projectId}/zones/{zoneId}/clusters/{clusterId}", + // "path": "v1/projects/{projectId}/zones/{zone}/clusters/{clusterId}", // "response": { // "$ref": "Cluster" // }, @@ -837,15 +666,16 @@ func (c *ProjectsZonesClustersGetCall) Do() (*Cluster, error) { type ProjectsZonesClustersListCall struct { s *Service projectId string - zoneId string + zone string opt_ map[string]interface{} } -// List: Lists all clusters owned by a project in the specified zone. -func (r *ProjectsZonesClustersService) List(projectId string, zoneId string) *ProjectsZonesClustersListCall { +// List: Lists all clusters owned by a project in either the specified +// zone or all zones. +func (r *ProjectsZonesClustersService) List(projectId string, zone string) *ProjectsZonesClustersListCall { c := &ProjectsZonesClustersListCall{s: r.s, opt_: make(map[string]interface{})} c.projectId = projectId - c.zoneId = zoneId + c.zone = zone return c } @@ -864,12 +694,12 @@ func (c *ProjectsZonesClustersListCall) Do() (*ListClustersResponse, error) { if v, ok := c.opt_["fields"]; ok { params.Set("fields", fmt.Sprintf("%v", v)) } - urls := googleapi.ResolveRelative(c.s.BasePath, "{projectId}/zones/{zoneId}/clusters") + urls := googleapi.ResolveRelative(c.s.BasePath, "v1/projects/{projectId}/zones/{zone}/clusters") urls += "?" + params.Encode() req, _ := http.NewRequest("GET", urls, body) googleapi.Expand(req.URL, map[string]string{ "projectId": c.projectId, - "zoneId": c.zoneId, + "zone": c.zone, }) req.Header.Set("User-Agent", c.s.userAgent()) res, err := c.s.client.Do(req) @@ -886,28 +716,28 @@ func (c *ProjectsZonesClustersListCall) Do() (*ListClustersResponse, error) { } return ret, nil // { - // "description": "Lists all clusters owned by a project in the specified zone.", + // "description": "Lists all clusters owned by a project in either the specified zone or all zones.", // "httpMethod": "GET", // "id": "container.projects.zones.clusters.list", // "parameterOrder": [ // "projectId", - // "zoneId" + // "zone" // ], // "parameters": { // "projectId": { - // "description": "The Google Developers Console project ID or project number.", + // "description": "The Google Developers Console [project ID](https://console.developers.google.com/project) or [project number](https://developers.google.com/console/help/project-number)", // "location": "path", // "required": true, // "type": "string" // }, - // "zoneId": { - // "description": "The name of the Google Compute Engine zone in which the cluster resides.", + // "zone": { + // "description": "The name of the Google Compute Engine [zone](/compute/docs/zones#available) in which the cluster resides, or \"-\" for all zones.", // "location": "path", // "required": true, // "type": "string" // } // }, - // "path": "{projectId}/zones/{zoneId}/clusters", + // "path": "v1/projects/{projectId}/zones/{zone}/clusters", // "response": { // "$ref": "ListClustersResponse" // }, @@ -918,21 +748,128 @@ func (c *ProjectsZonesClustersListCall) Do() (*ListClustersResponse, error) { } +// method id "container.projects.zones.clusters.update": + +type ProjectsZonesClustersUpdateCall struct { + s *Service + projectId string + zone string + clusterId string + updateclusterrequest *UpdateClusterRequest + opt_ map[string]interface{} +} + +// Update: Update settings of a specific cluster. +func (r *ProjectsZonesClustersService) Update(projectId string, zone string, clusterId string, updateclusterrequest *UpdateClusterRequest) *ProjectsZonesClustersUpdateCall { + c := &ProjectsZonesClustersUpdateCall{s: r.s, opt_: make(map[string]interface{})} + c.projectId = projectId + c.zone = zone + c.clusterId = clusterId + c.updateclusterrequest = updateclusterrequest + 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 *ProjectsZonesClustersUpdateCall) Fields(s ...googleapi.Field) *ProjectsZonesClustersUpdateCall { + c.opt_["fields"] = googleapi.CombineFields(s) + return c +} + +func (c *ProjectsZonesClustersUpdateCall) Do() (*Operation, error) { + var body io.Reader = nil + body, err := googleapi.WithoutDataWrapper.JSONReader(c.updateclusterrequest) + if err != nil { + return nil, err + } + ctype := "application/json" + params := make(url.Values) + params.Set("alt", "json") + if v, ok := c.opt_["fields"]; ok { + params.Set("fields", fmt.Sprintf("%v", v)) + } + urls := googleapi.ResolveRelative(c.s.BasePath, "v1/projects/{projectId}/zones/{zone}/clusters/{clusterId}") + urls += "?" + params.Encode() + req, _ := http.NewRequest("PUT", urls, body) + googleapi.Expand(req.URL, map[string]string{ + "projectId": c.projectId, + "zone": c.zone, + "clusterId": c.clusterId, + }) + req.Header.Set("Content-Type", ctype) + req.Header.Set("User-Agent", c.s.userAgent()) + res, err := c.s.client.Do(req) + if err != nil { + return nil, err + } + defer googleapi.CloseBody(res) + if err := googleapi.CheckResponse(res); err != nil { + return nil, err + } + var ret *Operation + if err := json.NewDecoder(res.Body).Decode(&ret); err != nil { + return nil, err + } + return ret, nil + // { + // "description": "Update settings of a specific cluster.", + // "httpMethod": "PUT", + // "id": "container.projects.zones.clusters.update", + // "parameterOrder": [ + // "projectId", + // "zone", + // "clusterId" + // ], + // "parameters": { + // "clusterId": { + // "description": "The name of the cluster to upgrade.", + // "location": "path", + // "required": true, + // "type": "string" + // }, + // "projectId": { + // "description": "The Google Developers Console [project ID](https://console.developers.google.com/project) or [project number](https://developers.google.com/console/help/project-number)", + // "location": "path", + // "required": true, + // "type": "string" + // }, + // "zone": { + // "description": "The name of the Google Compute Engine [zone](/compute/docs/zones#available) in which the cluster resides.", + // "location": "path", + // "required": true, + // "type": "string" + // } + // }, + // "path": "v1/projects/{projectId}/zones/{zone}/clusters/{clusterId}", + // "request": { + // "$ref": "UpdateClusterRequest" + // }, + // "response": { + // "$ref": "Operation" + // }, + // "scopes": [ + // "https://www.googleapis.com/auth/cloud-platform" + // ] + // } + +} + // method id "container.projects.zones.operations.get": type ProjectsZonesOperationsGetCall struct { s *Service projectId string - zoneId string + zone string operationId string opt_ map[string]interface{} } // Get: Gets the specified operation. -func (r *ProjectsZonesOperationsService) Get(projectId string, zoneId string, operationId string) *ProjectsZonesOperationsGetCall { +func (r *ProjectsZonesOperationsService) Get(projectId string, zone string, operationId string) *ProjectsZonesOperationsGetCall { c := &ProjectsZonesOperationsGetCall{s: r.s, opt_: make(map[string]interface{})} c.projectId = projectId - c.zoneId = zoneId + c.zone = zone c.operationId = operationId return c } @@ -952,12 +889,12 @@ func (c *ProjectsZonesOperationsGetCall) Do() (*Operation, error) { if v, ok := c.opt_["fields"]; ok { params.Set("fields", fmt.Sprintf("%v", v)) } - urls := googleapi.ResolveRelative(c.s.BasePath, "{projectId}/zones/{zoneId}/operations/{operationId}") + urls := googleapi.ResolveRelative(c.s.BasePath, "v1/projects/{projectId}/zones/{zone}/operations/{operationId}") urls += "?" + params.Encode() req, _ := http.NewRequest("GET", urls, body) googleapi.Expand(req.URL, map[string]string{ "projectId": c.projectId, - "zoneId": c.zoneId, + "zone": c.zone, "operationId": c.operationId, }) req.Header.Set("User-Agent", c.s.userAgent()) @@ -980,30 +917,30 @@ func (c *ProjectsZonesOperationsGetCall) Do() (*Operation, error) { // "id": "container.projects.zones.operations.get", // "parameterOrder": [ // "projectId", - // "zoneId", + // "zone", // "operationId" // ], // "parameters": { // "operationId": { - // "description": "The server-assigned name of the operation.", + // "description": "The server-assigned `name` of the operation.", // "location": "path", // "required": true, // "type": "string" // }, // "projectId": { - // "description": "The Google Developers Console project ID or project number.", + // "description": "The Google Developers Console [project ID](https://console.developers.google.com/project) or [project number](https://developers.google.com/console/help/project-number)", // "location": "path", // "required": true, // "type": "string" // }, - // "zoneId": { - // "description": "The name of the Google Compute Engine zone in which the operation resides. This is always the same zone as the cluster with which the operation is associated.", + // "zone": { + // "description": "The name of the Google Compute Engine [zone](/compute/docs/zones#available) in which the cluster resides.", // "location": "path", // "required": true, // "type": "string" // } // }, - // "path": "{projectId}/zones/{zoneId}/operations/{operationId}", + // "path": "v1/projects/{projectId}/zones/{zone}/operations/{operationId}", // "response": { // "$ref": "Operation" // }, @@ -1019,15 +956,16 @@ func (c *ProjectsZonesOperationsGetCall) Do() (*Operation, error) { type ProjectsZonesOperationsListCall struct { s *Service projectId string - zoneId string + zone string opt_ map[string]interface{} } -// List: Lists all operations in a project in a specific zone. -func (r *ProjectsZonesOperationsService) List(projectId string, zoneId string) *ProjectsZonesOperationsListCall { +// List: Lists all operations in a project in a specific zone or all +// zones. +func (r *ProjectsZonesOperationsService) List(projectId string, zone string) *ProjectsZonesOperationsListCall { c := &ProjectsZonesOperationsListCall{s: r.s, opt_: make(map[string]interface{})} c.projectId = projectId - c.zoneId = zoneId + c.zone = zone return c } @@ -1046,12 +984,12 @@ func (c *ProjectsZonesOperationsListCall) Do() (*ListOperationsResponse, error) if v, ok := c.opt_["fields"]; ok { params.Set("fields", fmt.Sprintf("%v", v)) } - urls := googleapi.ResolveRelative(c.s.BasePath, "{projectId}/zones/{zoneId}/operations") + urls := googleapi.ResolveRelative(c.s.BasePath, "v1/projects/{projectId}/zones/{zone}/operations") urls += "?" + params.Encode() req, _ := http.NewRequest("GET", urls, body) googleapi.Expand(req.URL, map[string]string{ "projectId": c.projectId, - "zoneId": c.zoneId, + "zone": c.zone, }) req.Header.Set("User-Agent", c.s.userAgent()) res, err := c.s.client.Do(req) @@ -1068,28 +1006,28 @@ func (c *ProjectsZonesOperationsListCall) Do() (*ListOperationsResponse, error) } return ret, nil // { - // "description": "Lists all operations in a project in a specific zone.", + // "description": "Lists all operations in a project in a specific zone or all zones.", // "httpMethod": "GET", // "id": "container.projects.zones.operations.list", // "parameterOrder": [ // "projectId", - // "zoneId" + // "zone" // ], // "parameters": { // "projectId": { - // "description": "The Google Developers Console project ID or project number.", + // "description": "The Google Developers Console [project ID](https://console.developers.google.com/project) or [project number](https://developers.google.com/console/help/project-number)", // "location": "path", // "required": true, // "type": "string" // }, - // "zoneId": { - // "description": "The name of the Google Compute Engine zone to return operations for.", + // "zone": { + // "description": "The name of the Google Compute Engine [zone](/compute/docs/zones#available) to return operations for, or \"-\" for all zones.", // "location": "path", // "required": true, // "type": "string" // } // }, - // "path": "{projectId}/zones/{zoneId}/operations", + // "path": "v1/projects/{projectId}/zones/{zone}/operations", // "response": { // "$ref": "ListOperationsResponse" // }, diff --git a/pkg/cloudprovider/providers/gce/gce.go b/pkg/cloudprovider/providers/gce/gce.go index 7e96f3ff3d6..725ea044e46 100644 --- a/pkg/cloudprovider/providers/gce/gce.go +++ b/pkg/cloudprovider/providers/gce/gce.go @@ -39,7 +39,7 @@ import ( "golang.org/x/oauth2" "golang.org/x/oauth2/google" compute "google.golang.org/api/compute/v1" - container "google.golang.org/api/container/v1beta1" + container "google.golang.org/api/container/v1" "google.golang.org/api/googleapi" "google.golang.org/cloud/compute/metadata" ) @@ -1550,7 +1550,7 @@ func (gce *GCECloud) convertDiskToAttachedDisk(disk *compute.Disk, readWrite str } func (gce *GCECloud) ListClusters() ([]string, error) { - list, err := gce.containerService.Projects.Clusters.List(gce.projectID).Do() + list, err := gce.containerService.Projects.Zones.Clusters.List(gce.projectID, gce.zone).Do() if err != nil { return nil, err }