Skip to content

Commit

Permalink
chore: reformat protos (#3863)
Browse files Browse the repository at this point in the history 
* feat: Add support for viewing the subnet IPv6 CIDR and services IPv6 CIDR assigned to dual stack clusters

PiperOrigin-RevId: 502669678

Source-Link: googleapis/googleapis@1f62a66

Source-Link: googleapis/googleapis-gen@f6f86f6
Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNvbnRhaW5lci8uT3dsQm90LnlhbWwiLCJoIjoiZjZmODZmNjMzOGU1OTM4OTI0OWRmNWQ0MWE5ZWUzNmZiOTQxZDFhZSJ9

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* chore: reformat protos

PiperOrigin-RevId: 502669926

Source-Link: googleapis/googleapis@d8ee340

Source-Link: googleapis/googleapis-gen@abbc782
Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNvbnRhaW5lci8uT3dsQm90LnlhbWwiLCJoIjoiYWJiYzc4MjQ1NzE4ZWY2MzQ3MGE4ZjlkMjY5M2Y0MDU5MjM3OGU0OCJ9

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
Co-authored-by: sofisl <55454395+sofisl@users.noreply.github.com>
  • Loading branch information
@gcf-owl-bot @sofisl
3 people authored Jan 23, 2023
1 parent 94afe03 commit ffc0090
Show file tree
Hide file tree
Showing 47 changed files with 382 additions and 475 deletions.
4 changes: 2 additions & 2 deletions packages/google-container/.jsdoc.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2022 Google LLC
// Copyright 2023 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -40,7 +40,7 @@ module.exports = {
includePattern: '\\.js$'
},
templates: {
copyright: 'Copyright 2022 Google LLC',
copyright: 'Copyright 2023 Google LLC',
includeDate: false,
sourceFiles: false,
systemName: '@google-cloud/container',
Expand Down
83 changes: 54 additions & 29 deletions packages/google-container/protos/google/container/v1/cluster_service.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ option (google.api.resource_definition) = {
// Google Kubernetes Engine Cluster Manager v1
service ClusterManager {
option (google.api.default_host) = "container.googleapis.com";
option (google.api.oauth_scopes) = "https://www.googleapis.com/auth/cloud-platform";
option (google.api.oauth_scopes) =
"https://www.googleapis.com/auth/cloud-platform";

// Lists all clusters owned by a project in either the specified zone or all
// zones.
Expand Down Expand Up @@ -123,7 +124,8 @@ service ClusterManager {
}

// Sets the autoscaling settings for the specified node pool.
rpc SetNodePoolAutoscaling(SetNodePoolAutoscalingRequest) returns (Operation) {
rpc SetNodePoolAutoscaling(SetNodePoolAutoscalingRequest)
returns (Operation) {
option (google.api.http) = {
post: "/v1/{name=projects/*/locations/*/clusters/*/nodePools/*}:setAutoscaling"
body: "*"
Expand All @@ -144,7 +146,8 @@ service ClusterManager {
body: "*"
}
};
option (google.api.method_signature) = "project_id,zone,cluster_id,logging_service";
option (google.api.method_signature) =
"project_id,zone,cluster_id,logging_service";
option (google.api.method_signature) = "name,logging_service";
}

Expand All @@ -158,7 +161,8 @@ service ClusterManager {
body: "*"
}
};
option (google.api.method_signature) = "project_id,zone,cluster_id,monitoring_service";
option (google.api.method_signature) =
"project_id,zone,cluster_id,monitoring_service";
option (google.api.method_signature) = "name,monitoring_service";
}

Expand All @@ -172,7 +176,8 @@ service ClusterManager {
body: "*"
}
};
option (google.api.method_signature) = "project_id,zone,cluster_id,addons_config";
option (google.api.method_signature) =
"project_id,zone,cluster_id,addons_config";
option (google.api.method_signature) = "name,addons_config";
}

