diff --git a/google/container/container.yaml b/google/container/container.yaml index 65e5001b..67e44d46 100644 --- a/google/container/container.yaml +++ b/google/container/container.yaml @@ -1,7 +1,7 @@ type: google.api.Service config_version: 3 name: container.googleapis.com -title: Kubernetes Engine API +title: Google Container Engine API apis: - name: google.container.v1.ClusterManager @@ -11,69 +11,6 @@ documentation: The Google Kubernetes Engine API is used for building and managing container based applications, powered by the open source Kubernetes technology. -backend: - rules: - - selector: google.container.v1.ClusterManager.ListClusters - deadline: 20.0 - - selector: google.container.v1.ClusterManager.GetCluster - deadline: 20.0 - - selector: google.container.v1.ClusterManager.CreateCluster - deadline: 45.0 - - selector: google.container.v1.ClusterManager.UpdateCluster - deadline: 20.0 - - selector: google.container.v1.ClusterManager.UpdateNodePool - deadline: 20.0 - - selector: google.container.v1.ClusterManager.SetNodePoolAutoscaling - deadline: 20.0 - - selector: google.container.v1.ClusterManager.SetLoggingService - deadline: 20.0 - - selector: google.container.v1.ClusterManager.SetMonitoringService - deadline: 20.0 - - selector: google.container.v1.ClusterManager.SetAddonsConfig - deadline: 20.0 - - selector: google.container.v1.ClusterManager.SetLocations - deadline: 20.0 - - selector: google.container.v1.ClusterManager.UpdateMaster - deadline: 20.0 - - selector: google.container.v1.ClusterManager.SetMasterAuth - deadline: 20.0 - - selector: google.container.v1.ClusterManager.DeleteCluster - deadline: 20.0 - - selector: google.container.v1.ClusterManager.ListOperations - deadline: 20.0 - - selector: google.container.v1.ClusterManager.GetOperation - deadline: 20.0 - - selector: google.container.v1.ClusterManager.CancelOperation - deadline: 20.0 - - selector: google.container.v1.ClusterManager.GetServerConfig - deadline: 20.0 - - selector: google.container.v1.ClusterManager.ListNodePools - deadline: 20.0 - - selector: google.container.v1.ClusterManager.GetNodePool - deadline: 20.0 - - selector: google.container.v1.ClusterManager.CreateNodePool - deadline: 20.0 - - selector: google.container.v1.ClusterManager.DeleteNodePool - deadline: 20.0 - - selector: google.container.v1.ClusterManager.RollbackNodePoolUpgrade - deadline: 20.0 - - selector: google.container.v1.ClusterManager.SetNodePoolManagement - deadline: 20.0 - - selector: google.container.v1.ClusterManager.SetLabels - deadline: 20.0 - - selector: google.container.v1.ClusterManager.SetLegacyAbac - deadline: 20.0 - - selector: google.container.v1.ClusterManager.StartIPRotation - deadline: 20.0 - - selector: google.container.v1.ClusterManager.CompleteIPRotation - deadline: 20.0 - - selector: google.container.v1.ClusterManager.SetNodePoolSize - deadline: 20.0 - - selector: google.container.v1.ClusterManager.SetNetworkPolicy - deadline: 20.0 - - selector: google.container.v1.ClusterManager.SetMaintenancePolicy - deadline: 20.0 - authentication: rules: - selector: '*' diff --git a/google/container/v1/cluster_service.proto b/google/container/v1/cluster_service.proto index 6cec82da..4636fdcc 100644 --- a/google/container/v1/cluster_service.proto +++ b/google/container/v1/cluster_service.proto @@ -1,4 +1,4 @@ -// Copyright 2018 Google LLC +// Copyright 2017 Google Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -19,35 +19,25 @@ package google.container.v1; import "google/api/annotations.proto"; import "google/protobuf/empty.proto"; -option csharp_namespace = "Google.Cloud.Container.V1"; option go_package = "google.golang.org/genproto/googleapis/container/v1;container"; option java_multiple_files = true; option java_outer_classname = "ClusterServiceProto"; option java_package = "com.google.container.v1"; +option csharp_namespace = "Google.Cloud.Container.V1"; option php_namespace = "Google\\Cloud\\Container\\V1"; -// Google Kubernetes Engine Cluster Manager v1 +// Google Container Engine Cluster Manager v1 service ClusterManager { // Lists all clusters owned by a project in either the specified zone or all // zones. rpc ListClusters(ListClustersRequest) returns (ListClustersResponse) { - option (google.api.http) = { - get: "/v1/{parent=projects/*/locations/*}/clusters" - additional_bindings { - get: "/v1/projects/{project_id}/zones/{zone}/clusters" - } - }; + option (google.api.http) = { get: "/v1/projects/{project_id}/zones/{zone}/clusters" }; } // Gets the details of a specific cluster. rpc GetCluster(GetClusterRequest) returns (Cluster) { - option (google.api.http) = { - get: "/v1/{name=projects/*/locations/*/clusters/*}" - additional_bindings { - get: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}" - } - }; + option (google.api.http) = { get: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}" }; } // Creates a cluster, consisting of the specified number and type of Google @@ -64,124 +54,54 @@ service ClusterManager { // Finally, an entry is added to the project's global metadata indicating // which CIDR range is being used by the cluster. rpc CreateCluster(CreateClusterRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1/{parent=projects/*/locations/*}/clusters" - body: "*" - additional_bindings { - post: "/v1/projects/{project_id}/zones/{zone}/clusters" - body: "*" - } - }; + option (google.api.http) = { post: "/v1/projects/{project_id}/zones/{zone}/clusters" body: "*" }; } // Updates the settings of a specific cluster. rpc UpdateCluster(UpdateClusterRequest) returns (Operation) { - option (google.api.http) = { - put: "/v1/{name=projects/*/locations/*/clusters/*}" - body: "*" - additional_bindings { - put: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}" - body: "*" - } - }; + option (google.api.http) = { put: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}" body: "*" }; } - // Updates the version and/or image type for a specific node pool. + // Updates the version and/or image type of a specific node pool. rpc UpdateNodePool(UpdateNodePoolRequest) returns (Operation) { - option (google.api.http) = { - put: "/v1/{name=projects/*/locations/*/clusters/*/nodePools/*}" - body: "*" - additional_bindings { - post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools/{node_pool_id}/update" - body: "*" - } - }; + option (google.api.http) = { post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools/{node_pool_id}/update" body: "*" }; } - // Sets the autoscaling settings for a specific node pool. + // Sets the autoscaling settings of a specific node pool. rpc SetNodePoolAutoscaling(SetNodePoolAutoscalingRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1/{name=projects/*/locations/*/clusters/*/nodePools/*}:setAutoscaling" - body: "*" - additional_bindings { - post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools/{node_pool_id}/autoscaling" - body: "*" - } - }; + option (google.api.http) = { post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools/{node_pool_id}/autoscaling" body: "*" }; } - // Sets the logging service for a specific cluster. + // Sets the logging service of a specific cluster. rpc SetLoggingService(SetLoggingServiceRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1/{name=projects/*/locations/*/clusters/*}:setLogging" - body: "*" - additional_bindings { - post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/logging" - body: "*" - } - }; + option (google.api.http) = { post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/logging" body: "*" }; } - // Sets the monitoring service for a specific cluster. + // Sets the monitoring service of a specific cluster. rpc SetMonitoringService(SetMonitoringServiceRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1/{name=projects/*/locations/*/clusters/*}:setMonitoring" - body: "*" - additional_bindings { - post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/monitoring" - body: "*" - } - }; + option (google.api.http) = { post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/monitoring" body: "*" }; } - // Sets the addons for a specific cluster. + // Sets the addons of a specific cluster. rpc SetAddonsConfig(SetAddonsConfigRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1/{name=projects/*/locations/*/clusters/*}:setAddons" - body: "*" - additional_bindings { - post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/addons" - body: "*" - } - }; + option (google.api.http) = { post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/addons" body: "*" }; } - // Sets the locations for a specific cluster. + // Sets the locations of a specific cluster. rpc SetLocations(SetLocationsRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1/{name=projects/*/locations/*/clusters/*}:setLocations" - body: "*" - additional_bindings { - post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/locations" - body: "*" - } - }; + option (google.api.http) = { post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/locations" body: "*" }; } - // Updates the master for a specific cluster. + // Updates the master of a specific cluster. rpc UpdateMaster(UpdateMasterRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1/{name=projects/*/locations/*/clusters/*}:updateMaster" - body: "*" - additional_bindings { - post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/master" - body: "*" - } - }; + option (google.api.http) = { post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/master" body: "*" }; } // Used to set master auth materials. Currently supports :- - // Changing the admin password for a specific cluster. + // Changing the admin password of a specific cluster. // This can be either via password generation or explicitly set the password. rpc SetMasterAuth(SetMasterAuthRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1/{name=projects/*/locations/*/clusters/*}:setMasterAuth" - body: "*" - additional_bindings { - post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}:setMasterAuth" - body: "*" - } - }; + option (google.api.http) = { post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}:setMasterAuth" body: "*" }; } // Deletes the cluster, including the Kubernetes endpoint and all worker @@ -194,205 +114,93 @@ service ClusterManager { // (e.g. load balancer resources) will not be deleted if they weren't present // at the initial create time. rpc DeleteCluster(DeleteClusterRequest) returns (Operation) { - option (google.api.http) = { - delete: "/v1/{name=projects/*/locations/*/clusters/*}" - additional_bindings { - delete: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}" - } - }; + option (google.api.http) = { delete: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}" }; } // Lists all operations in a project in a specific zone or all zones. rpc ListOperations(ListOperationsRequest) returns (ListOperationsResponse) { - option (google.api.http) = { - get: "/v1/{parent=projects/*/locations/*}/operations" - additional_bindings { - get: "/v1/projects/{project_id}/zones/{zone}/operations" - } - }; + option (google.api.http) = { get: "/v1/projects/{project_id}/zones/{zone}/operations" }; } // Gets the specified operation. rpc GetOperation(GetOperationRequest) returns (Operation) { - option (google.api.http) = { - get: "/v1/{name=projects/*/locations/*/operations/*}" - additional_bindings { - get: "/v1/projects/{project_id}/zones/{zone}/operations/{operation_id}" - } - }; + option (google.api.http) = { get: "/v1/projects/{project_id}/zones/{zone}/operations/{operation_id}" }; } // Cancels the specified operation. rpc CancelOperation(CancelOperationRequest) returns (google.protobuf.Empty) { - option (google.api.http) = { - post: "/v1/{name=projects/*/locations/*/operations/*}:cancel" - body: "*" - additional_bindings { - post: "/v1/projects/{project_id}/zones/{zone}/operations/{operation_id}:cancel" - body: "*" - } - }; + option (google.api.http) = { post: "/v1/projects/{project_id}/zones/{zone}/operations/{operation_id}:cancel" body: "*" }; } - // Returns configuration info about the Kubernetes Engine service. + // Returns configuration info about the Container Engine service. rpc GetServerConfig(GetServerConfigRequest) returns (ServerConfig) { - option (google.api.http) = { - get: "/v1/{name=projects/*/locations/*}/serverConfig" - additional_bindings { - get: "/v1/projects/{project_id}/zones/{zone}/serverconfig" - } - }; + option (google.api.http) = { get: "/v1/projects/{project_id}/zones/{zone}/serverconfig" }; } // Lists the node pools for a cluster. rpc ListNodePools(ListNodePoolsRequest) returns (ListNodePoolsResponse) { - option (google.api.http) = { - get: "/v1/{parent=projects/*/locations/*/clusters/*}/nodePools" - additional_bindings { - get: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools" - } - }; + option (google.api.http) = { get: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools" }; } // Retrieves the node pool requested. rpc GetNodePool(GetNodePoolRequest) returns (NodePool) { - option (google.api.http) = { - get: "/v1/{name=projects/*/locations/*/clusters/*/nodePools/*}" - additional_bindings { - get: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools/{node_pool_id}" - } - }; + option (google.api.http) = { get: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools/{node_pool_id}" }; } // Creates a node pool for a cluster. rpc CreateNodePool(CreateNodePoolRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1/{parent=projects/*/locations/*/clusters/*}/nodePools" - body: "*" - additional_bindings { - post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools" - body: "*" - } - }; + option (google.api.http) = { post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools" body: "*" }; } // Deletes a node pool from a cluster. rpc DeleteNodePool(DeleteNodePoolRequest) returns (Operation) { - option (google.api.http) = { - delete: "/v1/{name=projects/*/locations/*/clusters/*/nodePools/*}" - additional_bindings { - delete: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools/{node_pool_id}" - } - }; + option (google.api.http) = { delete: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools/{node_pool_id}" }; } // Roll back the previously Aborted or Failed NodePool upgrade. // This will be an no-op if the last upgrade successfully completed. rpc RollbackNodePoolUpgrade(RollbackNodePoolUpgradeRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1/{name=projects/*/locations/*/clusters/*/nodePools/*}:rollback" - body: "*" - additional_bindings { - post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools/{node_pool_id}:rollback" - body: "*" - } - }; + option (google.api.http) = { post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools/{node_pool_id}:rollback" body: "*" }; } // Sets the NodeManagement options for a node pool. rpc SetNodePoolManagement(SetNodePoolManagementRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1/{name=projects/*/locations/*/clusters/*/nodePools/*}:setManagement" - body: "*" - additional_bindings { - post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools/{node_pool_id}/setManagement" - body: "*" - } - }; + option (google.api.http) = { post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools/{node_pool_id}/setManagement" body: "*" }; } // Sets labels on a cluster. rpc SetLabels(SetLabelsRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1/{name=projects/*/locations/*/clusters/*}:setResourceLabels" - body: "*" - additional_bindings { - post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/resourceLabels" - body: "*" - } - }; + option (google.api.http) = { post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/resourceLabels" body: "*" }; } // Enables or disables the ABAC authorization mechanism on a cluster. rpc SetLegacyAbac(SetLegacyAbacRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1/{name=projects/*/locations/*/clusters/*}:setLegacyAbac" - body: "*" - additional_bindings { - post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/legacyAbac" - body: "*" - } - }; + option (google.api.http) = { post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/legacyAbac" body: "*" }; } // Start master IP rotation. rpc StartIPRotation(StartIPRotationRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1/{name=projects/*/locations/*/clusters/*}:startIpRotation" - body: "*" - additional_bindings { - post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}:startIpRotation" - body: "*" - } - }; + option (google.api.http) = { post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}:startIpRotation" body: "*" }; } // Completes master IP rotation. rpc CompleteIPRotation(CompleteIPRotationRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1/{name=projects/*/locations/*/clusters/*}:completeIpRotation" - body: "*" - additional_bindings { - post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}:completeIpRotation" - body: "*" - } - }; + option (google.api.http) = { post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}:completeIpRotation" body: "*" }; } - // Sets the size for a specific node pool. + // Sets the size of a specific node pool. rpc SetNodePoolSize(SetNodePoolSizeRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1/{name=projects/*/locations/*/clusters/*/nodePools/*}:setSize" - body: "*" - additional_bindings { - post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools/{node_pool_id}/setSize" - body: "*" - } - }; + option (google.api.http) = { post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools/{node_pool_id}/setSize" body: "*" }; } // Enables/Disables Network Policy for a cluster. rpc SetNetworkPolicy(SetNetworkPolicyRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1/{name=projects/*/locations/*/clusters/*}:setNetworkPolicy" - body: "*" - additional_bindings { - post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}:setNetworkPolicy" - body: "*" - } - }; + option (google.api.http) = { post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}:setNetworkPolicy" body: "*" }; } // Sets the maintenance policy for a cluster. rpc SetMaintenancePolicy(SetMaintenancePolicyRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1/{name=projects/*/locations/*/clusters/*}:setMaintenancePolicy" - body: "*" - additional_bindings { - post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}:setMaintenancePolicy" - body: "*" - } - }; + option (google.api.http) = { post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}:setMaintenancePolicy" body: "*" }; } } @@ -437,18 +245,8 @@ message NodeConfig { // Keys must conform to the regexp [a-zA-Z0-9-_]+ and be less than 128 bytes // in length. These are reflected as part of a URL in the metadata server. // Additionally, to avoid ambiguity, keys must not conflict with any other - // metadata keys for the project or be one of the reserved keys: - // "cluster-location" - // "cluster-name" - // "cluster-uid" - // "configure-sh" - // "enable-os-login" - // "gci-update-strategy" - // "gci-ensure-gke-docker" - // "instance-template" - // "kube-env" - // "startup-script" - // "user-data" + // metadata keys for the project or be one of the four reserved keys: + // "instance-template", "kube-env", "startup-script", and "user-data" // // Values are free-form strings, and only have meaning as interpreted by // the image running in the instance. The only restriction placed on them is @@ -495,18 +293,12 @@ message NodeConfig { // support for GPUs. repeated AcceleratorConfig accelerators = 11; - // Type of the disk attached to each node (e.g. 'pd-standard' or 'pd-ssd') - // - // If unspecified, the default disk type is 'pd-standard' - string disk_type = 12; - // Minimum CPU platform to be used by this instance. The instance may be // scheduled on the specified or newer CPU platform. Applicable values are the // friendly names of CPU platforms, such as // minCpuPlatform: "Intel Haswell" 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) string min_cpu_platform = 13; } @@ -525,9 +317,8 @@ message MasterAuth { // must be non-empty. string password = 2; - // Configuration for client certificate authentication on the cluster. For - // clusters before v1.12, if no configuration is specified, a client - // certificate is issued. + // Configuration for client certificate authentication on the cluster. If no + // configuration is specified, a client certificate is issued. ClientCertificateConfig client_certificate_config = 3; // [Output only] Base64-encoded public certificate that is the root of @@ -603,6 +394,7 @@ message NetworkPolicyConfig { bool disabled = 1; } +// Master authorized networks is a Beta feature. // Configuration options for the master authorized networks feature. Enabled // master authorized networks will disallow all external traffic to access // Kubernetes master through HTTPS except traffic from the given CIDR blocks, @@ -670,13 +462,13 @@ message IPAllocationPolicy { string subnetwork_name = 3; // This field is deprecated, use cluster_ipv4_cidr_block. - string cluster_ipv4_cidr = 4 [deprecated = true]; + string cluster_ipv4_cidr = 4; // This field is deprecated, use node_ipv4_cidr_block. - string node_ipv4_cidr = 5 [deprecated = true]; + string node_ipv4_cidr = 5; // This field is deprecated, use services_ipv4_cidr_block. - string services_ipv4_cidr = 6 [deprecated = true]; + string services_ipv4_cidr = 6; // The name of the secondary range to be used for the cluster CIDR // block. The secondary range will be used for pod IP @@ -747,7 +539,7 @@ message IPAllocationPolicy { string services_ipv4_cidr_block = 11; } -// A Google Kubernetes Engine cluster. +// A Google Container Engine cluster. message Cluster { // The current status of the cluster. enum Status { @@ -772,10 +564,6 @@ message Cluster { // The ERROR state indicates the cluster may be unusable. Details // can be found in the `statusMessage` field. ERROR = 5; - - // The DEGRADED state indicates the cluster requires user action to restore - // full functionality. Details can be found in the `statusMessage` field. - DEGRADED = 6; } // The name of this cluster. The name must be unique within this project @@ -884,23 +672,20 @@ message Cluster { // Configuration for cluster IP allocation. IPAllocationPolicy ip_allocation_policy = 20; + // Master authorized networks is a Beta feature. // The configuration options for master authorized networks feature. MasterAuthorizedNetworksConfig master_authorized_networks_config = 22; // Configure the maintenance policy for this cluster. MaintenancePolicy maintenance_policy = 23; - // Configuration for cluster networking. - NetworkConfig network_config = 27; - // [Output only] Server-defined URL for the resource. string self_link = 100; // [Output only] The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field is deprecated, use location instead. - string zone = 101 [deprecated = true]; + string zone = 101; // [Output only] The IP address of this cluster's master endpoint. // The endpoint can be accessed from the internet at @@ -914,26 +699,15 @@ message Cluster { // found in validMasterVersions returned by getServerConfig. The version can // 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 string initial_cluster_version = 103; // [Output only] The current software version of the master endpoint. string current_master_version = 104; - // [Output only] Deprecated, use - // [NodePool.version](/kubernetes-engine/docs/reference/rest/v1/projects.zones.clusters.nodePool) - // instead. The current version of the node software components. If they are - // currently at multiple versions because they're in the process of being - // upgraded, this reflects the minimum version of all nodes. - string current_node_version = 105 [deprecated = true]; + // [Output only] The current version of the node software components. + // If they are currently at multiple versions because they're in the process + // of being upgraded, this reflects the minimum version of all nodes. + string current_node_version = 105; // [Output only] The time the cluster was created, in // [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format. @@ -959,7 +733,7 @@ message Cluster { string services_ipv4_cidr = 110; // Deprecated. Use node_pools.instance_group_urls. - repeated string instance_group_urls = 111 [deprecated = true]; + repeated string instance_group_urls = 111; // [Output only] The number of nodes currently in the cluster. int32 current_node_count = 112; @@ -967,12 +741,6 @@ message Cluster { // [Output only] The time the cluster will be automatically // deleted in [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format. string expire_time = 113; - - // [Output only] The name of the Google Compute Engine - // [zone](/compute/docs/regions-zones/regions-zones#available) or - // [region](/compute/docs/regions-zones/regions-zones#available) in which - // the cluster resides. - string location = 114; } // ClusterUpdate describes an update to the cluster. Exactly one update can @@ -980,16 +748,8 @@ message Cluster { // provided. message ClusterUpdate { // The Kubernetes version to change the nodes to (typically an - // 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 + // upgrade). Use `-` to upgrade to the latest version supported by + // the server. string desired_node_version = 4; // The monitoring service the cluster should use to write metrics. @@ -1027,19 +787,13 @@ message ClusterUpdate { // This list must always include the cluster's primary zone. repeated string desired_locations = 10; + // Master authorized networks is a Beta feature. // The desired configuration options for master authorized networks feature. MasterAuthorizedNetworksConfig desired_master_authorized_networks_config = 12; - // 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 + // 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. string desired_master_version = 100; } @@ -1124,8 +878,7 @@ message Operation { // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the operation // is taking place. - // This field is deprecated, use location instead. - string zone = 2 [deprecated = true]; + string zone = 2; // The operation type. Type operation_type = 3; @@ -1145,12 +898,6 @@ message Operation { // Server-defined URL for the target of the operation. string target_link = 7; - // [Output only] The name of the Google Compute Engine - // [zone](/compute/docs/regions-zones/regions-zones#available) or - // [region](/compute/docs/regions-zones/regions-zones#available) in which - // the cluster resides. - string location = 9; - // [Output only] The time the operation started, in // [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format. string start_time = 10; @@ -1162,162 +909,113 @@ message Operation { // CreateClusterRequest creates a cluster. message CreateClusterRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the parent field. - string project_id = 1 [deprecated = true]; + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the parent field. - string zone = 2 [deprecated = true]; + string zone = 2; // A [cluster // resource](/container-engine/reference/rest/v1/projects.zones.clusters) Cluster cluster = 3; - - // The parent (project and location) where the cluster will be created. - // Specified in the format 'projects/*/locations/*'. - string parent = 5; } // GetClusterRequest gets the settings of a cluster. message GetClusterRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + string zone = 2; - // Deprecated. The name of the cluster to retrieve. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; - - // The name (project, location, cluster) of the cluster to retrieve. - // Specified in the format 'projects/*/locations/*/clusters/*'. - string name = 5; + // The name of the cluster to retrieve. + string cluster_id = 3; } // UpdateClusterRequest updates the settings of a cluster. message UpdateClusterRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + string zone = 2; - // Deprecated. The name of the cluster to upgrade. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster to upgrade. + string cluster_id = 3; // A description of the update. ClusterUpdate update = 4; - - // The name (project, location, cluster) of the cluster to update. - // Specified in the format 'projects/*/locations/*/clusters/*'. - string name = 5; } // UpdateNodePoolRequests update a node pool's image and/or version. message UpdateNodePoolRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + string zone = 2; - // Deprecated. The name of the cluster to upgrade. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster to upgrade. + string cluster_id = 3; - // Deprecated. The name of the node pool to upgrade. - // This field has been deprecated and replaced by the name field. - string node_pool_id = 4 [deprecated = true]; + // The name of the node pool to upgrade. + string node_pool_id = 4; // The Kubernetes version to change the nodes to (typically an - // 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 + // upgrade). Use `-` to upgrade to the latest version supported by + // the server. string node_version = 5; // The desired image type for the node pool. string image_type = 6; - - // The name (project, location, cluster, node pool) of the node pool to - // update. Specified in the format - // 'projects/*/locations/*/clusters/*/nodePools/*'. - string name = 8; } // SetNodePoolAutoscalingRequest sets the autoscaler settings of a node pool. message SetNodePoolAutoscalingRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + string zone = 2; - // Deprecated. The name of the cluster to upgrade. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster to upgrade. + string cluster_id = 3; - // Deprecated. The name of the node pool to upgrade. - // This field has been deprecated and replaced by the name field. - string node_pool_id = 4 [deprecated = true]; + // The name of the node pool to upgrade. + string node_pool_id = 4; // Autoscaling configuration for the node pool. NodePoolAutoscaling autoscaling = 5; - - // The name (project, location, cluster, node pool) of the node pool to set - // autoscaler settings. Specified in the format - // 'projects/*/locations/*/clusters/*/nodePools/*'. - string name = 6; } // SetLoggingServiceRequest sets the logging service of a cluster. message SetLoggingServiceRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. string zone = 2; - // Deprecated. The name of the cluster to upgrade. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster to upgrade. + string cluster_id = 3; // The logging service the cluster should use to write metrics. // Currently available options: @@ -1325,28 +1023,21 @@ message SetLoggingServiceRequest { // * "logging.googleapis.com" - the Google Cloud Logging service // * "none" - no metrics will be exported from the cluster string logging_service = 4; - - // The name (project, location, cluster) of the cluster to set logging. - // Specified in the format 'projects/*/locations/*/clusters/*'. - string name = 5; } // SetMonitoringServiceRequest sets the monitoring service of a cluster. message SetMonitoringServiceRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + string zone = 2; - // Deprecated. The name of the cluster to upgrade. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster to upgrade. + string cluster_id = 3; // The monitoring service the cluster should use to write metrics. // Currently available options: @@ -1354,54 +1045,40 @@ message SetMonitoringServiceRequest { // * "monitoring.googleapis.com" - the Google Cloud Monitoring service // * "none" - no metrics will be exported from the cluster string monitoring_service = 4; - - // The name (project, location, cluster) of the cluster to set monitoring. - // Specified in the format 'projects/*/locations/*/clusters/*'. - string name = 6; } // SetAddonsConfigRequest sets the addons associated with the cluster. message SetAddonsConfigRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + string zone = 2; - // Deprecated. The name of the cluster to upgrade. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster to upgrade. + string cluster_id = 3; // The desired configurations for the various addons available to run in the // cluster. AddonsConfig addons_config = 4; - - // The name (project, location, cluster) of the cluster to set addons. - // Specified in the format 'projects/*/locations/*/clusters/*'. - string name = 6; } // SetLocationsRequest sets the locations of the cluster. message SetLocationsRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + string zone = 2; - // Deprecated. The name of the cluster to upgrade. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster to upgrade. + string cluster_id = 3; // The desired list of Google Compute Engine // [locations](/compute/docs/zones#available) in which the cluster's nodes @@ -1411,44 +1088,26 @@ message SetLocationsRequest { // // This list must always include the cluster's primary zone. repeated string locations = 4; - - // The name (project, location, cluster) of the cluster to set locations. - // Specified in the format 'projects/*/locations/*/clusters/*'. - string name = 6; } // UpdateMasterRequest updates the master of the cluster. message UpdateMasterRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + string zone = 2; - // Deprecated. The name of the cluster to upgrade. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster to upgrade. + string cluster_id = 3; - // 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 + // 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. string master_version = 4; - - // The name (project, location, cluster) of the cluster to update. - // Specified in the format 'projects/*/locations/*/clusters/*'. - string name = 7; } // SetMasterAuthRequest updates the admin password of a cluster. @@ -1471,71 +1130,50 @@ message SetMasterAuthRequest { SET_USERNAME = 3; } - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + string zone = 2; - // Deprecated. The name of the cluster to upgrade. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster to upgrade. + string cluster_id = 3; // The exact form of action to be taken on the master auth. Action action = 4; // A description of the update. MasterAuth update = 5; - - // The name (project, location, cluster) of the cluster to set auth. - // Specified in the format 'projects/*/locations/*/clusters/*'. - string name = 7; } // DeleteClusterRequest deletes a cluster. message DeleteClusterRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + string zone = 2; - // Deprecated. The name of the cluster to delete. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; - - // The name (project, location, cluster) of the cluster to delete. - // Specified in the format 'projects/*/locations/*/clusters/*'. - string name = 4; + // The name of the cluster to delete. + string cluster_id = 3; } // ListClustersRequest lists clusters. message ListClustersRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the parent field. - string project_id = 1 [deprecated = true]; + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides, or "-" for all zones. - // This field has been deprecated and replaced by the parent field. - string zone = 2 [deprecated = true]; - - // The parent (project and location) where the clusters will be listed. - // Specified in the format 'projects/*/locations/*'. - // Location "-" matches all zones and all regions. - string parent = 4; + string zone = 2; } // ListClustersResponse is the result of ListClustersRequest. @@ -1551,63 +1189,42 @@ message ListClustersResponse { // GetOperationRequest gets a single operation. message GetOperationRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + string zone = 2; - // Deprecated. The server-assigned `name` of the operation. - // This field has been deprecated and replaced by the name field. - string operation_id = 3 [deprecated = true]; - - // The name (project, location, operation id) of the operation to get. - // Specified in the format 'projects/*/locations/*/operations/*'. - string name = 5; + // The server-assigned `name` of the operation. + string operation_id = 3; } // ListOperationsRequest lists operations. message ListOperationsRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the parent field. - string project_id = 1 [deprecated = true]; + string project_id = 1; - // 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. - string zone = 2 [deprecated = true]; - - // The parent (project and location) where the operations will be listed. - // Specified in the format 'projects/*/locations/*'. - // Location "-" matches all zones and all regions. - string parent = 4; + // The name of the Google Compute Engine [zone](/compute/docs/zones#available) + // to return operations for, or `-` for all zones. + string zone = 2; } // CancelOperationRequest cancels a single operation. message CancelOperationRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the operation resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + string zone = 2; - // Deprecated. The server-assigned `name` of the operation. - // This field has been deprecated and replaced by the name field. - string operation_id = 3 [deprecated = true]; - - // The name (project, location, operation id) of the operation to cancel. - // Specified in the format 'projects/*/locations/*/operations/*'. - string name = 4; + // The server-assigned `name` of the operation. + string operation_id = 3; } // ListOperationsResponse is the result of ListOperationsRequest. @@ -1620,24 +1237,18 @@ message ListOperationsResponse { repeated string missing_zones = 2; } -// Gets the current Kubernetes Engine service configuration. +// Gets the current Container Engine service configuration. message GetServerConfigRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + string project_id = 1; - // Deprecated. The name of the Google Compute Engine - // [zone](/compute/docs/zones#available) to return operations for. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; - - // The name (project and location) of the server config to get - // Specified in the format 'projects/*/locations/*'. - string name = 4; + // The name of the Google Compute Engine [zone](/compute/docs/zones#available) + // to return operations for. + string zone = 2; } -// Kubernetes Engine service configuration. +// Container Engine service configuration. message ServerConfig { // Version of Kubernetes the service deploys by default. string default_cluster_version = 1; @@ -1657,104 +1268,71 @@ message ServerConfig { // CreateNodePoolRequest creates a node pool for a cluster. message CreateNodePoolRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://developers.google.com/console/help/new/#projectnumber). - // This field has been deprecated and replaced by the parent field. - string project_id = 1 [deprecated = true]; + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the parent field. - string zone = 2 [deprecated = true]; + string zone = 2; - // Deprecated. The name of the cluster. - // This field has been deprecated and replaced by the parent field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster. + string cluster_id = 3; // The node pool to create. NodePool node_pool = 4; - - // The parent (project, location, cluster id) where the node pool will be - // created. Specified in the format - // 'projects/*/locations/*/clusters/*'. - string parent = 6; } // DeleteNodePoolRequest deletes a node pool for a cluster. message DeleteNodePoolRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://developers.google.com/console/help/new/#projectnumber). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + string zone = 2; - // Deprecated. The name of the cluster. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster. + string cluster_id = 3; - // Deprecated. The name of the node pool to delete. - // This field has been deprecated and replaced by the name field. - string node_pool_id = 4 [deprecated = true]; - - // The name (project, location, cluster, node pool id) of the node pool to - // delete. Specified in the format - // 'projects/*/locations/*/clusters/*/nodePools/*'. - string name = 6; + // The name of the node pool to delete. + string node_pool_id = 4; } // ListNodePoolsRequest lists the node pool(s) for a cluster. message ListNodePoolsRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://developers.google.com/console/help/new/#projectnumber). - // This field has been deprecated and replaced by the parent field. - string project_id = 1 [deprecated = true]; + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the parent field. - string zone = 2 [deprecated = true]; + string zone = 2; - // Deprecated. The name of the cluster. - // This field has been deprecated and replaced by the parent field. - string cluster_id = 3 [deprecated = true]; - - // The parent (project, location, cluster id) where the node pools will be - // listed. Specified in the format 'projects/*/locations/*/clusters/*'. - string parent = 5; + // The name of the cluster. + string cluster_id = 3; } // GetNodePoolRequest retrieves a node pool for a cluster. message GetNodePoolRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://developers.google.com/console/help/new/#projectnumber). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + string zone = 2; - // Deprecated. The name of the cluster. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster. + string cluster_id = 3; - // Deprecated. The name of the node pool. - // This field has been deprecated and replaced by the name field. - string node_pool_id = 4 [deprecated = true]; - - // The name (project, location, cluster, node pool id) of the node pool to - // get. Specified in the format - // 'projects/*/locations/*/clusters/*/nodePools/*'. - string name = 6; + // The name of the node pool. + string node_pool_id = 4; } // NodePool contains the name and configuration for a cluster's node pool. @@ -1895,92 +1473,65 @@ message DailyMaintenanceWindow { // SetNodePoolManagementRequest sets the node management properties of a node // pool. message SetNodePoolManagementRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + string zone = 2; - // Deprecated. The name of the cluster to update. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster to update. + string cluster_id = 3; - // Deprecated. The name of the node pool to update. - // This field has been deprecated and replaced by the name field. - string node_pool_id = 4 [deprecated = true]; + // The name of the node pool to update. + string node_pool_id = 4; // NodeManagement configuration for the node pool. NodeManagement management = 5; - - // The name (project, location, cluster, node pool id) of the node pool to set - // management properties. Specified in the format - // 'projects/*/locations/*/clusters/*/nodePools/*'. - string name = 7; } // SetNodePoolSizeRequest sets the size a node // pool. message SetNodePoolSizeRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + string zone = 2; - // Deprecated. The name of the cluster to update. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster to update. + string cluster_id = 3; - // Deprecated. The name of the node pool to update. - // This field has been deprecated and replaced by the name field. - string node_pool_id = 4 [deprecated = true]; + // The name of the node pool to update. + string node_pool_id = 4; // The desired node count for the pool. int32 node_count = 5; - - // The name (project, location, cluster, node pool id) of the node pool to set - // size. - // Specified in the format 'projects/*/locations/*/clusters/*/nodePools/*'. - string name = 7; } // RollbackNodePoolUpgradeRequest rollbacks the previously Aborted or Failed // NodePool upgrade. This will be an no-op if the last upgrade successfully // completed. message RollbackNodePoolUpgradeRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + string zone = 2; - // Deprecated. The name of the cluster to rollback. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster to rollback. + string cluster_id = 3; - // Deprecated. The name of the node pool to rollback. - // This field has been deprecated and replaced by the name field. - string node_pool_id = 4 [deprecated = true]; - - // The name (project, location, cluster, node pool id) of the node poll to - // rollback upgrade. - // Specified in the format 'projects/*/locations/*/clusters/*/nodePools/*'. - string name = 6; + // The name of the node pool to rollback. + string node_pool_id = 4; } // ListNodePoolsResponse is the result of ListNodePoolsRequest. @@ -2008,109 +1559,78 @@ message NodePoolAutoscaling { // Engine cluster, which will in turn set them for Google Compute Engine // resources used by that cluster message SetLabelsRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://developers.google.com/console/help/new/#projectnumber). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + string zone = 2; - // Deprecated. The name of the cluster. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster. + string cluster_id = 3; // The labels to set for that cluster. map resource_labels = 4; // The fingerprint of the previous set of labels for this resource, // used to detect conflicts. The fingerprint is initially generated by - // Kubernetes Engine and changes after every request to modify or update + // Container Engine and changes after every request to modify or update // labels. You must always provide an up-to-date fingerprint hash when // updating or changing labels. Make a get() request to the // resource to get the latest fingerprint. string label_fingerprint = 5; - - // The name (project, location, cluster id) of the cluster to set labels. - // Specified in the format 'projects/*/locations/*/clusters/*'. - string name = 7; } // SetLegacyAbacRequest enables or disables the ABAC authorization mechanism for // a cluster. message SetLegacyAbacRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + string zone = 2; - // Deprecated. The name of the cluster to update. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster to update. + string cluster_id = 3; // Whether ABAC authorization will be enabled in the cluster. bool enabled = 4; - - // The name (project, location, cluster id) of the cluster to set legacy abac. - // Specified in the format 'projects/*/locations/*/clusters/*'. - string name = 6; } // StartIPRotationRequest creates a new IP for the cluster and then performs // a node upgrade on each node pool to point to the new IP. message StartIPRotationRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://developers.google.com/console/help/new/#projectnumber). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + string zone = 2; - // Deprecated. The name of the cluster. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; - - // The name (project, location, cluster id) of the cluster to start IP - // rotation. Specified in the format 'projects/*/locations/*/clusters/*'. - string name = 6; - - // Whether to rotate credentials during IP rotation. - bool rotate_credentials = 7; + // The name of the cluster. + string cluster_id = 3; } // CompleteIPRotationRequest moves the cluster master back into single-IP mode. message CompleteIPRotationRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://developers.google.com/console/help/new/#projectnumber). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + string zone = 2; - // Deprecated. The name of the cluster. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; - - // The name (project, location, cluster id) of the cluster to complete IP - // rotation. Specified in the format 'projects/*/locations/*/clusters/*'. - string name = 7; + // The name of the cluster. + string cluster_id = 3; } // AcceleratorConfig represents a Hardware Accelerator request. @@ -2125,27 +1645,20 @@ message AcceleratorConfig { // SetNetworkPolicyRequest enables/disables network policy for a cluster. message SetNetworkPolicyRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://developers.google.com/console/help/new/#projectnumber). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + string zone = 2; - // Deprecated. The name of the cluster. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster. + string cluster_id = 3; // Configuration options for the NetworkPolicy feature. NetworkPolicy network_policy = 4; - - // The name (project, location, cluster id) of the cluster to set networking - // policy. Specified in the format 'projects/*/locations/*/clusters/*'. - string name = 6; } // SetMaintenancePolicyRequest sets the maintenance policy for a cluster. @@ -2165,23 +1678,4 @@ message SetMaintenancePolicyRequest { // The maintenance policy to be set for the cluster. An empty field // clears the existing maintenance policy. MaintenancePolicy maintenance_policy = 4; - - // The name (project, location, cluster id) of the cluster to set maintenance - // policy. - // Specified in the format 'projects/*/locations/*/clusters/*'. - string name = 5; -} - -// NetworkConfig reports the relative names of network & subnetwork. -message NetworkConfig { - // Output only. The relative name of the Google Compute Engine - // [network][google.container.v1.NetworkConfig.network](/compute/docs/networks-and-firewalls#networks) to which - // the cluster is connected. - // Example: projects/my-project/global/networks/my-network - string network = 1; - - // Output only. The relative name of the Google Compute Engine - // [subnetwork](/compute/docs/vpc) to which the cluster is connected. - // Example: projects/my-project/regions/us-central1/subnetworks/my-subnet - string subnetwork = 2; } diff --git a/google/container/v1/container_gapic.yaml b/google/container/v1/container_gapic.yaml index 32102f9a..f19b58d0 100644 --- a/google/container/v1/container_gapic.yaml +++ b/google/container/v1/container_gapic.yaml @@ -38,15 +38,7 @@ interfaces: # methods. If empty, no name methods are generated. # The entity_name is the name to be used as a basis for generated methods and # classes. - collections: - - name_pattern: projects/{project}/locations/{location} - entity_name: location - - name_pattern: projects/{project}/locations/{location}/clusters/{cluster} - entity_name: cluster - - name_pattern: projects/{project}/locations/{location}/clusters/{cluster}/nodePools/{node_pool} - entity_name: node_pool - - name_pattern: projects/{project}/locations/{location}/operations/{operation} - entity_name: operation + collections: [] # Definition for smoke test smoke_test: method: ListClusters @@ -57,8 +49,8 @@ interfaces: retry_codes_def: - name: idempotent retry_codes: - - DEADLINE_EXCEEDED - UNAVAILABLE + - DEADLINE_EXCEEDED - name: non_idempotent retry_codes: [] # Definition for retry/backoff parameters. @@ -73,358 +65,499 @@ interfaces: total_timeout_millis: 600000 # A list of method configurations. # Common properties: - # # name - The simple name of the method. - # # flattening - Specifies the configuration for parameter flattening. - # Describes the parameter groups for which a generator should produce method - # overloads which allow a client to directly pass request message fields as - # method parameters. This information may or may not be used, depending on - # the target language. - # Consists of groups, which each represent a list of parameters to be - # flattened. Each parameter listed must be a field of the request message. - # + # Describes the parameter groups for which a generator should produce + # method overloads which allow a client to directly pass request message + # fields as method parameters. This information may or may not be used, + # depending on the target language. + # Consists of groups, which each represent a list of parameters to be + # flattened. Each parameter listed must be a field of the request + # message. # required_fields - Fields that are always required for a request to be - # valid. - # - # resource_name_treatment - An enum that specifies how to treat the resource - # name formats defined in the field_name_patterns and - # response_field_name_patterns fields. - # UNSET: default value - # NONE: the collection configs will not be used by the generated code. - # VALIDATE: string fields will be validated by the client against the - # specified resource name formats. - # STATIC_TYPES: the client will use generated types for resource names. - # + # valid. + # request_object_method - Turns on or off the generation of a method whose + # sole parameter is a request object. Not all languages will generate + # this method. + # resource_name_treatment - An enum that specifies how to treat the + # resource name formats defined in the field_name_patterns + # and response_field_name_patterns fields. + # UNSET: default value + # NONE: the collection configs will not be used by the generated code. + # VALIDATE: string fields will be validated by the client against the + # specified resource name formats. + # STATIC_TYPES: the client will use generated types for resource names. # page_streaming - Specifies the configuration for paging. - # Describes information for generating a method which transforms a paging - # list RPC into a stream of resources. - # Consists of a request and a response. - # The request specifies request information of the list method. It defines - # which fields match the paging pattern in the request. The request consists - # of a page_size_field and a token_field. The page_size_field is the name of - # the optional field specifying the maximum number of elements to be - # returned in the response. The token_field is the name of the field in the - # request containing the page token. - # The response specifies response information of the list method. It defines - # which fields match the paging pattern in the response. The response - # consists of a token_field and a resources_field. The token_field is the - # name of the field in the response containing the next page token. The - # resources_field is the name of the field in the response containing the - # list of resources belonging to the page. - # + # Describes information for generating a method which transforms a + # paging list RPC into a stream of resources. + # Consists of a request and a response. + # The request specifies request information of the list method. It + # defines which fields match the paging pattern in the request. The + # request consists of a page_size_field and a token_field. The + # page_size_field is the name of the optional field specifying the + # maximum number of elements to be returned in the response. The + # token_field is the name of the field in the request containing the + # page token. + # The response specifies response information of the list method. It + # defines which fields match the paging pattern in the response. The + # response consists of a token_field and a resources_field. The + # token_field is the name of the field in the response containing the + # next page token. The resources_field is the name of the field in the + # response containing the list of resources belonging to the page. # retry_codes_name - Specifies the configuration for retryable codes. The - # name must be defined in interfaces.retry_codes_def. - # + # name must be defined in interfaces.retry_codes_def. # retry_params_name - Specifies the configuration for retry/backoff - # parameters. The name must be defined in interfaces.retry_params_def. - # + # parameters. The name must be defined in interfaces.retry_params_def. # field_name_patterns - Maps the field name of the request type to - # entity_name of interfaces.collections. - # Specifies the string pattern that the field must follow. - # + # entity_name of interfaces.collections. + # Specifies the string pattern that the field must follow. # timeout_millis - Specifies the default timeout for a non-retrying call. If - # the call is retrying, refer to retry_params_name instead. + # the call is retrying, refer to retry_params_name instead. methods: - name: ListClusters flattening: groups: - parameters: - - parent + - project_id + - zone required_fields: - - parent + - project_id + - zone + request_object_method: true retry_codes_name: idempotent retry_params_name: default - field_name_patterns: - parent: location - timeout_millis: 20000 + timeout_millis: 10000 - name: GetCluster flattening: groups: - parameters: - - name + - project_id + - zone + - cluster_id required_fields: - - name + - project_id + - zone + - cluster_id + request_object_method: true retry_codes_name: idempotent retry_params_name: default - field_name_patterns: - name: cluster - timeout_millis: 20000 + timeout_millis: 10000 - name: CreateCluster flattening: groups: - parameters: + - project_id + - zone - cluster - - parent required_fields: + - project_id + - zone - cluster - - parent + request_object_method: true retry_codes_name: non_idempotent retry_params_name: default - field_name_patterns: - parent: location - timeout_millis: 45000 + timeout_millis: 60000 - name: UpdateCluster + flattening: + groups: + - parameters: + - project_id + - zone + - cluster_id + - update required_fields: + - project_id + - zone + - cluster_id - update - - name + request_object_method: true retry_codes_name: non_idempotent retry_params_name: default - field_name_patterns: - name: cluster - timeout_millis: 20000 + timeout_millis: 60000 - name: UpdateNodePool required_fields: + - project_id + - zone + - cluster_id + - node_pool_id - node_version - image_type - - name + request_object_method: true retry_codes_name: non_idempotent retry_params_name: default - field_name_patterns: - name: node_pool - timeout_millis: 20000 + timeout_millis: 60000 - name: SetNodePoolAutoscaling required_fields: + - project_id + - zone + - cluster_id + - node_pool_id - autoscaling - - name + request_object_method: true retry_codes_name: non_idempotent retry_params_name: default - field_name_patterns: - name: node_pool - timeout_millis: 20000 + timeout_millis: 60000 - name: SetLoggingService + flattening: + groups: + - parameters: + - project_id + - zone + - cluster_id + - logging_service required_fields: + - project_id + - zone + - cluster_id - logging_service - - name + request_object_method: true retry_codes_name: non_idempotent retry_params_name: default - field_name_patterns: - name: cluster - timeout_millis: 20000 + timeout_millis: 60000 - name: SetMonitoringService + flattening: + groups: + - parameters: + - project_id + - zone + - cluster_id + - monitoring_service required_fields: + - project_id + - zone + - cluster_id - monitoring_service - - name + request_object_method: true retry_codes_name: non_idempotent retry_params_name: default - field_name_patterns: - name: cluster - timeout_millis: 20000 + timeout_millis: 60000 - name: SetAddonsConfig + flattening: + groups: + - parameters: + - project_id + - zone + - cluster_id + - addons_config required_fields: + - project_id + - zone + - cluster_id - addons_config - - name + request_object_method: true retry_codes_name: non_idempotent retry_params_name: default - field_name_patterns: - name: cluster - timeout_millis: 20000 + timeout_millis: 60000 - name: SetLocations + flattening: + groups: + - parameters: + - project_id + - zone + - cluster_id + - locations required_fields: + - project_id + - zone + - cluster_id - locations - - name + request_object_method: true retry_codes_name: non_idempotent retry_params_name: default - field_name_patterns: - name: cluster - timeout_millis: 20000 + timeout_millis: 60000 - name: UpdateMaster + flattening: + groups: + - parameters: + - project_id + - zone + - cluster_id + - master_version required_fields: + - project_id + - zone + - cluster_id - master_version - - name + request_object_method: true retry_codes_name: non_idempotent retry_params_name: default - field_name_patterns: - name: cluster - timeout_millis: 20000 + timeout_millis: 60000 - name: SetMasterAuth required_fields: + - project_id + - zone + - cluster_id - action - update - - name + request_object_method: true retry_codes_name: non_idempotent retry_params_name: default - field_name_patterns: - name: cluster - timeout_millis: 20000 + timeout_millis: 60000 - name: DeleteCluster flattening: groups: - parameters: - - name + - project_id + - zone + - cluster_id required_fields: - - name + - project_id + - zone + - cluster_id + request_object_method: true retry_codes_name: idempotent retry_params_name: default - field_name_patterns: - name: cluster - timeout_millis: 20000 + timeout_millis: 30000 - name: ListOperations flattening: groups: - parameters: - - parent + - project_id + - zone required_fields: - - parent + - project_id + - zone + request_object_method: true retry_codes_name: idempotent retry_params_name: default - field_name_patterns: - parent: location - timeout_millis: 20000 + timeout_millis: 10000 - name: GetOperation flattening: groups: - parameters: - - name + - project_id + - zone + - operation_id required_fields: - - name + - project_id + - zone + - operation_id + request_object_method: true retry_codes_name: idempotent retry_params_name: default - field_name_patterns: - name: operation - timeout_millis: 20000 + timeout_millis: 10000 - name: CancelOperation flattening: groups: - parameters: - - name + - project_id + - zone + - operation_id required_fields: - - name + - project_id + - zone + - operation_id + request_object_method: true retry_codes_name: non_idempotent retry_params_name: default - field_name_patterns: - name: operation - timeout_millis: 20000 + timeout_millis: 30000 - name: GetServerConfig flattening: groups: - parameters: - - name + - project_id + - zone required_fields: - - name + - project_id + - zone + request_object_method: true retry_codes_name: idempotent retry_params_name: default - field_name_patterns: - name: location - timeout_millis: 20000 + timeout_millis: 10000 - name: ListNodePools flattening: groups: - parameters: - - parent + - project_id + - zone + - cluster_id required_fields: - - parent + - project_id + - zone + - cluster_id + request_object_method: true retry_codes_name: idempotent retry_params_name: default - field_name_patterns: - parent: cluster - timeout_millis: 20000 + timeout_millis: 10000 - name: GetNodePool + flattening: + groups: + - parameters: + - project_id + - zone + - cluster_id + - node_pool_id required_fields: - - name + - project_id + - zone + - cluster_id + - node_pool_id + request_object_method: true retry_codes_name: idempotent retry_params_name: default - field_name_patterns: - name: node_pool - timeout_millis: 20000 + timeout_millis: 10000 - name: CreateNodePool + flattening: + groups: + - parameters: + - project_id + - zone + - cluster_id + - node_pool required_fields: + - project_id + - zone + - cluster_id - node_pool - - parent + request_object_method: true retry_codes_name: non_idempotent retry_params_name: default - field_name_patterns: - parent: cluster - timeout_millis: 20000 + timeout_millis: 60000 - name: DeleteNodePool + flattening: + groups: + - parameters: + - project_id + - zone + - cluster_id + - node_pool_id required_fields: - - name + - project_id + - zone + - cluster_id + - node_pool_id + request_object_method: true retry_codes_name: idempotent retry_params_name: default - field_name_patterns: - name: node_pool - timeout_millis: 20000 + timeout_millis: 30000 - name: RollbackNodePoolUpgrade + flattening: + groups: + - parameters: + - project_id + - zone + - cluster_id + - node_pool_id required_fields: - - name + - project_id + - zone + - cluster_id + - node_pool_id + request_object_method: true retry_codes_name: non_idempotent retry_params_name: default - field_name_patterns: - name: node_pool - timeout_millis: 20000 + timeout_millis: 60000 - name: SetNodePoolManagement required_fields: + - project_id + - zone + - cluster_id + - node_pool_id - management - - name + request_object_method: true retry_codes_name: non_idempotent retry_params_name: default - field_name_patterns: - name: node_pool - timeout_millis: 20000 + timeout_millis: 60000 - name: SetLabels required_fields: + - project_id + - zone + - cluster_id - resource_labels - label_fingerprint - - name + request_object_method: true retry_codes_name: non_idempotent retry_params_name: default - field_name_patterns: - name: cluster - timeout_millis: 20000 + timeout_millis: 60000 - name: SetLegacyAbac + flattening: + groups: + - parameters: + - project_id + - zone + - cluster_id + - enabled required_fields: + - project_id + - zone + - cluster_id - enabled - - name + request_object_method: true retry_codes_name: non_idempotent retry_params_name: default - field_name_patterns: - name: cluster - timeout_millis: 20000 + timeout_millis: 60000 - name: StartIPRotation + flattening: + groups: + - parameters: + - project_id + - zone + - cluster_id required_fields: - - name - - rotate_credentials + - project_id + - zone + - cluster_id + request_object_method: true retry_codes_name: non_idempotent retry_params_name: default - field_name_patterns: - name: cluster - timeout_millis: 20000 + timeout_millis: 60000 - name: CompleteIPRotation flattening: groups: - parameters: - - name + - project_id + - zone + - cluster_id required_fields: - - name + - project_id + - zone + - cluster_id + request_object_method: true retry_codes_name: non_idempotent retry_params_name: default - field_name_patterns: - name: cluster - timeout_millis: 20000 + timeout_millis: 60000 - name: SetNodePoolSize required_fields: + - project_id + - zone + - cluster_id + - node_pool_id - node_count - - name + request_object_method: true retry_codes_name: non_idempotent retry_params_name: default - field_name_patterns: - name: node_pool - timeout_millis: 20000 + timeout_millis: 60000 - name: SetNetworkPolicy + flattening: + groups: + - parameters: + - project_id + - zone + - cluster_id + - network_policy required_fields: + - project_id + - zone + - cluster_id - network_policy - - name + request_object_method: true retry_codes_name: non_idempotent retry_params_name: default - field_name_patterns: - name: cluster - timeout_millis: 20000 + timeout_millis: 60000 - name: SetMaintenancePolicy + flattening: + groups: + - parameters: + - project_id + - zone + - cluster_id + - maintenance_policy required_fields: + - project_id + - zone + - cluster_id - maintenance_policy - - name + request_object_method: true retry_codes_name: non_idempotent retry_params_name: default - field_name_patterns: - name: cluster - timeout_millis: 20000 + timeout_millis: 60000 diff --git a/google/container/v1alpha1/cluster_service.proto b/google/container/v1alpha1/cluster_service.proto index e79d247d..46c91445 100644 --- a/google/container/v1alpha1/cluster_service.proto +++ b/google/container/v1alpha1/cluster_service.proto @@ -1,4 +1,4 @@ -// Copyright 2018 Google LLC +// Copyright 2017 Google Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -17,39 +17,27 @@ syntax = "proto3"; package google.container.v1alpha1; import "google/api/annotations.proto"; -import "google/iam/v1/iam_policy.proto"; -import "google/iam/v1/policy.proto"; import "google/protobuf/empty.proto"; -option csharp_namespace = "Google.Cloud.Container.V1Alpha1"; option go_package = "google.golang.org/genproto/googleapis/container/v1alpha1;container"; option java_multiple_files = true; option java_outer_classname = "ClusterServiceProto"; option java_package = "com.google.container.v1alpha1"; +option csharp_namespace = "Google.Cloud.Container.V1Alpha1"; option php_namespace = "Google\\Cloud\\Container\\V1alpha1"; -// Google Kubernetes Engine Cluster Manager v1alpha1 +// Google Container Engine Cluster Manager v1alpha1 service ClusterManager { // Lists all clusters owned by a project in either the specified zone or all // zones. rpc ListClusters(ListClustersRequest) returns (ListClustersResponse) { - option (google.api.http) = { - get: "/v1alpha1/{parent=projects/*/locations/*}/clusters" - additional_bindings { - get: "/v1alpha1/projects/{project_id}/zones/{zone}/clusters" - } - }; + option (google.api.http) = { get: "/v1alpha1/{parent=projects/*/locations/*}/clusters" }; } - // Gets the details for a specific cluster. + // Gets the details of a specific cluster. rpc GetCluster(GetClusterRequest) returns (Cluster) { - option (google.api.http) = { - get: "/v1alpha1/{name=projects/*/locations/*/clusters/*}" - additional_bindings { - get: "/v1alpha1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}" - } - }; + option (google.api.http) = { get: "/v1alpha1/{name=projects/*/locations/*/clusters/*}" }; } // Creates a cluster, consisting of the specified number and type of Google @@ -66,125 +54,55 @@ service ClusterManager { // Finally, an entry is added to the project's global metadata indicating // which CIDR range is being used by the cluster. rpc CreateCluster(CreateClusterRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1alpha1/{parent=projects/*/locations/*}/clusters" - body: "*" - additional_bindings { - post: "/v1alpha1/projects/{project_id}/zones/{zone}/clusters" - body: "*" - } - }; + option (google.api.http) = { post: "/v1alpha1/{parent=projects/*/locations/*}/clusters" body: "*" }; } - // Updates the settings for a specific cluster. + // Updates the settings of a specific cluster. rpc UpdateCluster(UpdateClusterRequest) returns (Operation) { - option (google.api.http) = { - put: "/v1alpha1/{name=projects/*/locations/*/clusters/*}" - body: "*" - additional_bindings { - put: "/v1alpha1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}" - body: "*" - } - }; + option (google.api.http) = { put: "/v1alpha1/{name=projects/*/locations/*/clusters/*}" body: "*" }; } // Updates the version and/or iamge type of a specific node pool. rpc UpdateNodePool(UpdateNodePoolRequest) returns (Operation) { - option (google.api.http) = { - put: "/v1alpha1/{name=projects/*/locations/*/clusters/*/nodePools/*}" - body: "*" - additional_bindings { - post: "/v1alpha1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools/{node_pool_id}/update" - body: "*" - } - }; + option (google.api.http) = { put: "/v1alpha1/{name=projects/*/locations/*/clusters/*/nodePools/*}" body: "*" }; } // Sets the autoscaling settings of a specific node pool. rpc SetNodePoolAutoscaling(SetNodePoolAutoscalingRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1alpha1/{name=projects/*/locations/*/clusters/*/nodePools/*}:setAutoscaling" - body: "*" - additional_bindings { - post: "/v1alpha1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools/{node_pool_id}/autoscaling" - body: "*" - } - }; + option (google.api.http) = { post: "/v1alpha1/{name=projects/*/locations/*/clusters/*/nodePools/*}:setAutoscaling" body: "*" }; } - // Sets the logging service for a specific cluster. + // Sets the logging service of a specific cluster. rpc SetLoggingService(SetLoggingServiceRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1alpha1/{name=projects/*/locations/*/clusters/*}:setLogging" - body: "*" - additional_bindings { - post: "/v1alpha1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/logging" - body: "*" - } - }; + option (google.api.http) = { post: "/v1alpha1/{name=projects/*/locations/*/clusters/*}:setLogging" body: "*" }; } - // Sets the monitoring service for a specific cluster. + // Sets the monitoring service of a specific cluster. rpc SetMonitoringService(SetMonitoringServiceRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1alpha1/{name=projects/*/locations/*/clusters/*}:setMonitoring" - body: "*" - additional_bindings { - post: "/v1alpha1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/monitoring" - body: "*" - } - }; + option (google.api.http) = { post: "/v1alpha1/{name=projects/*/locations/*/clusters/*}:setMonitoring" body: "*" }; } - // Sets the addons for a specific cluster. + // Sets the addons of a specific cluster. rpc SetAddonsConfig(SetAddonsConfigRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1alpha1/{name=projects/*/locations/*/clusters/*}:setAddons" - body: "*" - additional_bindings { - post: "/v1alpha1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/addons" - body: "*" - } - }; + option (google.api.http) = { post: "/v1alpha1/{name=projects/*/locations/*/clusters/*}:setAddons" body: "*" }; } - // Sets the locations for a specific cluster. + // Sets the locations of a specific cluster. rpc SetLocations(SetLocationsRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1alpha1/{name=projects/*/locations/*/clusters/*}:setLocations" - body: "*" - additional_bindings { - post: "/v1alpha1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/locations" - body: "*" - } - }; + option (google.api.http) = { post: "/v1alpha1/{name=projects/*/locations/*/clusters/*}:setLocations" body: "*" }; } - // Updates the master for a specific cluster. + // Updates the master of a specific cluster. rpc UpdateMaster(UpdateMasterRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1alpha1/{name=projects/*/locations/*/clusters/*}:updateMaster" - body: "*" - additional_bindings { - post: "/v1alpha1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/master" - body: "*" - } - }; + option (google.api.http) = { post: "/v1alpha1/{name=projects/*/locations/*/clusters/*}:updateMaster" body: "*" }; } // Used to set master auth materials. Currently supports :- - // Changing the admin password for a specific cluster. + // Changing the admin password of a specific cluster. // This can be either via password generation or explicitly set. // Modify basic_auth.csv and reset the K8S API server. rpc SetMasterAuth(SetMasterAuthRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1alpha1/{name=projects/*/locations/*/clusters/*}:setMasterAuth" - body: "*" - additional_bindings { - post: "/v1alpha1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}:setMasterAuth" - body: "*" - } - }; + option (google.api.http) = { post: "/v1alpha1/{name=projects/*/locations/*/clusters/*}:setMasterAuth" body: "*" }; } // Deletes the cluster, including the Kubernetes endpoint and all worker @@ -197,249 +115,93 @@ service ClusterManager { // (e.g. load balancer resources) will not be deleted if they weren't present // at the initial create time. rpc DeleteCluster(DeleteClusterRequest) returns (Operation) { - option (google.api.http) = { - delete: "/v1alpha1/{name=projects/*/locations/*/clusters/*}" - additional_bindings { - delete: "/v1alpha1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}" - } - }; + option (google.api.http) = { delete: "/v1alpha1/{name=projects/*/locations/*/clusters/*}" }; } // Lists all operations in a project in a specific zone or all zones. rpc ListOperations(ListOperationsRequest) returns (ListOperationsResponse) { - option (google.api.http) = { - get: "/v1alpha1/{parent=projects/*/locations/*}/operations" - additional_bindings { - get: "/v1alpha1/projects/{project_id}/zones/{zone}/operations" - } - }; + option (google.api.http) = { get: "/v1alpha1/{parent=projects/*/locations/*}/operations" }; } // Gets the specified operation. rpc GetOperation(GetOperationRequest) returns (Operation) { - option (google.api.http) = { - get: "/v1alpha1/{name=projects/*/locations/*/operations/*}" - additional_bindings { - get: "/v1alpha1/projects/{project_id}/zones/{zone}/operations/{operation_id}" - } - }; + option (google.api.http) = { get: "/v1alpha1/{name=projects/*/locations/*/operations/*}" }; } // Cancels the specified operation. rpc CancelOperation(CancelOperationRequest) returns (google.protobuf.Empty) { - option (google.api.http) = { - post: "/v1alpha1/{name=projects/*/locations/*/operations/*}:cancel" - body: "*" - additional_bindings { - post: "/v1alpha1/projects/{project_id}/zones/{zone}/operations/{operation_id}:cancel" - body: "*" - } - }; + option (google.api.http) = { post: "/v1alpha1/{name=projects/*/locations/*/operations/*}:cancel" body: "*" }; } - // Returns configuration info about the Kubernetes Engine service. + // Returns configuration info about the Container Engine service. rpc GetServerConfig(GetServerConfigRequest) returns (ServerConfig) { - option (google.api.http) = { - get: "/v1alpha1/{name=projects/*/locations/*}/serverConfig" - additional_bindings { - get: "/v1alpha1/projects/{project_id}/zones/{zone}/serverconfig" - } - }; + option (google.api.http) = { get: "/v1alpha1/{name=projects/*/locations/*}/serverConfig" }; } // Lists the node pools for a cluster. rpc ListNodePools(ListNodePoolsRequest) returns (ListNodePoolsResponse) { - option (google.api.http) = { - get: "/v1alpha1/{parent=projects/*/locations/*/clusters/*}/nodePools" - additional_bindings { - get: "/v1alpha1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools" - } - }; + option (google.api.http) = { get: "/v1alpha1/{parent=projects/*/locations/*/clusters/*}/nodePools" }; } // Retrieves the node pool requested. rpc GetNodePool(GetNodePoolRequest) returns (NodePool) { - option (google.api.http) = { - get: "/v1alpha1/{name=projects/*/locations/*/clusters/*/nodePools/*}" - additional_bindings { - get: "/v1alpha1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools/{node_pool_id}" - } - }; + option (google.api.http) = { get: "/v1alpha1/{name=projects/*/locations/*/clusters/*/nodePools/*}" }; } // Creates a node pool for a cluster. rpc CreateNodePool(CreateNodePoolRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1alpha1/{parent=projects/*/locations/*/clusters/*}/nodePools" - body: "*" - additional_bindings { - post: "/v1alpha1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools" - body: "*" - } - }; + option (google.api.http) = { post: "/v1alpha1/{parent=projects/*/locations/*/clusters/*}/nodePools" body: "*" }; } // Deletes a node pool from a cluster. rpc DeleteNodePool(DeleteNodePoolRequest) returns (Operation) { - option (google.api.http) = { - delete: "/v1alpha1/{name=projects/*/locations/*/clusters/*/nodePools/*}" - additional_bindings { - delete: "/v1alpha1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools/{node_pool_id}" - } - }; + option (google.api.http) = { delete: "/v1alpha1/{name=projects/*/locations/*/clusters/*/nodePools/*}" }; } // Roll back the previously Aborted or Failed NodePool upgrade. // This will be an no-op if the last upgrade successfully completed. rpc RollbackNodePoolUpgrade(RollbackNodePoolUpgradeRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1alpha1/{name=projects/*/locations/*/clusters/*/nodePools/*}:rollback" - body: "*" - additional_bindings { - post: "/v1alpha1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools/{node_pool_id}:rollback" - body: "*" - } - }; + option (google.api.http) = { post: "/v1alpha1/{name=projects/*/locations/*/clusters/*/nodePools/*}:rollback" body: "*" }; } // Sets the NodeManagement options for a node pool. rpc SetNodePoolManagement(SetNodePoolManagementRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1alpha1/{name=projects/*/locations/*/clusters/*/nodePools/*}:setManagement" - body: "*" - additional_bindings { - post: "/v1alpha1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools/{node_pool_id}/setManagement" - body: "*" - } - }; + option (google.api.http) = { post: "/v1alpha1/{name=projects/*/locations/*/clusters/*/nodePools/*}:setManagement" body: "*" }; } // Sets labels on a cluster. rpc SetLabels(SetLabelsRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1alpha1/{name=projects/*/locations/*/clusters/*}:setResourceLabels" - body: "*" - additional_bindings { - post: "/v1alpha1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/resourceLabels" - body: "*" - } - }; + option (google.api.http) = { post: "/v1alpha1/{name=projects/*/locations/*/clusters/*}:setResourceLabels" body: "*" }; } // Enables or disables the ABAC authorization mechanism on a cluster. rpc SetLegacyAbac(SetLegacyAbacRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1alpha1/{name=projects/*/locations/*/clusters/*}:setLegacyAbac" - body: "*" - additional_bindings { - post: "/v1alpha1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/legacyAbac" - body: "*" - } - }; + option (google.api.http) = { post: "/v1alpha1/{name=projects/*/locations/*/clusters/*}:setLegacyAbac" body: "*" }; } // Start master IP rotation. rpc StartIPRotation(StartIPRotationRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1alpha1/{name=projects/*/locations/*/clusters/*}:startIpRotation" - body: "*" - additional_bindings { - post: "/v1alpha1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}:startIpRotation" - body: "*" - } - }; + option (google.api.http) = { post: "/v1alpha1/{name=projects/*/locations/*/clusters/*}:startIpRotation" body: "*" }; } // Completes master IP rotation. rpc CompleteIPRotation(CompleteIPRotationRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1alpha1/{name=projects/*/locations/*/clusters/*}:completeIpRotation" - body: "*" - additional_bindings { - post: "/v1alpha1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}:completeIpRotation" - body: "*" - } - }; + option (google.api.http) = { post: "/v1alpha1/{name=projects/*/locations/*/clusters/*}:completeIpRotation" body: "*" }; } - // Sets the size for a specific node pool. + // Sets the size of a specific node pool. rpc SetNodePoolSize(SetNodePoolSizeRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1alpha1/{name=projects/*/locations/*/clusters/*/nodePools/*}:setSize" - body: "*" - additional_bindings { - post: "/v1alpha1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools/{node_pool_id}/setSize" - body: "*" - } - }; + option (google.api.http) = { post: "/v1alpha1/{name=projects/*/locations/*/clusters/*/nodePools/*}:setSize" body: "*" }; } // Enables/Disables Network Policy for a cluster. rpc SetNetworkPolicy(SetNetworkPolicyRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1alpha1/{name=projects/*/locations/*/clusters/*}:setNetworkPolicy" - body: "*" - additional_bindings { - post: "/v1alpha1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}:setNetworkPolicy" - body: "*" - } - }; + option (google.api.http) = { post: "/v1alpha1/{name=projects/*/locations/*/clusters/*}:setNetworkPolicy" body: "*" }; } // Sets the maintenance policy for a cluster. rpc SetMaintenancePolicy(SetMaintenancePolicyRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1alpha1/{name=projects/*/locations/*/clusters/*}:setMaintenancePolicy" - body: "*" - additional_bindings { - post: "/v1alpha1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}:setMaintenancePolicy" - body: "*" - } - }; - } - - // Sets the access control policy for a resource. Replaces any existing - // policy. - // - // Authorization requires the Google IAM permission - // 'container.clusters.setIamPolicy' on the specified resource. - rpc SetIamPolicy(google.iam.v1.SetIamPolicyRequest) returns (google.iam.v1.Policy) { - option (google.api.http) = { - post: "/v1alpha1/{resource=projects/**}:setIamPolicy" - body: "*" - }; - } - - // Gets the access control policy for a resource. Returns NOT_FOUND error if - // the resource does not exist. Returns an empty policy if the resource exists - // but does not have a policy set. - // - // Authorization requires the Google IAM permission - // `container.clusters.getIamPolicy` on the specified resource. - rpc GetIamPolicy(google.iam.v1.GetIamPolicyRequest) returns (google.iam.v1.Policy) { - option (google.api.http) = { - post: "/v1alpha1/{resource=projects/**}:getIamPolicy" - body: "*" - }; - } - - // Returns permissions that a caller has on the specified resource. - // If the resource does not exist, this will return an empty set of - // permissions, not a NOT_FOUND error. - // - // There is no permission required to make this API call. - rpc TestIamPermissions(google.iam.v1.TestIamPermissionsRequest) returns (google.iam.v1.TestIamPermissionsResponse) { - option (google.api.http) = { - post: "/v1alpha1/{resource=projects/**}:testIamPermissions" - body: "*" - }; - } - - // Lists subnetworks that are usable for creating clusters in a project. - rpc ListUsableSubnetworks(ListUsableSubnetworksRequest) returns (ListUsableSubnetworksResponse) { - option (google.api.http) = { - get: "/v1alpha1/{parent=projects/*}/aggregated/usableSubnetworks" - }; + option (google.api.http) = { post: "/v1alpha1/{name=projects/*/locations/*/clusters/*}:setMaintenancePolicy" body: "*" }; } } @@ -484,18 +246,8 @@ message NodeConfig { // Keys must conform to the regexp [a-zA-Z0-9-_]+ and be less than 128 bytes // in length. These are reflected as part of a URL in the metadata server. // Additionally, to avoid ambiguity, keys must not conflict with any other - // metadata keys for the project or be one of the reserved keys: - // "cluster-location" - // "cluster-name" - // "cluster-uid" - // "configure-sh" - // "enable-os-login" - // "gci-update-strategy" - // "gci-ensure-gke-docker" - // "instance-template" - // "kube-env" - // "startup-script" - // "user-data" + // metadata keys for the project or be one of the four reserved keys: + // "instance-template", "kube-env", "startup-script", and "user-data" // // Values are free-form strings, and only have meaning as interpreted by // the image running in the instance. The only restriction placed on them is @@ -542,18 +294,12 @@ message NodeConfig { // support for GPUs. repeated AcceleratorConfig accelerators = 11; - // Type of the disk attached to each node (e.g. 'pd-standard' or 'pd-ssd') - // - // If unspecified, the default disk type is 'pd-standard' - string disk_type = 12; - // Minimum CPU platform to be used by this instance. The instance may be // scheduled on the specified or newer CPU platform. Applicable values are the // friendly names of CPU platforms, such as // minCpuPlatform: "Intel Haswell" 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) string min_cpu_platform = 13; // List of kubernetes taints to be applied to each node. @@ -609,9 +355,8 @@ message MasterAuth { // must be non-empty. string password = 2; - // Configuration for client certificate authentication on the cluster. For - // clusters before v1.12, if no configuration is specified, a client - // certificate is issued. + // Configuration for client certificate authentication on the cluster. If no + // configuration is specified, a client certificate is issued. ClientCertificateConfig client_certificate_config = 3; // [Output only] Base64-encoded public certificate that is the root of @@ -687,27 +432,6 @@ message NetworkPolicyConfig { bool disabled = 1; } -// Configuration options for private clusters. -message PrivateClusterConfig { - // Whether nodes have only private IP addresses, and communicate with the - // master via private networking. - bool enable_private_nodes = 1; - - // Whether the master's internal IP address is used as the cluster endpoint. - bool enable_private_endpoint = 2; - - // The IP prefix in CIDR notation to use for the hosted master network. This - // prefix will be used for assigning private IP addresses to the master or - // set of masters, as well as the ILB VIP. - string master_ipv4_cidr_block = 3; - - // Output only. The internal IP address of this cluster's endpoint. - string private_endpoint = 4; - - // Output only. The external IP address of this cluster's endpoint. - string public_endpoint = 5; -} - // Configuration options for the master authorized networks feature. Enabled // master authorized networks will disallow all external traffic to access // Kubernetes master through HTTPS except traffic from the given CIDR blocks, @@ -765,13 +489,13 @@ message IPAllocationPolicy { string subnetwork_name = 3; // This field is deprecated, use cluster_ipv4_cidr_block. - string cluster_ipv4_cidr = 4 [deprecated = true]; + string cluster_ipv4_cidr = 4; // This field is deprecated, use node_ipv4_cidr_block. - string node_ipv4_cidr = 5 [deprecated = true]; + string node_ipv4_cidr = 5; // This field is deprecated, use services_ipv4_cidr_block. - string services_ipv4_cidr = 6 [deprecated = true]; + string services_ipv4_cidr = 6; // The name of the secondary range to be used for the cluster CIDR // block. The secondary range will be used for pod IP @@ -840,27 +564,6 @@ message IPAllocationPolicy { // `10.0.0.0/8`, `172.16.0.0/12`, `192.168.0.0/16`) to pick a specific range // to use. string services_ipv4_cidr_block = 11; - - // If true, allow allocation of cluster CIDR ranges that overlap with certain - // kinds of network routes. By default we do not allow cluster CIDR ranges to - // intersect with any user declared routes. With allow_route_overlap == true, - // we allow overlapping with CIDR ranges that are larger than the cluster CIDR - // range. - // - // If this field is set to true, then cluster and services CIDRs must be - // fully-specified (e.g. `10.96.0.0/14`, but not `/14`), which means: - // 1) When `use_ip_aliases` is true, `cluster_ipv4_cidr_block` and - // `services_ipv4_cidr_block` must be fully-specified. - // 2) When `use_ip_aliases` is false, `cluster.cluster_ipv4_cidr` muse be - // fully-specified. - bool allow_route_overlap = 12; -} - -// Configuration for Binary Authorization. -message BinaryAuthorization { - // Enable Binary Authorization for this cluster. If enabled, all container - // images will be validated by Google Binauthz. - bool enabled = 1; } // Configuration for the PodSecurityPolicy feature. @@ -870,38 +573,7 @@ message PodSecurityPolicyConfig { bool enabled = 1; } -// Configuration for the use of GCP IAM Service Accounts in applications in -// this cluster. -message ManagedPodIdentityConfig { - // Enable the use of GCP IAM Service Accounts in applications in this cluster. - bool enabled = 1; -} - -// StatusCondition describes why a cluster or a node pool has a certain status -// (e.g., ERROR or DEGRADED). -message StatusCondition { - // Code for each condition - enum Code { - // UNKNOWN indicates a generic condition. - UNKNOWN = 0; - - // GCE_STOCKOUT indicates a GCE stockout. - GCE_STOCKOUT = 1; - - // GKE_SERVICE_ACCOUNT_DELETED indicates that the user deleted their robot - // service account. - // More codes TBA - GKE_SERVICE_ACCOUNT_DELETED = 2; - } - - // Machine-friendly representation of the condition - Code code = 1; - - // Human-friendly representation of the condition - string message = 2; -} - -// A Google Kubernetes Engine cluster. +// A Google Container Engine cluster. message Cluster { // The current status of the cluster. enum Status { @@ -926,24 +598,6 @@ message Cluster { // The ERROR state indicates the cluster may be unusable. Details // can be found in the `statusMessage` field. ERROR = 5; - - // The DEGRADED state indicates the cluster requires user action to restore - // full functionality. Details can be found in the `statusMessage` field. - DEGRADED = 6; - } - - // Defines possible options for node_scheduling_strategy field. - enum NodeSchedulingStrategy { - // Use default scheduling strategy. - STRATEGY_UNSPECIFIED = 0; - - // Least utilized nodes will be prioritized by k8s scheduler. - PRIORITIZE_LEAST_UTILIZED = 1; - - // Nodes with medium utilization will be prioritized by k8s scheduler. - // This option improves interoperability of scheduler with cluster - // autoscaler. - PRIORITIZE_MEDIUM_UTILIZED = 2; } // The name of this cluster. The name must be unique within this project @@ -1015,8 +669,7 @@ message Cluster { // The name of the Google Compute Engine // [subnetwork](/compute/docs/subnetworks) to which the - // cluster is connected. On output this shows the subnetwork ID instead of - // the name. + // cluster is connected. string subnetwork = 11; // The node pools associated with this cluster. @@ -1049,25 +702,9 @@ message Cluster { // Configure the maintenance policy for this cluster. MaintenancePolicy maintenance_policy = 23; - // Configuration for Binary Authorization. - BinaryAuthorization binary_authorization = 24; - // Configuration for the PodSecurityPolicy feature. PodSecurityPolicyConfig pod_security_policy_config = 25; - // Cluster-level autoscaling configuration. - ClusterAutoscaling autoscaling = 26; - - // Configuration for the use of GCP IAM Service Accounts in applications in - // this cluster. - ManagedPodIdentityConfig managed_pod_identity_config = 32; - - // Defines behaviour of k8s scheduler. - NodeSchedulingStrategy node_scheduling_strategy = 35; - - // Configuration for private cluster. - PrivateClusterConfig private_cluster_config = 37; - // [Output only] Server-defined URL for the resource. string self_link = 100; @@ -1075,7 +712,7 @@ message Cluster { // [zone](/compute/docs/zones#available) in which the cluster // resides. // This field is deprecated, use location instead. - string zone = 101 [deprecated = true]; + string zone = 101; // [Output only] The IP address of this cluster's master endpoint. // The endpoint can be accessed from the internet at @@ -1089,26 +726,15 @@ message Cluster { // found in validMasterVersions returned by getServerConfig. The version can // 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 string initial_cluster_version = 103; // [Output only] The current software version of the master endpoint. string current_master_version = 104; - // [Output only] Deprecated, use - // [NodePool.version](/kubernetes-engine/docs/reference/rest/v1alpha1/projects.zones.clusters.nodePool) - // instead. The current version of the node software components. + // [Output only] The current version of the node software components. // If they are currently at multiple versions because they're in the process // of being upgraded, this reflects the minimum version of all nodes. - string current_node_version = 105 [deprecated = true]; + string current_node_version = 105; // [Output only] The time the cluster was created, in // [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format. @@ -1119,8 +745,7 @@ message Cluster { // [Output only] Additional information about the current status of this // cluster, if available. - // Deprecated, use the field conditions instead. - string status_message = 108 [deprecated = true]; + string status_message = 108; // [Output only] The size of the address space on each node for hosting // containers. This is provisioned from within the `container_ipv4_cidr` @@ -1134,8 +759,10 @@ message Cluster { // typically put in the last `/16` from the container CIDR. string services_ipv4_cidr = 110; - // Deprecated. Use node_pools.instance_group_urls. - repeated string instance_group_urls = 111 [deprecated = true]; + // [Output only] The resource URLs of [instance + // groups](/compute/docs/instance-groups/) associated with this + // cluster. + repeated string instance_group_urls = 111; // [Output only] The number of nodes currently in the cluster. int32 current_node_count = 112; @@ -1149,9 +776,6 @@ message Cluster { // [region](/compute/docs/regions-zones/regions-zones#available) in which // the cluster resides. string location = 114; - - // Which conditions caused the current cluster state. - repeated StatusCondition conditions = 118; } // ClusterUpdate describes an update to the cluster. Exactly one update can @@ -1159,23 +783,13 @@ message Cluster { // provided. message ClusterUpdate { // The Kubernetes version to change the nodes to (typically an - // 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 + // upgrade). Use `-` to upgrade to the latest version supported by + // the server. string desired_node_version = 4; // The monitoring service the cluster should use to write metrics. // Currently available options: // - // * "monitoring.googleapis.com/kubernetes" - the Google Cloud Monitoring - // service with Kubernetes-native resource model in Stackdriver // * "monitoring.googleapis.com" - the Google Cloud Monitoring service // * "none" - no metrics will be exported from the cluster string desired_monitoring_service = 5; @@ -1214,31 +828,9 @@ message ClusterUpdate { // The desired configuration options for the PodSecurityPolicy feature. PodSecurityPolicyConfig desired_pod_security_policy_config = 14; - // The desired cluster-level autoscaling configuration. - ClusterAutoscaling desired_cluster_autoscaling = 15; - - // The desired configuration options for the Binary Authorization feature. - BinaryAuthorization desired_binary_authorization = 16; - - // The logging service the cluster should use to write metrics. - // Currently available options: - // - // * "logging.googleapis.com/kubernetes" - the Google Cloud Logging - // service with Kubernetes-native resource model in Stackdriver - // * "logging.googleapis.com" - the Google Cloud Logging service - // * "none" - no logs will be exported from the cluster - string desired_logging_service = 19; - - // 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 + // 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. string desired_master_version = 100; } @@ -1315,9 +907,6 @@ message Operation { // Set the maintenance policy. SET_MAINTENANCE_POLICY = 16; - - // Update cluster IP allocation policy. - UPDATE_IP_ALLOCATION_POLICY = 17; } // The server-assigned ID for the operation. @@ -1327,7 +916,7 @@ message Operation { // [zone](/compute/docs/zones#available) in which the operation // is taking place. // This field is deprecated, use location instead. - string zone = 2 [deprecated = true]; + string zone = 2; // The operation type. Type operation_type = 3; @@ -1339,8 +928,7 @@ message Operation { string detail = 8; // If an error has occurred, a textual description of the error. - // Deprecated, use the field conditions instead. - string status_message = 5 [deprecated = true]; + string status_message = 5; // Server-defined URL for the resource. string self_link = 6; @@ -1361,70 +949,20 @@ message Operation { // [Output only] The time the operation completed, in // [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format. string end_time = 11; - - // [Output only] Progress information for an operation. - OperationProgress progress = 12; - - // Which conditions caused the current cluster state. - repeated StatusCondition cluster_conditions = 13; - - // Which conditions caused the current node pool state. - repeated StatusCondition nodepool_conditions = 14; -} - -// Information about operation (or operation stage) progress. -message OperationProgress { - // Progress metric is (string, int|float|string) pair. - message Metric { - // Metric name, required. - // e.g., "nodes total", "percent done" - string name = 1; - - // Strictly one of the values is required. - oneof value { - // For metrics with integer value. - int64 int_value = 2; - - // For metrics with floating point value. - double double_value = 3; - - // For metrics with custom values (ratios, visual progress, etc.). - string string_value = 4; - } - } - - // A non-parameterized string describing an operation stage. - // Unset for single-stage operations. - string name = 1; - - // Status of an operation stage. - // Unset for single-stage operations. - Operation.Status status = 2; - - // Progress metric bundle, for example: - // metrics: [{name: "nodes done", int_value: 15}, - // {name: "nodes total", int_value: 32}] - // or - // metrics: [{name: "progress", double_value: 0.56}, - // {name: "progress scale", double_value: 1.0}] - repeated Metric metrics = 3; - - // Substages of an operation or a stage. - repeated OperationProgress stages = 4; } // CreateClusterRequest creates a cluster. message CreateClusterRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the parent field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use parent instead. + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the parent field. - string zone = 2 [deprecated = true]; + // This field is deprecated, use parent instead. + string zone = 2; // A [cluster // resource](/container-engine/reference/rest/v1alpha1/projects.zones.clusters) @@ -1437,20 +975,20 @@ message CreateClusterRequest { // GetClusterRequest gets the settings of a cluster. message GetClusterRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use name instead. + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + // This field is deprecated, use name instead. + string zone = 2; - // Deprecated. The name of the cluster to retrieve. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster to retrieve. + // This field is deprecated, use name instead. + string cluster_id = 3; // The name (project, location, cluster) of the cluster to retrieve. // Specified in the format 'projects/*/locations/*/clusters/*'. @@ -1459,20 +997,20 @@ message GetClusterRequest { // UpdateClusterRequest updates the settings of a cluster. message UpdateClusterRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use name instead. + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + // This field is deprecated, use name instead. + string zone = 2; - // Deprecated. The name of the cluster to upgrade. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster to upgrade. + // This field is deprecated, use name instead. + string cluster_id = 3; // A description of the update. ClusterUpdate update = 4; @@ -1484,67 +1022,58 @@ message UpdateClusterRequest { // SetNodePoolVersionRequest updates the version of a node pool. message UpdateNodePoolRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use name instead. + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + // This field is deprecated, use name instead. + string zone = 2; - // Deprecated. The name of the cluster to upgrade. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster to upgrade. + // This field is deprecated, use name instead. + string cluster_id = 3; - // Deprecated. The name of the node pool to upgrade. - // This field has been deprecated and replaced by the name field. - string node_pool_id = 4 [deprecated = true]; + // The name of the node pool to upgrade. + // This field is deprecated, use name instead. + string node_pool_id = 4; // The Kubernetes version to change the nodes to (typically an - // 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 + // upgrade). Use `-` to upgrade to the latest version supported by + // the server. string node_version = 5; // The desired image type for the node pool. string image_type = 6; - // The name (project, location, cluster, node pool) of the node pool to - // update. Specified in the format - // 'projects/*/locations/*/clusters/*/nodePools/*'. + // The name (project, location, cluster, node pool) of the node pool to update. + // Specified in the format 'projects/*/locations/*/clusters/*/nodePools/*'. string name = 8; } // SetNodePoolAutoscalingRequest sets the autoscaler settings of a node pool. message SetNodePoolAutoscalingRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use name instead. + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + // This field is deprecated, use name instead. + string zone = 2; - // Deprecated. The name of the cluster to upgrade. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster to upgrade. + // This field is deprecated, use name instead. + string cluster_id = 3; - // Deprecated. The name of the node pool to upgrade. - // This field has been deprecated and replaced by the name field. - string node_pool_id = 4 [deprecated = true]; + // The name of the node pool to upgrade. + // This field is deprecated, use name instead. + string node_pool_id = 4; // Autoscaling configuration for the node pool. NodePoolAutoscaling autoscaling = 5; @@ -1557,20 +1086,19 @@ message SetNodePoolAutoscalingRequest { // SetLoggingServiceRequest sets the logging service of a cluster. message SetLoggingServiceRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use name instead. + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. string zone = 2; - // Deprecated. The name of the cluster to upgrade. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster to upgrade. + // This field is deprecated, use name instead. + string cluster_id = 3; // The logging service the cluster should use to write metrics. // Currently available options: @@ -1586,20 +1114,20 @@ message SetLoggingServiceRequest { // SetMonitoringServiceRequest sets the monitoring service of a cluster. message SetMonitoringServiceRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use name instead. + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + // This field is deprecated, use name instead. + string zone = 2; - // Deprecated. The name of the cluster to upgrade. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster to upgrade. + // This field is deprecated, use name instead. + string cluster_id = 3; // The monitoring service the cluster should use to write metrics. // Currently available options: @@ -1615,20 +1143,20 @@ message SetMonitoringServiceRequest { // SetAddonsRequest sets the addons associated with the cluster. message SetAddonsConfigRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use name instead. + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + // This field is deprecated, use name instead. + string zone = 2; - // Deprecated. The name of the cluster to upgrade. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster to upgrade. + // This field is deprecated, use name instead. + string cluster_id = 3; // The desired configurations for the various addons available to run in the // cluster. @@ -1641,20 +1169,20 @@ message SetAddonsConfigRequest { // SetLocationsRequest sets the locations of the cluster. message SetLocationsRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use name instead. + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + // This field is deprecated, use name instead. + string zone = 2; - // Deprecated. The name of the cluster to upgrade. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster to upgrade. + // This field is deprecated, use name instead. + string cluster_id = 3; // The desired list of Google Compute Engine // [locations](/compute/docs/zones#available) in which the cluster's nodes @@ -1672,30 +1200,23 @@ message SetLocationsRequest { // UpdateMasterRequest updates the master of the cluster. message UpdateMasterRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - string project_id = 1 [deprecated = true]; + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + // This field is deprecated, use name instead. + string zone = 2; - // Deprecated. The name of the cluster to upgrade. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster to upgrade. + // This field is deprecated, use name instead. + string cluster_id = 3; - // 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 + // 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. string master_version = 4; // The name (project, location, cluster) of the cluster to update. @@ -1723,20 +1244,20 @@ message SetMasterAuthRequest { SET_USERNAME = 3; } - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use name instead. + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + // This field is deprecated, use name instead. + string zone = 2; - // Deprecated. The name of the cluster to upgrade. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster to upgrade. + // This field is deprecated, use name instead. + string cluster_id = 3; // The exact form of action to be taken on the master auth. Action action = 4; @@ -1751,20 +1272,20 @@ message SetMasterAuthRequest { // DeleteClusterRequest deletes a cluster. message DeleteClusterRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use name instead. + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + // This field is deprecated, use name instead. + string zone = 2; - // Deprecated. The name of the cluster to delete. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster to delete. + // This field is deprecated, use name instead. + string cluster_id = 3; // The name (project, location, cluster) of the cluster to delete. // Specified in the format 'projects/*/locations/*/clusters/*'. @@ -1773,16 +1294,16 @@ message DeleteClusterRequest { // ListClustersRequest lists clusters. message ListClustersRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the parent field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use parent instead. + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides, or "-" for all zones. - // This field has been deprecated and replaced by the parent field. - string zone = 2 [deprecated = true]; + // This field is deprecated, use parent instead. + string zone = 2; // The parent (project and location) where the clusters will be listed. // Specified in the format 'projects/*/locations/*'. @@ -1803,20 +1324,20 @@ message ListClustersResponse { // GetOperationRequest gets a single operation. message GetOperationRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use name instead. + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + // This field is deprecated, use name instead. + string zone = 2; - // Deprecated. The server-assigned `name` of the operation. - // This field has been deprecated and replaced by the name field. - string operation_id = 3 [deprecated = true]; + // The server-assigned `name` of the operation. + // This field is deprecated, use name instead. + string operation_id = 3; // The name (project, location, operation id) of the operation to get. // Specified in the format 'projects/*/locations/*/operations/*'. @@ -1825,15 +1346,15 @@ message GetOperationRequest { // ListOperationsRequest lists operations. message ListOperationsRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the parent field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use parent instead. + string project_id = 1; - // 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. - string zone = 2 [deprecated = true]; + // The name of the Google Compute Engine [zone](/compute/docs/zones#available) + // to return operations for, or `-` for all zones. + // This field is deprecated, use parent instead. + string zone = 2; // The parent (project and location) where the operations will be listed. // Specified in the format 'projects/*/locations/*'. @@ -1843,19 +1364,19 @@ message ListOperationsRequest { // CancelOperationRequest cancels a single operation. message CancelOperationRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use name instead. + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the operation resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + // This field is deprecated, use name instead. + string zone = 2; - // Deprecated. The server-assigned `name` of the operation. - // This field has been deprecated and replaced by the name field. - string operation_id = 3 [deprecated = true]; + // The server-assigned `name` of the operation. + // This field is deprecated, use name instead. + string operation_id = 3; // The name (project, location, operation id) of the operation to cancel. // Specified in the format 'projects/*/locations/*/operations/*'. @@ -1872,24 +1393,24 @@ message ListOperationsResponse { repeated string missing_zones = 2; } -// Gets the current Kubernetes Engine service configuration. +// Gets the current Container Engine service configuration. message GetServerConfigRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use name instead. + string project_id = 1; - // Deprecated. The name of the Google Compute Engine - // [zone](/compute/docs/zones#available) to return operations for. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + // The name of the Google Compute Engine [zone](/compute/docs/zones#available) + // to return operations for. + // This field is deprecated, use name instead. + string zone = 2; // The name (project and location) of the server config to get // Specified in the format 'projects/*/locations/*'. string name = 4; } -// Kubernetes Engine service configuration. +// Container Engine service configuration. message ServerConfig { // Version of Kubernetes the service deploys by default. string default_cluster_version = 1; @@ -1909,103 +1430,100 @@ message ServerConfig { // CreateNodePoolRequest creates a node pool for a cluster. message CreateNodePoolRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://developers.google.com/console/help/new/#projectnumber). - // This field has been deprecated and replaced by the parent field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use parent instead. + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the parent field. - string zone = 2 [deprecated = true]; + // This field is deprecated, use parent instead. + string zone = 2; - // Deprecated. The name of the cluster. - // This field has been deprecated and replaced by the parent field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster. + // This field is deprecated, use parent instead. + string cluster_id = 3; // The node pool to create. NodePool node_pool = 4; - // The parent (project, location, cluster id) where the node pool will be - // created. Specified in the format - // 'projects/*/locations/*/clusters/*'. + // The parent (project, location, cluster id) where the node pool will be created. + // Specified in the format 'projects/*/locations/*/clusters/*/nodePools/*'. string parent = 6; } // DeleteNodePoolRequest deletes a node pool for a cluster. message DeleteNodePoolRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://developers.google.com/console/help/new/#projectnumber). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use name instead. + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + // This field is deprecated, use name instead. + string zone = 2; - // Deprecate. The name of the cluster. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster. + // This field is deprecated, use name instead. + string cluster_id = 3; - // Deprecated. The name of the node pool to delete. - // This field has been deprecated and replaced by the name field. - string node_pool_id = 4 [deprecated = true]; + // The name of the node pool to delete. + // This field is deprecated, use name instead. + string node_pool_id = 4; - // The name (project, location, cluster, node pool id) of the node pool to - // delete. Specified in the format - // 'projects/*/locations/*/clusters/*/nodePools/*'. + // The name (project, location, cluster, node pool id) of the node pool to delete. + // Specified in the format 'projects/*/locations/*/clusters/*/nodePools/*'. string name = 6; } // ListNodePoolsRequest lists the node pool(s) for a cluster. message ListNodePoolsRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://developers.google.com/console/help/new/#projectnumber). - // This field has been deprecated and replaced by the parent field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use parent instead. + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the parent field. - string zone = 2 [deprecated = true]; + // This field is deprecated, use parent instead. + string zone = 2; - // Deprecated. The name of the cluster. - // This field has been deprecated and replaced by the parent field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster. + // This field is deprecated, use parent instead. + string cluster_id = 3; - // The parent (project, location, cluster id) where the node pools will be - // listed. Specified in the format 'projects/*/locations/*/clusters/*'. + // The parent (project, location, cluster id) where the node pools will be listed. + // Specified in the format 'projects/*/locations/*/clusters/*'. string parent = 5; } // GetNodePoolRequest retrieves a node pool for a cluster. message GetNodePoolRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://developers.google.com/console/help/new/#projectnumber). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use name instead. + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + // This field is deprecated, use name instead. + string zone = 2; - // Deprecated. The name of the cluster. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster. + // This field is deprecated, use name instead. + string cluster_id = 3; - // Deprecated. The name of the node pool. - // This field has been deprecated and replaced by the name field. - string node_pool_id = 4 [deprecated = true]; + // The name of the node pool. + // This field is deprecated, use name instead. + string node_pool_id = 4; - // The name (project, location, cluster, node pool id) of the node pool to - // get. Specified in the format - // 'projects/*/locations/*/clusters/*/nodePools/*'. + // The name (project, location, cluster, node pool id) of the node pool to get. + // Specified in the format 'projects/*/locations/*/clusters/*/nodePools/*'. string name = 6; } @@ -2069,12 +1587,12 @@ message NodePool { // [Output only] Server-defined URL for the resource. string self_link = 100; - // The version of the Kubernetes of this node. + // [Output only] The version of the Kubernetes of this node. string version = 101; - // [Output only] The resource URLs of the [managed instance - // groups](/compute/docs/instance-groups/creating-groups-of-managed-instances) - // associated with this node pool. + // [Output only] The resource URLs of [instance + // groups](/compute/docs/instance-groups/) associated with this + // node pool. repeated string instance_group_urls = 102; // [Output only] The status of the nodes in this pool instance. @@ -2082,11 +1600,7 @@ message NodePool { // [Output only] Additional information about the current status of this // node pool instance, if available. - // Deprecated, use the field conditions instead. - string status_message = 104 [deprecated = true]; - - // Which conditions caused the current node pool state. - repeated StatusCondition conditions = 105; + string status_message = 104; } // NodeManagement defines the set of node management services turned on for the @@ -2145,24 +1659,24 @@ message DailyMaintenanceWindow { // SetNodePoolManagementRequest sets the node management properties of a node // pool. message SetNodePoolManagementRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use name instead. + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + // This field is deprecated, use name instead. + string zone = 2; - // Deprecated. The name of the cluster to update. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster to update. + // This field is deprecated, use name instead. + string cluster_id = 3; - // Deprecated. The name of the node pool to update. - // This field has been deprecated and replaced by the name field. - string node_pool_id = 4 [deprecated = true]; + // The name of the node pool to update. + // This field is deprecated, use name instead. + string node_pool_id = 4; // NodeManagement configuration for the node pool. NodeManagement management = 5; @@ -2176,23 +1690,23 @@ message SetNodePoolManagementRequest { // SetNodePoolSizeRequest sets the size a node // pool. message SetNodePoolSizeRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - string project_id = 1 [deprecated = true]; + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + // This field is deprecated, use name instead. + string zone = 2; - // Deprecated. The name of the cluster to update. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster to update. + // This field is deprecated, use name instead. + string cluster_id = 3; - // Deprecated. The name of the node pool to update. - // This field has been deprecated and replaced by the name field. - string node_pool_id = 4 [deprecated = true]; + // The name of the node pool to update. + // This field is deprecated, use name instead. + string node_pool_id = 4; // The desired node count for the pool. int32 node_count = 5; @@ -2207,24 +1721,24 @@ message SetNodePoolSizeRequest { // NodePool upgrade. This will be an no-op if the last upgrade successfully // completed. message RollbackNodePoolUpgradeRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use name instead. + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + // This field is deprecated, use name instead. + string zone = 2; - // Deprecated. The name of the cluster to rollback. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster to rollback. + // This field is deprecated, use name instead. + string cluster_id = 3; - // Deprecated. The name of the node pool to rollback. - // This field has been deprecated and replaced by the name field. - string node_pool_id = 4 [deprecated = true]; + // The name of the node pool to rollback. + // This field is deprecated, use name instead. + string node_pool_id = 4; // The name (project, location, cluster, node pool id) of the node poll to // rollback upgrade. @@ -2238,32 +1752,6 @@ message ListNodePoolsResponse { repeated NodePool node_pools = 1; } -// ClusterAutoscaling contains global, per-cluster information -// required by Cluster Autoscaler to automatically adjust -// the size of the cluster and create/delete -// node pools based on the current needs. -message ClusterAutoscaling { - // Enables automatic node pool creation and deletion. - bool enable_node_autoprovisioning = 1; - - // Contains global constraints regarding minimum and maximum - // amount of resources in the cluster. - repeated ResourceLimit resource_limits = 2; -} - -// Contains information about amount of some resource in the cluster. -// For memory, value should be in GB. -message ResourceLimit { - // Resource name "cpu", "memory" or gpu-specific string. - string resource_type = 1; - - // Minimum amount of the resource in the cluster. - int64 minimum = 2; - - // Maximum amount of the resource in the cluster. - int64 maximum = 3; -} - // NodePoolAutoscaling contains information required by cluster autoscaler to // adjust the size of the node pool to the current cluster usage. message NodePoolAutoscaling { @@ -2277,36 +1765,33 @@ message NodePoolAutoscaling { // Maximum number of nodes in the NodePool. Must be >= min_node_count. There // has to enough quota to scale up the cluster. int32 max_node_count = 3; - - // Can this node pool be deleted automatically. - bool autoprovisioned = 4; } // SetLabelsRequest sets the Google Cloud Platform labels on a Google Container // Engine cluster, which will in turn set them for Google Compute Engine // resources used by that cluster message SetLabelsRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://developers.google.com/console/help/new/#projectnumber). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use name instead. + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + // This field is deprecated, use name instead. + string zone = 2; - // Deprecated. The name of the cluster. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster. + // This field is deprecated, use name instead. + string cluster_id = 3; // The labels to set for that cluster. map resource_labels = 4; // The fingerprint of the previous set of labels for this resource, // used to detect conflicts. The fingerprint is initially generated by - // Kubernetes Engine and changes after every request to modify or update + // Container Engine and changes after every request to modify or update // labels. You must always provide an up-to-date fingerprint hash when // updating or changing labels. Make a get() request to the // resource to get the latest fingerprint. @@ -2320,20 +1805,20 @@ message SetLabelsRequest { // SetLegacyAbacRequest enables or disables the ABAC authorization mechanism for // a cluster. message SetLegacyAbacRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use name instead. + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + // This field is deprecated, use name instead. + string zone = 2; - // Deprecated. The name of the cluster to update. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster to update. + // This field is deprecated, use name instead. + string cluster_id = 3; // Whether ABAC authorization will be enabled in the cluster. bool enabled = 4; @@ -2346,48 +1831,45 @@ message SetLegacyAbacRequest { // StartIPRotationRequest creates a new IP for the cluster and then performs // a node upgrade on each node pool to point to the new IP. message StartIPRotationRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://developers.google.com/console/help/new/#projectnumber). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use name instead. + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + // This field is deprecated, use name instead. + string zone = 2; - // Deprecated. The name of the cluster. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster. + // This field is deprecated, use name instead. + string cluster_id = 3; - // The name (project, location, cluster id) of the cluster to start IP - // rotation. Specified in the format 'projects/*/locations/*/clusters/*'. + // The name (project, location, cluster id) of the cluster to start IP rotation. + // Specified in the format 'projects/*/locations/*/clusters/*'. string name = 6; - - // Whether to rotate credentials during IP rotation. - bool rotate_credentials = 7; } // CompleteIPRotationRequest moves the cluster master back into single-IP mode. message CompleteIPRotationRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://developers.google.com/console/help/new/#projectnumber). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use name instead. + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + // This field is deprecated, use name instead. + string zone = 2; - // Deprecated. The name of the cluster. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster. + // This field is deprecated, use name instead. + string cluster_id = 3; - // The name (project, location, cluster id) of the cluster to complete IP - // rotation. Specified in the format 'projects/*/locations/*/clusters/*'. + // The name (project, location, cluster id) of the cluster to complete IP rotation. + // Specified in the format 'projects/*/locations/*/clusters/*'. string name = 7; } @@ -2403,20 +1885,20 @@ message AcceleratorConfig { // SetNetworkPolicyRequest enables/disables network policy for a cluster. message SetNetworkPolicyRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://developers.google.com/console/help/new/#projectnumber). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use name instead. + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + // This field is deprecated, use name instead. + string zone = 2; - // Deprecated. The name of the cluster. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster. + // This field is deprecated, use name instead. + string cluster_id = 3; // Configuration options for the NetworkPolicy feature. NetworkPolicy network_policy = 4; @@ -2450,96 +1932,3 @@ message SetMaintenancePolicyRequest { // Specified in the format 'projects/*/locations/*/clusters/*'. string name = 5; } - -// ListUsableSubnetworksRequest requests the list of usable subnetworks. -message ListUsableSubnetworksRequest { - // The parent project where subnetworks are usable. - // Specified in the format 'projects/*'. - string parent = 1; - - // 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. - string filter = 2; - - // 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) - int32 page_size = 3; - - // Specifies a page token to use. Set this to the next_page_token returned by - // previous list requests to get the next page of results. - string page_token = 4; -} - -// ListUsableSubnetworksResponse is the response of -// ListUsableSubnetworksRequest. -message ListUsableSubnetworksResponse { - // A list of usable subnetworks in the specified network project. - repeated UsableSubnetwork subnetworks = 1; - - // 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. - string next_page_token = 2; -} - -// Secondary IP range of a usable subnetwork. -message UsableSubnetworkSecondaryRange { - // Status shows the current usage of a secondary IP range. - enum Status { - // UNKNOWN is the zero value of the Status enum. It's not a valid status. - UNKNOWN = 0; - - // UNUSED denotes that this range is unclaimed by any cluster. - UNUSED = 1; - - // IN_USE_SERVICE denotes that this range is claimed by a cluster for - // services. It cannot be used for other clusters. - IN_USE_SERVICE = 2; - - // IN_USE_SHAREABLE_POD denotes this range was created by the network admin - // and is currently claimed by a cluster for pods. It can only be used by - // other clusters as a pod range. - IN_USE_SHAREABLE_POD = 3; - - // IN_USE_MANAGED_POD denotes this range was created by GKE and is claimed - // for pods. It cannot be used for other clusters. - IN_USE_MANAGED_POD = 4; - } - - // The name associated with this subnetwork secondary range, used when adding - // an alias IP range to a VM instance. - string range_name = 1; - - // The range of IP addresses belonging to this subnetwork secondary range. - string ip_cidr_range = 2; - - // This field is to determine the status of the secondary range programmably. - Status status = 3; -} - -// UsableSubnetwork resource returns the subnetwork name, its associated network -// and the primary CIDR range. -message UsableSubnetwork { - // Subnetwork Name. - string subnetwork = 1; - - // Network Name. - string network = 2; - - // The range of internal addresses that are owned by this subnetwork. - string ip_cidr_range = 3; - - // Secondary IP ranges. - repeated UsableSubnetworkSecondaryRange secondary_ip_ranges = 4; - - // A human readable status message representing the reasons for cases where - // the caller cannot use the secondary ranges under the subnet. For example if - // the secondary_ip_ranges is empty due to a permission issue, an insufficient - // permission message will be given by status_message. - string status_message = 5; -} diff --git a/google/container/v1beta1/cluster_service.proto b/google/container/v1beta1/cluster_service.proto index db60ec0d..f9689de2 100644 --- a/google/container/v1beta1/cluster_service.proto +++ b/google/container/v1beta1/cluster_service.proto @@ -1,4 +1,4 @@ -// Copyright 2018 Google LLC +// Copyright 2017 Google Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -17,39 +17,27 @@ syntax = "proto3"; package google.container.v1beta1; import "google/api/annotations.proto"; -import "google/iam/v1/iam_policy.proto"; -import "google/iam/v1/policy.proto"; import "google/protobuf/empty.proto"; -option csharp_namespace = "Google.Cloud.Container.V1Beta1"; option go_package = "google.golang.org/genproto/googleapis/container/v1beta1;container"; option java_multiple_files = true; option java_outer_classname = "ClusterServiceProto"; option java_package = "com.google.container.v1beta1"; +option csharp_namespace = "Google.Cloud.Container.V1Beta1"; option php_namespace = "Google\\Cloud\\Container\\V1beta1"; -// Google Kubernetes Engine Cluster Manager v1beta1 +// Google Container Engine Cluster Manager v1beta1 service ClusterManager { // Lists all clusters owned by a project in either the specified zone or all // zones. rpc ListClusters(ListClustersRequest) returns (ListClustersResponse) { - option (google.api.http) = { - get: "/v1beta1/{parent=projects/*/locations/*}/clusters" - additional_bindings { - get: "/v1beta1/projects/{project_id}/zones/{zone}/clusters" - } - }; + option (google.api.http) = { get: "/v1beta1/{parent=projects/*/locations/*}/clusters" }; } - // Gets the details for a specific cluster. + // Gets the details of a specific cluster. rpc GetCluster(GetClusterRequest) returns (Cluster) { - option (google.api.http) = { - get: "/v1beta1/{name=projects/*/locations/*/clusters/*}" - additional_bindings { - get: "/v1beta1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}" - } - }; + option (google.api.http) = { get: "/v1beta1/{name=projects/*/locations/*/clusters/*}" }; } // Creates a cluster, consisting of the specified number and type of Google @@ -66,125 +54,20 @@ service ClusterManager { // Finally, an entry is added to the project's global metadata indicating // which CIDR range is being used by the cluster. rpc CreateCluster(CreateClusterRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1beta1/{parent=projects/*/locations/*}/clusters" - body: "*" - additional_bindings { - post: "/v1beta1/projects/{project_id}/zones/{zone}/clusters" - body: "*" - } - }; + option (google.api.http) = { post: "/v1beta1/{parent=projects/*/locations/*}/clusters" body: "*" }; } - // Updates the settings for a specific cluster. + // Updates the settings of a specific cluster. rpc UpdateCluster(UpdateClusterRequest) returns (Operation) { - option (google.api.http) = { - put: "/v1beta1/{name=projects/*/locations/*/clusters/*}" - body: "*" - additional_bindings { - put: "/v1beta1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}" - body: "*" - } - }; - } - - // Updates the version and/or image type of a specific node pool. - rpc UpdateNodePool(UpdateNodePoolRequest) returns (Operation) { - option (google.api.http) = { - put: "/v1beta1/{name=projects/*/locations/*/clusters/*/nodePools/*}" - body: "*" - additional_bindings { - post: "/v1beta1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools/{node_pool_id}/update" - body: "*" - } - }; - } - - // Sets the autoscaling settings of a specific node pool. - rpc SetNodePoolAutoscaling(SetNodePoolAutoscalingRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1beta1/{name=projects/*/locations/*/clusters/*/nodePools/*}:setAutoscaling" - body: "*" - additional_bindings { - post: "/v1beta1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools/{node_pool_id}/autoscaling" - body: "*" - } - }; - } - - // Sets the logging service for a specific cluster. - rpc SetLoggingService(SetLoggingServiceRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1beta1/{name=projects/*/locations/*/clusters/*}:setLogging" - body: "*" - additional_bindings { - post: "/v1beta1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/logging" - body: "*" - } - }; - } - - // Sets the monitoring service for a specific cluster. - rpc SetMonitoringService(SetMonitoringServiceRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1beta1/{name=projects/*/locations/*/clusters/*}:setMonitoring" - body: "*" - additional_bindings { - post: "/v1beta1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/monitoring" - body: "*" - } - }; - } - - // Sets the addons for a specific cluster. - rpc SetAddonsConfig(SetAddonsConfigRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1beta1/{name=projects/*/locations/*/clusters/*}:setAddons" - body: "*" - additional_bindings { - post: "/v1beta1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/addons" - body: "*" - } - }; - } - - // Sets the locations for a specific cluster. - rpc SetLocations(SetLocationsRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1beta1/{name=projects/*/locations/*/clusters/*}:setLocations" - body: "*" - additional_bindings { - post: "/v1beta1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/locations" - body: "*" - } - }; - } - - // Updates the master for a specific cluster. - rpc UpdateMaster(UpdateMasterRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1beta1/{name=projects/*/locations/*/clusters/*}:updateMaster" - body: "*" - additional_bindings { - post: "/v1beta1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/master" - body: "*" - } - }; + option (google.api.http) = { put: "/v1beta1/{name=projects/*/locations/*/clusters/*}" body: "*" }; } // Used to set master auth materials. Currently supports :- - // Changing the admin password for a specific cluster. + // Changing the admin password of a specific cluster. // This can be either via password generation or explicitly set. // Modify basic_auth.csv and reset the K8S API server. rpc SetMasterAuth(SetMasterAuthRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1beta1/{name=projects/*/locations/*/clusters/*}:setMasterAuth" - body: "*" - additional_bindings { - post: "/v1beta1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}:setMasterAuth" - body: "*" - } - }; + option (google.api.http) = { post: "/v1beta1/{name=projects/*/locations/*/clusters/*}:setMasterAuth" body: "*" }; } // Deletes the cluster, including the Kubernetes endpoint and all worker @@ -197,219 +80,88 @@ service ClusterManager { // (e.g. load balancer resources) will not be deleted if they weren't present // at the initial create time. rpc DeleteCluster(DeleteClusterRequest) returns (Operation) { - option (google.api.http) = { - delete: "/v1beta1/{name=projects/*/locations/*/clusters/*}" - additional_bindings { - delete: "/v1beta1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}" - } - }; + option (google.api.http) = { delete: "/v1beta1/{name=projects/*/locations/*/clusters/*}" }; } // Lists all operations in a project in a specific zone or all zones. rpc ListOperations(ListOperationsRequest) returns (ListOperationsResponse) { - option (google.api.http) = { - get: "/v1beta1/{parent=projects/*/locations/*}/operations" - additional_bindings { - get: "/v1beta1/projects/{project_id}/zones/{zone}/operations" - } - }; + option (google.api.http) = { get: "/v1beta1/{parent=projects/*/locations/*}/operations" }; } // Gets the specified operation. rpc GetOperation(GetOperationRequest) returns (Operation) { - option (google.api.http) = { - get: "/v1beta1/{name=projects/*/locations/*/operations/*}" - additional_bindings { - get: "/v1beta1/projects/{project_id}/zones/{zone}/operations/{operation_id}" - } - }; + option (google.api.http) = { get: "/v1beta1/{name=projects/*/locations/*/operations/*}" }; } // Cancels the specified operation. rpc CancelOperation(CancelOperationRequest) returns (google.protobuf.Empty) { - option (google.api.http) = { - post: "/v1beta1/{name=projects/*/locations/*/operations/*}:cancel" - body: "*" - additional_bindings { - post: "/v1beta1/projects/{project_id}/zones/{zone}/operations/{operation_id}:cancel" - body: "*" - } - }; + option (google.api.http) = { post: "/v1beta1/{name=projects/*/locations/*/operations/*}:cancel" body: "*" }; } - // Returns configuration info about the Kubernetes Engine service. + // Returns configuration info about the Container Engine service. rpc GetServerConfig(GetServerConfigRequest) returns (ServerConfig) { - option (google.api.http) = { - get: "/v1beta1/{name=projects/*/locations/*}/serverConfig" - additional_bindings { - get: "/v1beta1/projects/{project_id}/zones/{zone}/serverconfig" - } - }; + option (google.api.http) = { get: "/v1beta1/{name=projects/*/locations/*}/serverConfig" }; } // Lists the node pools for a cluster. rpc ListNodePools(ListNodePoolsRequest) returns (ListNodePoolsResponse) { - option (google.api.http) = { - get: "/v1beta1/{parent=projects/*/locations/*/clusters/*}/nodePools" - additional_bindings { - get: "/v1beta1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools" - } - }; + option (google.api.http) = { get: "/v1beta1/{parent=projects/*/locations/*/clusters/*}/nodePools" }; } // Retrieves the node pool requested. rpc GetNodePool(GetNodePoolRequest) returns (NodePool) { - option (google.api.http) = { - get: "/v1beta1/{name=projects/*/locations/*/clusters/*/nodePools/*}" - additional_bindings { - get: "/v1beta1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools/{node_pool_id}" - } - }; + option (google.api.http) = { get: "/v1beta1/{name=projects/*/locations/*/clusters/*/nodePools/*}" }; } // Creates a node pool for a cluster. rpc CreateNodePool(CreateNodePoolRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1beta1/{parent=projects/*/locations/*/clusters/*}/nodePools" - body: "*" - additional_bindings { - post: "/v1beta1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools" - body: "*" - } - }; + option (google.api.http) = { post: "/v1beta1/{parent=projects/*/locations/*/clusters/*}/nodePools" body: "*" }; } // Deletes a node pool from a cluster. rpc DeleteNodePool(DeleteNodePoolRequest) returns (Operation) { - option (google.api.http) = { - delete: "/v1beta1/{name=projects/*/locations/*/clusters/*/nodePools/*}" - additional_bindings { - delete: "/v1beta1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools/{node_pool_id}" - } - }; + option (google.api.http) = { delete: "/v1beta1/{name=projects/*/locations/*/clusters/*/nodePools/*}" }; } // Roll back the previously Aborted or Failed NodePool upgrade. // This will be an no-op if the last upgrade successfully completed. rpc RollbackNodePoolUpgrade(RollbackNodePoolUpgradeRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1beta1/{name=projects/*/locations/*/clusters/*/nodePools/*}:rollback" - body: "*" - additional_bindings { - post: "/v1beta1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools/{node_pool_id}:rollback" - body: "*" - } - }; + option (google.api.http) = { post: "/v1beta1/{name=projects/*/locations/*/clusters/*/nodePools/*}:rollback" body: "*" }; } // Sets the NodeManagement options for a node pool. rpc SetNodePoolManagement(SetNodePoolManagementRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1beta1/{name=projects/*/locations/*/clusters/*/nodePools/*}:setManagement" - body: "*" - additional_bindings { - post: "/v1beta1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools/{node_pool_id}/setManagement" - body: "*" - } - }; + option (google.api.http) = { post: "/v1beta1/{name=projects/*/locations/*/clusters/*/nodePools/*}:setManagement" body: "*" }; } // Sets labels on a cluster. rpc SetLabels(SetLabelsRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1beta1/{name=projects/*/locations/*/clusters/*}:setResourceLabels" - body: "*" - additional_bindings { - post: "/v1beta1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/resourceLabels" - body: "*" - } - }; + option (google.api.http) = { post: "/v1beta1/{name=projects/*/locations/*/clusters/*}:setResourceLabels" body: "*" }; } // Enables or disables the ABAC authorization mechanism on a cluster. rpc SetLegacyAbac(SetLegacyAbacRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1beta1/{name=projects/*/locations/*/clusters/*}:setLegacyAbac" - body: "*" - additional_bindings { - post: "/v1beta1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/legacyAbac" - body: "*" - } - }; + option (google.api.http) = { post: "/v1beta1/{name=projects/*/locations/*/clusters/*}:setLegacyAbac" body: "*" }; } // Start master IP rotation. rpc StartIPRotation(StartIPRotationRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1beta1/{name=projects/*/locations/*/clusters/*}:startIpRotation" - body: "*" - additional_bindings { - post: "/v1beta1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}:startIpRotation" - body: "*" - } - }; + option (google.api.http) = { post: "/v1beta1/{name=projects/*/locations/*/clusters/*}:startIpRotation" body: "*" }; } // Completes master IP rotation. rpc CompleteIPRotation(CompleteIPRotationRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1beta1/{name=projects/*/locations/*/clusters/*}:completeIpRotation" - body: "*" - additional_bindings { - post: "/v1beta1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}:completeIpRotation" - body: "*" - } - }; - } - - // Sets the size for a specific node pool. - rpc SetNodePoolSize(SetNodePoolSizeRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1beta1/{name=projects/*/locations/*/clusters/*/nodePools/*}:setSize" - body: "*" - additional_bindings { - post: "/v1beta1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools/{node_pool_id}/setSize" - body: "*" - } - }; + option (google.api.http) = { post: "/v1beta1/{name=projects/*/locations/*/clusters/*}:completeIpRotation" body: "*" }; } // Enables/Disables Network Policy for a cluster. rpc SetNetworkPolicy(SetNetworkPolicyRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1beta1/{name=projects/*/locations/*/clusters/*}:setNetworkPolicy" - body: "*" - additional_bindings { - post: "/v1beta1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}:setNetworkPolicy" - body: "*" - } - }; + option (google.api.http) = { post: "/v1beta1/{name=projects/*/locations/*/clusters/*}:setNetworkPolicy" body: "*" }; } // Sets the maintenance policy for a cluster. rpc SetMaintenancePolicy(SetMaintenancePolicyRequest) returns (Operation) { - option (google.api.http) = { - post: "/v1beta1/{name=projects/*/locations/*/clusters/*}:setMaintenancePolicy" - body: "*" - additional_bindings { - post: "/v1beta1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}:setMaintenancePolicy" - body: "*" - } - }; - } - - // Lists subnetworks that are usable for creating clusters in a project. - rpc ListUsableSubnetworks(ListUsableSubnetworksRequest) returns (ListUsableSubnetworksResponse) { - option (google.api.http) = { - get: "/v1beta1/{parent=projects/*}/aggregated/usableSubnetworks" - }; - } - - // Used to fetch locations that offer GKE. - rpc ListLocations(ListLocationsRequest) returns (ListLocationsResponse) { - option (google.api.http) = { - get: "/v1beta1/{parent=projects/*}/locations" - }; + option (google.api.http) = { post: "/v1beta1/{name=projects/*/locations/*/clusters/*}:setMaintenancePolicy" body: "*" }; } } @@ -454,18 +206,8 @@ message NodeConfig { // Keys must conform to the regexp [a-zA-Z0-9-_]+ and be less than 128 bytes // in length. These are reflected as part of a URL in the metadata server. // Additionally, to avoid ambiguity, keys must not conflict with any other - // metadata keys for the project or be one of the reserved keys: - // "cluster-location" - // "cluster-name" - // "cluster-uid" - // "configure-sh" - // "enable-oslogin" - // "gci-ensure-gke-docker" - // "gci-update-strategy" - // "instance-template" - // "kube-env" - // "startup-script" - // "user-data" + // metadata keys for the project or be one of the four reserved keys: + // "instance-template", "kube-env", "startup-script", and "user-data" // // Values are free-form strings, and only have meaning as interpreted by // the image running in the instance. The only restriction placed on them is @@ -512,23 +254,14 @@ message NodeConfig { // support for GPUs. repeated AcceleratorConfig accelerators = 11; - // Type of the disk attached to each node (e.g. 'pd-standard' or 'pd-ssd') - // - // If unspecified, the default disk type is 'pd-standard' - string disk_type = 12; - // Minimum CPU platform to be used by this instance. The instance may be // scheduled on the specified or newer CPU platform. Applicable values are the // friendly names of CPU platforms, such as // minCpuPlatform: "Intel Haswell" 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) string min_cpu_platform = 13; - // The workload metadata configuration for this node. - WorkloadMetadataConfig workload_metadata_config = 14; - // List of kubernetes taints to be applied to each node. // // For more information, including usage and the valid values, see: @@ -582,9 +315,8 @@ message MasterAuth { // must be non-empty. string password = 2; - // Configuration for client certificate authentication on the cluster. For - // clusters before v1.12, if no configuration is specified, a client - // certificate is issued. + // Configuration for client certificate authentication on the cluster. If no + // configuration is specified, a client certificate is issued. ClientCertificateConfig client_certificate_config = 3; // [Output only] Base64-encoded public certificate that is the root of @@ -660,27 +392,6 @@ message NetworkPolicyConfig { bool disabled = 1; } -// Configuration options for private clusters. -message PrivateClusterConfig { - // Whether nodes have only private IP addresses, and communicate with the - // master via private networking. - bool enable_private_nodes = 1; - - // Whether the master's internal IP address is used as the cluster endpoint. - bool enable_private_endpoint = 2; - - // The IP prefix in CIDR notation to use for the hosted master network. This - // prefix will be used for assigning private IP addresses to the master or - // set of masters, as well as the ILB VIP. - string master_ipv4_cidr_block = 3; - - // Output only. The internal IP address of this cluster's master endpoint. - string private_endpoint = 4; - - // Output only. The external IP address of this cluster's master endpoint. - string public_endpoint = 5; -} - // Configuration options for the master authorized networks feature. Enabled // master authorized networks will disallow all external traffic to access // Kubernetes master through HTTPS except traffic from the given CIDR blocks, @@ -703,16 +414,6 @@ message MasterAuthorizedNetworksConfig { repeated CidrBlock cidr_blocks = 2; } -// Configuration for the legacy Attribute Based Access Control authorization -// mode. -message LegacyAbac { - // Whether the ABAC authorizer is enabled for this cluster. When enabled, - // identities in the system, including service accounts, nodes, and - // controllers, will have statically granted permissions beyond those - // provided by the RBAC configuration or IAM. - bool enabled = 1; -} - // Configuration options for the NetworkPolicy feature. // https://kubernetes.io/docs/concepts/services-networking/networkpolicies/ message NetworkPolicy { @@ -748,13 +449,13 @@ message IPAllocationPolicy { string subnetwork_name = 3; // This field is deprecated, use cluster_ipv4_cidr_block. - string cluster_ipv4_cidr = 4 [deprecated = true]; + string cluster_ipv4_cidr = 4; // This field is deprecated, use node_ipv4_cidr_block. - string node_ipv4_cidr = 5 [deprecated = true]; + string node_ipv4_cidr = 5; // This field is deprecated, use services_ipv4_cidr_block. - string services_ipv4_cidr = 6 [deprecated = true]; + string services_ipv4_cidr = 6; // The name of the secondary range to be used for the cluster CIDR // block. The secondary range will be used for pod IP @@ -823,44 +524,6 @@ message IPAllocationPolicy { // `10.0.0.0/8`, `172.16.0.0/12`, `192.168.0.0/16`) to pick a specific range // to use. string services_ipv4_cidr_block = 11; - - // If true, allow allocation of cluster CIDR ranges that overlap with certain - // kinds of network routes. By default we do not allow cluster CIDR ranges to - // intersect with any user declared routes. With allow_route_overlap == true, - // we allow overlapping with CIDR ranges that are larger than the cluster CIDR - // range. - // - // If this field is set to true, then cluster and services CIDRs must be - // fully-specified (e.g. `10.96.0.0/14`, but not `/14`), which means: - // 1) When `use_ip_aliases` is true, `cluster_ipv4_cidr_block` and - // `services_ipv4_cidr_block` must be fully-specified. - // 2) When `use_ip_aliases` is false, `cluster.cluster_ipv4_cidr` muse be - // fully-specified. - bool allow_route_overlap = 12; - - // The IP address range of the Cloud TPUs in this cluster. If unspecified, a - // range will be automatically chosen with the default size. - // - // This field is only applicable when `use_ip_aliases` is true. - // - // If unspecified, the range will use the default size. - // - // Set to /netmask (e.g. `/14`) to have a range chosen with a specific - // netmask. - // - // Set to a - // [CIDR](http://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing) - // notation (e.g. `10.96.0.0/14`) from the RFC-1918 private networks (e.g. - // `10.0.0.0/8`, `172.16.0.0/12`, `192.168.0.0/16`) to pick a specific range - // to use. - string tpu_ipv4_cidr_block = 13; -} - -// Configuration for Binary Authorization. -message BinaryAuthorization { - // Enable Binary Authorization for this cluster. If enabled, all container - // images will be validated by Google Binauthz. - bool enabled = 1; } // Configuration for the PodSecurityPolicy feature. @@ -870,7 +533,7 @@ message PodSecurityPolicyConfig { bool enabled = 1; } -// A Google Kubernetes Engine cluster. +// A Google Container Engine cluster. message Cluster { // The current status of the cluster. enum Status { @@ -895,10 +558,6 @@ message Cluster { // The ERROR state indicates the cluster may be unusable. Details // can be found in the `statusMessage` field. ERROR = 5; - - // The DEGRADED state indicates the cluster requires user action to restore - // full functionality. Details can be found in the `statusMessage` field. - DEGRADED = 6; } // The name of this cluster. The name must be unique within this project @@ -956,8 +615,7 @@ message Cluster { // The name of the Google Compute Engine // [network](/compute/docs/networks-and-firewalls#networks) to which the // cluster is connected. If left unspecified, the `default` network - // will be used. On output this shows the network ID instead of - // the name. + // will be used. string network = 8; // The IP address range of the container pods in this cluster, in @@ -971,8 +629,7 @@ message Cluster { // The name of the Google Compute Engine // [subnetwork](/compute/docs/subnetworks) to which the - // cluster is connected. On output this shows the subnetwork ID instead of - // the name. + // cluster is connected. string subnetwork = 11; // The node pools associated with this cluster. @@ -993,16 +650,6 @@ message Cluster { // creation. bool enable_kubernetes_alpha = 14; - // The resource labels for the cluster to use to annotate any related - // Google Compute Engine resources. - map resource_labels = 15; - - // The fingerprint of the set of labels for this cluster. - string label_fingerprint = 16; - - // Configuration for the legacy ABAC authorization mode. - LegacyAbac legacy_abac = 18; - // Configuration options for the NetworkPolicy feature. NetworkPolicy network_policy = 19; @@ -1015,39 +662,9 @@ message Cluster { // Configure the maintenance policy for this cluster. MaintenancePolicy maintenance_policy = 23; - // Configuration for Binary Authorization. - BinaryAuthorization binary_authorization = 24; - // Configuration for the PodSecurityPolicy feature. PodSecurityPolicyConfig pod_security_policy_config = 25; - // Cluster-level autoscaling configuration. - ClusterAutoscaling autoscaling = 26; - - // Configuration for cluster networking. - NetworkConfig network_config = 27; - - // If this is a private cluster setup. Private clusters are clusters that, by - // default have no external IP addresses on the nodes and where nodes and the - // master communicate over private IP addresses. - // This field is deprecated, use private_cluster_config.enabled instead. - bool private_cluster = 28 [deprecated = true]; - - // The IP prefix in CIDR notation to use for the hosted master network. - // This prefix will be used for assigning private IP addresses to the - // master or set of masters, as well as the ILB VIP. - // This field is deprecated, use - // private_cluster_config.master_ipv4_cidr_block instead. - string master_ipv4_cidr_block = 29 [deprecated = true]; - - // The default constraint on the maximum number of pods that can be run - // simultaneously on a node in the node pool of this cluster. Only honored - // if cluster created with IP Alias support. - MaxPodsConstraint default_max_pods_constraint = 30; - - // Configuration for private cluster. - PrivateClusterConfig private_cluster_config = 37; - // [Output only] Server-defined URL for the resource. string self_link = 100; @@ -1055,7 +672,7 @@ message Cluster { // [zone](/compute/docs/zones#available) in which the cluster // resides. // This field is deprecated, use location instead. - string zone = 101 [deprecated = true]; + string zone = 101; // [Output only] The IP address of this cluster's master endpoint. // The endpoint can be accessed from the internet at @@ -1069,26 +686,15 @@ message Cluster { // found in validMasterVersions returned by getServerConfig. The version can // 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 string initial_cluster_version = 103; // [Output only] The current software version of the master endpoint. string current_master_version = 104; - // [Output only] Deprecated, use - // [NodePool.version](/kubernetes-engine/docs/reference/rest/v1beta1/projects.zones.clusters.nodePool) - // instead. The current version of the node software components. + // [Output only] The current version of the node software components. // If they are currently at multiple versions because they're in the process // of being upgraded, this reflects the minimum version of all nodes. - string current_node_version = 105 [deprecated = true]; + string current_node_version = 105; // [Output only] The time the cluster was created, in // [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format. @@ -1113,8 +719,10 @@ message Cluster { // typically put in the last `/16` from the container CIDR. string services_ipv4_cidr = 110; - // Deprecated. Use node_pools.instance_group_urls. - repeated string instance_group_urls = 111 [deprecated = true]; + // [Output only] The resource URLs of [instance + // groups](/compute/docs/instance-groups/) associated with this + // cluster. + repeated string instance_group_urls = 111; // [Output only] The number of nodes currently in the cluster. int32 current_node_count = 112; @@ -1128,17 +736,6 @@ message Cluster { // [region](/compute/docs/regions-zones/regions-zones#available) in which // the cluster resides. string location = 114; - - // Enable the ability to use Cloud TPUs in this cluster. - bool enable_tpu = 115; - - // [Output only] The IP address range of the Cloud TPUs in this cluster, in - // [CIDR](http://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing) - // notation (e.g. `1.2.3.4/29`). - string tpu_ipv4_cidr_block = 116; - - // Which conditions caused the current cluster state. - repeated StatusCondition conditions = 118; } // ClusterUpdate describes an update to the cluster. Exactly one update can @@ -1146,23 +743,13 @@ message Cluster { // provided. message ClusterUpdate { // The Kubernetes version to change the nodes to (typically an - // 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 + // upgrade). Use `-` to upgrade to the latest version supported by + // the server. string desired_node_version = 4; // The monitoring service the cluster should use to write metrics. // Currently available options: // - // * "monitoring.googleapis.com/kubernetes" - the Google Cloud Monitoring - // service with Kubernetes-native resource model in Stackdriver // * "monitoring.googleapis.com" - the Google Cloud Monitoring service // * "none" - no metrics will be exported from the cluster string desired_monitoring_service = 5; @@ -1201,32 +788,9 @@ message ClusterUpdate { // The desired configuration options for the PodSecurityPolicy feature. PodSecurityPolicyConfig desired_pod_security_policy_config = 14; - // Cluster-level autoscaling configuration. - ClusterAutoscaling desired_cluster_autoscaling = 15; - - // The desired configuration options for the Binary Authorization feature. - BinaryAuthorization desired_binary_authorization = 16; - - // The logging service the cluster should use to write metrics. - // Currently available options: - // - // * "logging.googleapis.com/kubernetes" - the Google Cloud Logging - // service with Kubernetes-native resource model in Stackdriver - // * "logging.googleapis.com" - the Google Cloud Logging service - // * "none" - no logs will be exported from the cluster - string desired_logging_service = 19; - // The Kubernetes version to change the master to. The only valid value is the - // 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 + // latest supported version. Use "-" to have the server automatically select + // the latest version. string desired_master_version = 100; } @@ -1312,7 +876,7 @@ message Operation { // [zone](/compute/docs/zones#available) in which the operation // is taking place. // This field is deprecated, use location instead. - string zone = 2 [deprecated = true]; + string zone = 2; // The operation type. Type operation_type = 3; @@ -1345,70 +909,20 @@ message Operation { // [Output only] The time the operation completed, in // [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format. string end_time = 11; - - // [Output only] Progress information for an operation. - OperationProgress progress = 12; - - // Which conditions caused the current cluster state. - repeated StatusCondition cluster_conditions = 13; - - // Which conditions caused the current node pool state. - repeated StatusCondition nodepool_conditions = 14; -} - -// Information about operation (or operation stage) progress. -message OperationProgress { - // Progress metric is (string, int|float|string) pair. - message Metric { - // Metric name, required. - // e.g., "nodes total", "percent done" - string name = 1; - - // Strictly one of the values is required. - oneof value { - // For metrics with integer value. - int64 int_value = 2; - - // For metrics with floating point value. - double double_value = 3; - - // For metrics with custom values (ratios, visual progress, etc.). - string string_value = 4; - } - } - - // A non-parameterized string describing an operation stage. - // Unset for single-stage operations. - string name = 1; - - // Status of an operation stage. - // Unset for single-stage operations. - Operation.Status status = 2; - - // Progress metric bundle, for example: - // metrics: [{name: "nodes done", int_value: 15}, - // {name: "nodes total", int_value: 32}] - // or - // metrics: [{name: "progress", double_value: 0.56}, - // {name: "progress scale", double_value: 1.0}] - repeated Metric metrics = 3; - - // Substages of an operation or a stage. - repeated OperationProgress stages = 4; } // CreateClusterRequest creates a cluster. message CreateClusterRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the parent field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use parent instead. + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the parent field. - string zone = 2 [deprecated = true]; + // This field is deprecated, use parent instead. + string zone = 2; // A [cluster // resource](/container-engine/reference/rest/v1beta1/projects.zones.clusters) @@ -1421,20 +935,20 @@ message CreateClusterRequest { // GetClusterRequest gets the settings of a cluster. message GetClusterRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use name instead. + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + // This field is deprecated, use name instead. + string zone = 2; - // Deprecated. The name of the cluster to retrieve. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster to retrieve. + // This field is deprecated, use name instead. + string cluster_id = 3; // The name (project, location, cluster) of the cluster to retrieve. // Specified in the format 'projects/*/locations/*/clusters/*'. @@ -1443,20 +957,20 @@ message GetClusterRequest { // UpdateClusterRequest updates the settings of a cluster. message UpdateClusterRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use name instead. + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + // This field is deprecated, use name instead. + string zone = 2; - // Deprecated. The name of the cluster to upgrade. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster to upgrade. + // This field is deprecated, use name instead. + string cluster_id = 3; // A description of the update. ClusterUpdate update = 4; @@ -1466,228 +980,6 @@ message UpdateClusterRequest { string name = 5; } -// SetNodePoolVersionRequest updates the version of a node pool. -message UpdateNodePoolRequest { - // Deprecated. The Google Developers Console [project ID or project - // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; - - // Deprecated. The name of the Google Compute Engine - // [zone](/compute/docs/zones#available) in which the cluster - // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; - - // Deprecated. The name of the cluster to upgrade. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; - - // Deprecated. The name of the node pool to upgrade. - // This field has been deprecated and replaced by the name field. - string node_pool_id = 4 [deprecated = true]; - - // The Kubernetes version to change the nodes to (typically an - // 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 - string node_version = 5; - - // The desired image type for the node pool. - string image_type = 6; - - // The name (project, location, cluster, node pool) of the node pool to - // update. Specified in the format - // 'projects/*/locations/*/clusters/*/nodePools/*'. - string name = 8; -} - -// SetNodePoolAutoscalingRequest sets the autoscaler settings of a node pool. -message SetNodePoolAutoscalingRequest { - // Deprecated. The Google Developers Console [project ID or project - // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; - - // Deprecated. The name of the Google Compute Engine - // [zone](/compute/docs/zones#available) in which the cluster - // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; - - // Deprecated. The name of the cluster to upgrade. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; - - // Deprecated. The name of the node pool to upgrade. - // This field has been deprecated and replaced by the name field. - string node_pool_id = 4 [deprecated = true]; - - // Autoscaling configuration for the node pool. - NodePoolAutoscaling autoscaling = 5; - - // The name (project, location, cluster, node pool) of the node pool to set - // autoscaler settings. Specified in the format - // 'projects/*/locations/*/clusters/*/nodePools/*'. - string name = 6; -} - -// SetLoggingServiceRequest sets the logging service of a cluster. -message SetLoggingServiceRequest { - // Deprecated. The Google Developers Console [project ID or project - // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; - - // Deprecated. The name of the Google Compute Engine - // [zone](/compute/docs/zones#available) in which the cluster - // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2; - - // Deprecated. The name of the cluster to upgrade. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; - - // The logging service the cluster should use to write metrics. - // Currently available options: - // - // * "logging.googleapis.com" - the Google Cloud Logging service - // * "none" - no metrics will be exported from the cluster - string logging_service = 4; - - // The name (project, location, cluster) of the cluster to set logging. - // Specified in the format 'projects/*/locations/*/clusters/*'. - string name = 5; -} - -// SetMonitoringServiceRequest sets the monitoring service of a cluster. -message SetMonitoringServiceRequest { - // Deprecated. The Google Developers Console [project ID or project - // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; - - // Deprecated. The name of the Google Compute Engine - // [zone](/compute/docs/zones#available) in which the cluster - // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; - - // Deprecated. The name of the cluster to upgrade. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; - - // The monitoring service the cluster should use to write metrics. - // Currently available options: - // - // * "monitoring.googleapis.com" - the Google Cloud Monitoring service - // * "none" - no metrics will be exported from the cluster - string monitoring_service = 4; - - // The name (project, location, cluster) of the cluster to set monitoring. - // Specified in the format 'projects/*/locations/*/clusters/*'. - string name = 6; -} - -// SetAddonsRequest sets the addons associated with the cluster. -message SetAddonsConfigRequest { - // Deprecated. The Google Developers Console [project ID or project - // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; - - // Deprecated. The name of the Google Compute Engine - // [zone](/compute/docs/zones#available) in which the cluster - // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; - - // Deprecated. The name of the cluster to upgrade. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; - - // The desired configurations for the various addons available to run in the - // cluster. - AddonsConfig addons_config = 4; - - // The name (project, location, cluster) of the cluster to set addons. - // Specified in the format 'projects/*/locations/*/clusters/*'. - string name = 6; -} - -// SetLocationsRequest sets the locations of the cluster. -message SetLocationsRequest { - // Deprecated. The Google Developers Console [project ID or project - // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; - - // Deprecated. The name of the Google Compute Engine - // [zone](/compute/docs/zones#available) in which the cluster - // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; - - // Deprecated. The name of the cluster to upgrade. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; - - // The desired list of Google Compute Engine - // [locations](/compute/docs/zones#available) in which the cluster's nodes - // should be located. Changing the locations a cluster is in will result - // in nodes being either created or removed from the cluster, depending on - // whether locations are being added or removed. - // - // This list must always include the cluster's primary zone. - repeated string locations = 4; - - // The name (project, location, cluster) of the cluster to set locations. - // Specified in the format 'projects/*/locations/*/clusters/*'. - string name = 6; -} - -// UpdateMasterRequest updates the master of the cluster. -message UpdateMasterRequest { - // Deprecated. The Google Developers Console [project ID or project - // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; - - // Deprecated. The name of the Google Compute Engine - // [zone](/compute/docs/zones#available) in which the cluster - // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; - - // Deprecated. The name of the cluster to upgrade. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; - - // 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 - string master_version = 4; - - // The name (project, location, cluster) of the cluster to update. - // Specified in the format 'projects/*/locations/*/clusters/*'. - string name = 7; -} - // SetMasterAuthRequest updates the admin password of a cluster. message SetMasterAuthRequest { // Operation type: what type update to perform. @@ -1708,20 +1000,20 @@ message SetMasterAuthRequest { SET_USERNAME = 3; } - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use name instead. + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + // This field is deprecated, use name instead. + string zone = 2; - // Deprecated. The name of the cluster to upgrade. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster to upgrade. + // This field is deprecated, use name instead. + string cluster_id = 3; // The exact form of action to be taken on the master auth. Action action = 4; @@ -1736,20 +1028,20 @@ message SetMasterAuthRequest { // DeleteClusterRequest deletes a cluster. message DeleteClusterRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use name instead. + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + // This field is deprecated, use name instead. + string zone = 2; - // Deprecated. The name of the cluster to delete. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster to delete. + // This field is deprecated, use name instead. + string cluster_id = 3; // The name (project, location, cluster) of the cluster to delete. // Specified in the format 'projects/*/locations/*/clusters/*'. @@ -1758,16 +1050,16 @@ message DeleteClusterRequest { // ListClustersRequest lists clusters. message ListClustersRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the parent field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use parent instead. + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides, or "-" for all zones. - // This field has been deprecated and replaced by the parent field. - string zone = 2 [deprecated = true]; + // This field is deprecated, use parent instead. + string zone = 2; // The parent (project and location) where the clusters will be listed. // Specified in the format 'projects/*/locations/*'. @@ -1788,20 +1080,20 @@ message ListClustersResponse { // GetOperationRequest gets a single operation. message GetOperationRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use name instead. + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + // This field is deprecated, use name instead. + string zone = 2; - // Deprecated. The server-assigned `name` of the operation. - // This field has been deprecated and replaced by the name field. - string operation_id = 3 [deprecated = true]; + // The server-assigned `name` of the operation. + // This field is deprecated, use name instead. + string operation_id = 3; // The name (project, location, operation id) of the operation to get. // Specified in the format 'projects/*/locations/*/operations/*'. @@ -1810,15 +1102,15 @@ message GetOperationRequest { // ListOperationsRequest lists operations. message ListOperationsRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the parent field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use parent instead. + string project_id = 1; - // 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. - string zone = 2 [deprecated = true]; + // The name of the Google Compute Engine [zone](/compute/docs/zones#available) + // to return operations for, or `-` for all zones. + // This field is deprecated, use parent instead. + string zone = 2; // The parent (project and location) where the operations will be listed. // Specified in the format 'projects/*/locations/*'. @@ -1828,19 +1120,19 @@ message ListOperationsRequest { // CancelOperationRequest cancels a single operation. message CancelOperationRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use name instead. + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the operation resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + // This field is deprecated, use name instead. + string zone = 2; - // Deprecated. The server-assigned `name` of the operation. - // This field has been deprecated and replaced by the name field. - string operation_id = 3 [deprecated = true]; + // The server-assigned `name` of the operation. + // This field is deprecated, use name instead. + string operation_id = 3; // The name (project, location, operation id) of the operation to cancel. // Specified in the format 'projects/*/locations/*/operations/*'. @@ -1857,24 +1149,24 @@ message ListOperationsResponse { repeated string missing_zones = 2; } -// Gets the current Kubernetes Engine service configuration. +// Gets the current Container Engine service configuration. message GetServerConfigRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use name instead. + string project_id = 1; - // Deprecated. The name of the Google Compute Engine - // [zone](/compute/docs/zones#available) to return operations for. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + // The name of the Google Compute Engine [zone](/compute/docs/zones#available) + // to return operations for. + // This field is deprecated, use name instead. + string zone = 2; // The name (project and location) of the server config to get // Specified in the format 'projects/*/locations/*'. string name = 4; } -// Kubernetes Engine service configuration. +// Container Engine service configuration. message ServerConfig { // Version of Kubernetes the service deploys by default. string default_cluster_version = 1; @@ -1894,103 +1186,100 @@ message ServerConfig { // CreateNodePoolRequest creates a node pool for a cluster. message CreateNodePoolRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://developers.google.com/console/help/new/#projectnumber). - // This field has been deprecated and replaced by the parent field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use parent instead. + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the parent field. - string zone = 2 [deprecated = true]; + // This field is deprecated, use parent instead. + string zone = 2; - // Deprecated. The name of the cluster. - // This field has been deprecated and replaced by the parent field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster. + // This field is deprecated, use parent instead. + string cluster_id = 3; // The node pool to create. NodePool node_pool = 4; - // The parent (project, location, cluster id) where the node pool will be - // created. Specified in the format - // 'projects/*/locations/*/clusters/*'. + // The parent (project, location, cluster id) where the node pool will be created. + // Specified in the format 'projects/*/locations/*/clusters/*/nodePools/*'. string parent = 6; } // DeleteNodePoolRequest deletes a node pool for a cluster. message DeleteNodePoolRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://developers.google.com/console/help/new/#projectnumber). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use name instead. + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + // This field is deprecated, use name instead. + string zone = 2; - // Deprecated. The name of the cluster. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster. + // This field is deprecated, use name instead. + string cluster_id = 3; - // Deprecated. The name of the node pool to delete. - // This field has been deprecated and replaced by the name field. - string node_pool_id = 4 [deprecated = true]; + // The name of the node pool to delete. + // This field is deprecated, use name instead. + string node_pool_id = 4; - // The name (project, location, cluster, node pool id) of the node pool to - // delete. Specified in the format - // 'projects/*/locations/*/clusters/*/nodePools/*'. + // The name (project, location, cluster, node pool id) of the node pool to delete. + // Specified in the format 'projects/*/locations/*/clusters/*/nodePools/*'. string name = 6; } // ListNodePoolsRequest lists the node pool(s) for a cluster. message ListNodePoolsRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://developers.google.com/console/help/new/#projectnumber). - // This field has been deprecated and replaced by the parent field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use parent instead. + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the parent field. - string zone = 2 [deprecated = true]; + // This field is deprecated, use parent instead. + string zone = 2; - // Deprecated. The name of the cluster. - // This field has been deprecated and replaced by the parent field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster. + // This field is deprecated, use parent instead. + string cluster_id = 3; - // The parent (project, location, cluster id) where the node pools will be - // listed. Specified in the format 'projects/*/locations/*/clusters/*'. + // The parent (project, location, cluster id) where the node pools will be listed. + // Specified in the format 'projects/*/locations/*/clusters/*'. string parent = 5; } // GetNodePoolRequest retrieves a node pool for a cluster. message GetNodePoolRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://developers.google.com/console/help/new/#projectnumber). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use name instead. + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + // This field is deprecated, use name instead. + string zone = 2; - // Deprecated. The name of the cluster. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster. + // This field is deprecated, use name instead. + string cluster_id = 3; - // Deprecated. The name of the node pool. - // This field has been deprecated and replaced by the name field. - string node_pool_id = 4 [deprecated = true]; + // The name of the node pool. + // This field is deprecated, use name instead. + string node_pool_id = 4; - // The name (project, location, cluster, node pool id) of the node pool to - // get. Specified in the format - // 'projects/*/locations/*/clusters/*/nodePools/*'. + // The name (project, location, cluster, node pool id) of the node pool to get. + // Specified in the format 'projects/*/locations/*/clusters/*/nodePools/*'. string name = 6; } @@ -2047,12 +1336,12 @@ message NodePool { // [Output only] Server-defined URL for the resource. string self_link = 100; - // The version of the Kubernetes of this node. + // [Output only] The version of the Kubernetes of this node. string version = 101; - // [Output only] The resource URLs of the [managed instance - // groups](/compute/docs/instance-groups/creating-groups-of-managed-instances) - // associated with this node pool. + // [Output only] The resource URLs of [instance + // groups](/compute/docs/instance-groups/) associated with this + // node pool. repeated string instance_group_urls = 102; // [Output only] The status of the nodes in this pool instance. @@ -2068,13 +1357,6 @@ message NodePool { // NodeManagement configuration for this NodePool. NodeManagement management = 5; - - // The constraint on the maximum number of pods that can be run - // simultaneously on a node in the node pool. - MaxPodsConstraint max_pods_constraint = 6; - - // Which conditions caused the current node pool state. - repeated StatusCondition conditions = 105; } // NodeManagement defines the set of node management services turned on for the @@ -2133,24 +1415,24 @@ message DailyMaintenanceWindow { // SetNodePoolManagementRequest sets the node management properties of a node // pool. message SetNodePoolManagementRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use name instead. + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + // This field is deprecated, use name instead. + string zone = 2; - // Deprecated. The name of the cluster to update. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster to update. + // This field is deprecated, use name instead. + string cluster_id = 3; - // Deprecated. The name of the node pool to update. - // This field has been deprecated and replaced by the name field. - string node_pool_id = 4 [deprecated = true]; + // The name of the node pool to update. + // This field is deprecated, use name instead. + string node_pool_id = 4; // NodeManagement configuration for the node pool. NodeManagement management = 5; @@ -2161,59 +1443,28 @@ message SetNodePoolManagementRequest { string name = 7; } -// SetNodePoolSizeRequest sets the size a node -// pool. -message SetNodePoolSizeRequest { - // Deprecated. The Google Developers Console [project ID or project - // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; - - // Deprecated. The name of the Google Compute Engine - // [zone](/compute/docs/zones#available) in which the cluster - // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; - - // Deprecated. The name of the cluster to update. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; - - // Deprecated. The name of the node pool to update. - // This field has been deprecated and replaced by the name field. - string node_pool_id = 4 [deprecated = true]; - - // The desired node count for the pool. - int32 node_count = 5; - - // The name (project, location, cluster, node pool id) of the node pool to set - // size. - // Specified in the format 'projects/*/locations/*/clusters/*/nodePools/*'. - string name = 7; -} - // RollbackNodePoolUpgradeRequest rollbacks the previously Aborted or Failed // NodePool upgrade. This will be an no-op if the last upgrade successfully // completed. message RollbackNodePoolUpgradeRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use name instead. + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + // This field is deprecated, use name instead. + string zone = 2; - // Deprecated. The name of the cluster to rollback. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster to rollback. + // This field is deprecated, use name instead. + string cluster_id = 3; - // Deprecated. The name of the node pool to rollback. - // This field has been deprecated and replaced by the name field. - string node_pool_id = 4 [deprecated = true]; + // The name of the node pool to rollback. + // This field is deprecated, use name instead. + string node_pool_id = 4; // The name (project, location, cluster, node pool id) of the node poll to // rollback upgrade. @@ -2227,32 +1478,6 @@ message ListNodePoolsResponse { repeated NodePool node_pools = 1; } -// ClusterAutoscaling contains global, per-cluster information -// required by Cluster Autoscaler to automatically adjust -// the size of the cluster and create/delete -// node pools based on the current needs. -message ClusterAutoscaling { - // Enables automatic node pool creation and deletion. - bool enable_node_autoprovisioning = 1; - - // Contains global constraints regarding minimum and maximum - // amount of resources in the cluster. - repeated ResourceLimit resource_limits = 2; -} - -// Contains information about amount of some resource in the cluster. -// For memory, value should be in GB. -message ResourceLimit { - // Resource name "cpu", "memory" or gpu-specific string. - string resource_type = 1; - - // Minimum amount of the resource in the cluster. - int64 minimum = 2; - - // Maximum amount of the resource in the cluster. - int64 maximum = 3; -} - // NodePoolAutoscaling contains information required by cluster autoscaler to // adjust the size of the node pool to the current cluster usage. message NodePoolAutoscaling { @@ -2266,36 +1491,33 @@ message NodePoolAutoscaling { // Maximum number of nodes in the NodePool. Must be >= min_node_count. There // has to enough quota to scale up the cluster. int32 max_node_count = 3; - - // Can this node pool be deleted automatically. - bool autoprovisioned = 4; } // SetLabelsRequest sets the Google Cloud Platform labels on a Google Container // Engine cluster, which will in turn set them for Google Compute Engine // resources used by that cluster message SetLabelsRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://developers.google.com/console/help/new/#projectnumber). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use name instead. + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + // This field is deprecated, use name instead. + string zone = 2; - // Deprecated. The name of the cluster. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster. + // This field is deprecated, use name instead. + string cluster_id = 3; // The labels to set for that cluster. map resource_labels = 4; // The fingerprint of the previous set of labels for this resource, // used to detect conflicts. The fingerprint is initially generated by - // Kubernetes Engine and changes after every request to modify or update + // Container Engine and changes after every request to modify or update // labels. You must always provide an up-to-date fingerprint hash when // updating or changing labels. Make a get() request to the // resource to get the latest fingerprint. @@ -2309,20 +1531,20 @@ message SetLabelsRequest { // SetLegacyAbacRequest enables or disables the ABAC authorization mechanism for // a cluster. message SetLegacyAbacRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://support.google.com/cloud/answer/6158840). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use name instead. + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + // This field is deprecated, use name instead. + string zone = 2; - // Deprecated. The name of the cluster to update. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster to update. + // This field is deprecated, use name instead. + string cluster_id = 3; // Whether ABAC authorization will be enabled in the cluster. bool enabled = 4; @@ -2335,48 +1557,45 @@ message SetLegacyAbacRequest { // StartIPRotationRequest creates a new IP for the cluster and then performs // a node upgrade on each node pool to point to the new IP. message StartIPRotationRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://developers.google.com/console/help/new/#projectnumber). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use name instead. + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + // This field is deprecated, use name instead. + string zone = 2; - // Deprecated. The name of the cluster. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster. + // This field is deprecated, use name instead. + string cluster_id = 3; - // The name (project, location, cluster id) of the cluster to start IP - // rotation. Specified in the format 'projects/*/locations/*/clusters/*'. + // The name (project, location, cluster id) of the cluster to start IP rotation. + // Specified in the format 'projects/*/locations/*/clusters/*'. string name = 6; - - // Whether to rotate credentials during IP rotation. - bool rotate_credentials = 7; } // CompleteIPRotationRequest moves the cluster master back into single-IP mode. message CompleteIPRotationRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://developers.google.com/console/help/new/#projectnumber). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use name instead. + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + // This field is deprecated, use name instead. + string zone = 2; - // Deprecated. The name of the cluster. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster. + // This field is deprecated, use name instead. + string cluster_id = 3; - // The name (project, location, cluster id) of the cluster to complete IP - // rotation. Specified in the format 'projects/*/locations/*/clusters/*'. + // The name (project, location, cluster id) of the cluster to complete IP rotation. + // Specified in the format 'projects/*/locations/*/clusters/*'. string name = 7; } @@ -2390,56 +1609,28 @@ message AcceleratorConfig { string accelerator_type = 2; } -// WorkloadMetadataConfig defines the metadata configuration to expose to -// workloads on the node pool. -message WorkloadMetadataConfig { - // NodeMetadata is the configuration for if and how to expose the node - // metadata to the workload running on the node. - enum NodeMetadata { - // Not set. - UNSPECIFIED = 0; - - // Prevent workloads not in hostNetwork from accessing certain VM metadata, - // specifically kube-env, which contains Kubelet credentials, and the - // instance identity token. - // - // Metadata concealment is a temporary security solution available while the - // bootstrapping process for cluster nodes is being redesigned with - // significant security improvements. This feature is scheduled to be - // deprecated in the future and later removed. - SECURE = 1; - - // Expose all VM metadata to pods. - EXPOSE = 2; - } - - // NodeMetadata is the configuration for how to expose the node metadata to - // the workload running on the node. - NodeMetadata node_metadata = 1; -} - // SetNetworkPolicyRequest enables/disables network policy for a cluster. message SetNetworkPolicyRequest { - // Deprecated. The Google Developers Console [project ID or project + // The Google Developers Console [project ID or project // number](https://developers.google.com/console/help/new/#projectnumber). - // This field has been deprecated and replaced by the name field. - string project_id = 1 [deprecated = true]; + // This field is deprecated, use name instead. + string project_id = 1; - // Deprecated. The name of the Google Compute Engine + // The name of the Google Compute Engine // [zone](/compute/docs/zones#available) in which the cluster // resides. - // This field has been deprecated and replaced by the name field. - string zone = 2 [deprecated = true]; + // This field is deprecated, use name instead. + string zone = 2; - // Deprecated. The name of the cluster. - // This field has been deprecated and replaced by the name field. - string cluster_id = 3 [deprecated = true]; + // The name of the cluster. + // This field is deprecated, use name instead. + string cluster_id = 3; // Configuration options for the NetworkPolicy feature. NetworkPolicy network_policy = 4; - // The name (project, location, cluster id) of the cluster to set networking - // policy. Specified in the format 'projects/*/locations/*/clusters/*'. + // The name (project, location, cluster id) of the cluster to set networking policy. + // Specified in the format 'projects/*/locations/*/clusters/*'. string name = 6; } @@ -2466,190 +1657,3 @@ message SetMaintenancePolicyRequest { // Specified in the format 'projects/*/locations/*/clusters/*'. string name = 5; } - -// ListLocationsRequest is used to request the locations that offer GKE. -message ListLocationsRequest { - // Contains the name of the resource requested. - // Specified in the format 'projects/*'. - string parent = 1; -} - -// ListLocationsResponse returns the list of all GKE locations and their -// recommendation state. -message ListLocationsResponse { - // A full list of GKE locations. - repeated Location locations = 1; - - // 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). - string next_page_token = 2; -} - -// Location returns the location name, and if the location is recommended -// for GKE cluster scheduling. -message Location { - // LocationType is the type of GKE location, regional or zonal. - enum LocationType { - // LOCATION_TYPE_UNSPECIFIED means the location type was not determined. - LOCATION_TYPE_UNSPECIFIED = 0; - - // A GKE Location where Zonal clusters can be created. - ZONE = 1; - - // A GKE Location where Regional clusters can be created. - REGION = 2; - } - - // Contains the type of location this Location is for. - // Regional or Zonal. - LocationType type = 1; - - // Contains the name of the resource requested. - // Specified in the format 'projects/*/locations/*'. - string name = 2; - - // Whether the location is recomended for GKE cluster scheduling. - bool recommended = 3; -} - -// StatusCondition describes why a cluster or a node pool has a certain status -// (e.g., ERROR or DEGRADED). -message StatusCondition { - // Code for each condition - enum Code { - // UNKNOWN indicates a generic condition. - UNKNOWN = 0; - - // GCE_STOCKOUT indicates a GCE stockout. - GCE_STOCKOUT = 1; - - // GKE_SERVICE_ACCOUNT_DELETED indicates that the user deleted their robot - // service account. - // More codes TBA - GKE_SERVICE_ACCOUNT_DELETED = 2; - } - - // Machine-friendly representation of the condition - Code code = 1; - - // Human-friendly representation of the condition - string message = 2; -} - -// NetworkConfig reports the relative names of network & subnetwork. -message NetworkConfig { - // Output only. The relative name of the Google Compute Engine - // [network][google.container.v1beta1.NetworkConfig.network](/compute/docs/networks-and-firewalls#networks) to which - // the cluster is connected. - // Example: projects/my-project/global/networks/my-network - string network = 1; - - // Output only. The relative name of the Google Compute Engine - // [subnetwork](/compute/docs/vpc) to which the cluster is connected. - // Example: projects/my-project/regions/us-central1/subnetworks/my-subnet - string subnetwork = 2; -} - -// ListUsableSubnetworksRequest requests the list of usable subnetworks. -// available to a user for creating clusters. -message ListUsableSubnetworksRequest { - // The parent project where subnetworks are usable. - // Specified in the format 'projects/*'. - string parent = 1; - - // 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. - string filter = 2; - - // 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) - int32 page_size = 3; - - // Specifies a page token to use. Set this to the nextPageToken returned by - // previous list requests to get the next page of results. - string page_token = 4; -} - -// ListUsableSubnetworksResponse is the response of -// ListUsableSubnetworksRequest. -message ListUsableSubnetworksResponse { - // A list of usable subnetworks in the specified network project. - repeated UsableSubnetwork subnetworks = 1; - - // 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. - string next_page_token = 2; -} - -// Secondary IP range of a usable subnetwork. -message UsableSubnetworkSecondaryRange { - // Status shows the current usage of a secondary IP range. - enum Status { - // UNKNOWN is the zero value of the Status enum. It's not a valid status. - UNKNOWN = 0; - - // UNUSED denotes that this range is unclaimed by any cluster. - UNUSED = 1; - - // IN_USE_SERVICE denotes that this range is claimed by a cluster for - // services. It cannot be used for other clusters. - IN_USE_SERVICE = 2; - - // IN_USE_SHAREABLE_POD denotes this range was created by the network admin - // and is currently claimed by a cluster for pods. It can only be used by - // other clusters as a pod range. - IN_USE_SHAREABLE_POD = 3; - - // IN_USE_MANAGED_POD denotes this range was created by GKE and is claimed - // for pods. It cannot be used for other clusters. - IN_USE_MANAGED_POD = 4; - } - - // The name associated with this subnetwork secondary range, used when adding - // an alias IP range to a VM instance. - string range_name = 1; - - // The range of IP addresses belonging to this subnetwork secondary range. - string ip_cidr_range = 2; - - // This field is to determine the status of the secondary range programmably. - Status status = 3; -} - -// UsableSubnetwork resource returns the subnetwork name, its associated network -// and the primary CIDR range. -message UsableSubnetwork { - // Subnetwork Name. - // Example: projects/my-project/regions/us-central1/subnetworks/my-subnet - string subnetwork = 1; - - // Network Name. - // Example: projects/my-project/global/networks/my-network - string network = 2; - - // The range of internal addresses that are owned by this subnetwork. - string ip_cidr_range = 3; - - // Secondary IP ranges. - repeated UsableSubnetworkSecondaryRange secondary_ip_ranges = 4; - - // A human readable status message representing the reasons for cases where - // the caller cannot use the secondary ranges under the subnet. For example if - // the secondary_ip_ranges is empty due to a permission issue, an insufficient - // permission message will be given by status_message. - string status_message = 5; -} - -// Constraints applied to pods. -message MaxPodsConstraint { - // Constraint enforced on the max num of pods per node. - int64 max_pods_per_node = 1; -}