Expand All @@ -190,7 +195,8 @@ service ClusterManager {
body: "*"
}
};
option (google.api.method_signature) = "project_id,zone,cluster_id,locations";
option (google.api.method_signature) =
"project_id,zone,cluster_id,locations";
option (google.api.method_signature) = "name,locations";
}

Expand All @@ -204,7 +210,8 @@ service ClusterManager {
body: "*"
}
};
option (google.api.method_signature) = "project_id,zone,cluster_id,master_version";
option (google.api.method_signature) =
"project_id,zone,cluster_id,master_version";
option (google.api.method_signature) = "name,master_version";
}

Expand Down Expand Up @@ -321,7 +328,8 @@ service ClusterManager {
get: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools/{node_pool_id}"
}
};
option (google.api.method_signature) = "project_id,zone,cluster_id,node_pool_id";
option (google.api.method_signature) =
"project_id,zone,cluster_id,node_pool_id";
option (google.api.method_signature) = "name";
}

Expand All @@ -335,7 +343,8 @@ service ClusterManager {
body: "*"
}
};
option (google.api.method_signature) = "project_id,zone,cluster_id,node_pool";
option (google.api.method_signature) =
"project_id,zone,cluster_id,node_pool";
option (google.api.method_signature) = "parent,node_pool";
}

Expand All @@ -347,13 +356,15 @@ service ClusterManager {
delete: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools/{node_pool_id}"
}
};
option (google.api.method_signature) = "project_id,zone,cluster_id,node_pool_id";
option (google.api.method_signature) =
"project_id,zone,cluster_id,node_pool_id";
option (google.api.method_signature) = "name";
}

// CompleteNodePoolUpgrade will signal an on-going node pool upgrade to
// complete.
rpc CompleteNodePoolUpgrade(CompleteNodePoolUpgradeRequest) returns (google.protobuf.Empty) {
rpc CompleteNodePoolUpgrade(CompleteNodePoolUpgradeRequest)
returns (google.protobuf.Empty) {
option (google.api.http) = {
post: "/v1/{name=projects/*/locations/*/clusters/*/nodePools/*}:completeUpgrade"
body: "*"
Expand All @@ -362,7 +373,8 @@ service ClusterManager {

// Rolls back a previously Aborted or Failed NodePool upgrade.
// This makes no changes if the last upgrade successfully completed.
rpc RollbackNodePoolUpgrade(RollbackNodePoolUpgradeRequest) returns (Operation) {
rpc RollbackNodePoolUpgrade(RollbackNodePoolUpgradeRequest)
returns (Operation) {
option (google.api.http) = {
post: "/v1/{name=projects/*/locations/*/clusters/*/nodePools/*}:rollback"
body: "*"
Expand All @@ -371,7 +383,8 @@ service ClusterManager {
body: "*"
}
};
option (google.api.method_signature) = "project_id,zone,cluster_id,node_pool_id";
option (google.api.method_signature) =
"project_id,zone,cluster_id,node_pool_id";
option (google.api.method_signature) = "name";
}

Expand Down Expand Up @@ -465,7 +478,8 @@ service ClusterManager {
body: "*"
}
};
option (google.api.method_signature) = "project_id,zone,cluster_id,network_policy";
option (google.api.method_signature) =
"project_id,zone,cluster_id,network_policy";
option (google.api.method_signature) = "name,network_policy";
}

Expand All @@ -479,12 +493,14 @@ service ClusterManager {
body: "*"
}
};
option (google.api.method_signature) = "project_id,zone,cluster_id,maintenance_policy";
option (google.api.method_signature) =
"project_id,zone,cluster_id,maintenance_policy";
option (google.api.method_signature) = "name,maintenance_policy";
}

// Lists subnetworks that are usable for creating clusters in a project.
rpc ListUsableSubnetworks(ListUsableSubnetworksRequest) returns (ListUsableSubnetworksResponse) {
rpc ListUsableSubnetworks(ListUsableSubnetworksRequest)
returns (ListUsableSubnetworksResponse) {
option (google.api.http) = {
get: "/v1/{parent=projects/*}/aggregated/usableSubnetworks"
};
Expand Down Expand Up @@ -1439,6 +1455,15 @@ message IPAllocationPolicy {

// The ipv6 access type (internal or external) when create_subnetwork is true
IPv6AccessType ipv6_access_type = 17;

// Output only. [Output only] The subnet's IPv6 CIDR block used by nodes and
// pods.
string subnet_ipv6_cidr_block = 22
[(google.api.field_behavior) = OUTPUT_ONLY];

// Output only. [Output only] The services IPv6 CIDR block for the cluster.
string services_ipv6_cidr_block = 23
[(google.api.field_behavior) = OUTPUT_ONLY];
}

// A Google Kubernetes Engine cluster.
Expand Down Expand Up @@ -2092,10 +2117,8 @@ message Operation {

// Output only. If an error has occurred, a textual description of the error.
// Deprecated. Use the field error instead.
string status_message = 5 [
deprecated = true,
(google.api.field_behavior) = OUTPUT_ONLY
];
string status_message = 5
[deprecated = true, (google.api.field_behavior) = OUTPUT_ONLY];

// Server-defined URL for the resource.
string self_link = 6;
Expand Down Expand Up @@ -2467,8 +2490,8 @@ message SetAddonsConfigRequest {
// This field has been deprecated and replaced by the name field.
string cluster_id = 3 [deprecated = true];

// Required. The desired configurations for the various addons available to run in the
// cluster.
// Required. The desired configurations for the various addons available to
// run in the cluster.
AddonsConfig addons_config = 4 [(google.api.field_behavior) = REQUIRED];

// The name (project, location, cluster) of the cluster to set addons.
Expand Down Expand Up @@ -3141,8 +3164,8 @@ message NodePool {
// Specifies the node placement policy.
PlacementPolicy placement_policy = 108;

// Output only. [Output only] Update info contains relevant information during a node
// pool update.
// Output only. [Output only] Update info contains relevant information during
// a node pool update.
UpdateInfo update_info = 109 [(google.api.field_behavior) = OUTPUT_ONLY];

// This checksum is computed by the server based on the value of node pool
Expand Down Expand Up @@ -3588,7 +3611,8 @@ message SetLabelsRequest {
string cluster_id = 3 [deprecated = true];

// Required. The labels to set for that cluster.
map<string, string> resource_labels = 4 [(google.api.field_behavior) = REQUIRED];
map<string, string> resource_labels = 4
[(google.api.field_behavior) = REQUIRED];

// Required. The fingerprint of the previous set of labels for this resource,
// used to detect conflicts. The fingerprint is initially generated by
Expand Down Expand Up @@ -3780,7 +3804,8 @@ message SetMaintenancePolicyRequest {

// Required. The maintenance policy to be set for the cluster. An empty field
// clears the existing maintenance policy.
MaintenancePolicy maintenance_policy = 4 [(google.api.field_behavior) = REQUIRED];
MaintenancePolicy maintenance_policy = 4
[(google.api.field_behavior) = REQUIRED];

// The name (project, location, cluster name) of the cluster to set
// maintenance policy.
Expand Down Expand Up @@ -4329,9 +4354,9 @@ message NotificationConfig {

// The desired Pub/Sub topic to which notifications will be
// sent by GKE. Format is `projects/{project}/topics/{topic}`.
string topic = 2 [(google.api.resource_reference) = {
type: "pubsub.googleapis.com/Topic"
}];
string topic = 2 [
(google.api.resource_reference) = { type: "pubsub.googleapis.com/Topic" }
];

// Allows filtering to one or more specific event types. If no filter is
// specified, or if a filter is specified with no event types, all event
Expand Down
Loading

0 comments on commit ffc0090

Please sign in to comment.