Skip to content

Commit

Permalink
feat: [container] Add field for enabled Beta K8s APIs in proto (#8960)
Browse files Browse the repository at this point in the history
* feat: Add field for enabled Beta K8s APIs in proto

---
feat: add etags for cluster and node pool update operations

Clients may now optionally specify the previously read etag for a cluster or node pool during update requests. The etag is regenerated every time the object is updated. If an etag is provided, it will be checked against the current etag, and the request will be rejected on mismatch. This is particularly useful for allowing two clients to concurrently update a repeated field without overwriting each other.

PiperOrigin-RevId: 500787735

Source-Link: googleapis/googleapis@961d1ee

Source-Link: https://github.com/googleapis/googleapis-gen/commit/6d95a0e2be7fb65cfee8b49a29c0e21acf673195
Copy-Tag: eyJwIjoiamF2YS1jb250YWluZXIvLk93bEJvdC55YW1sIiwiaCI6IjZkOTVhMGUyYmU3ZmI2NWNmZWU4YjQ5YTI5YzBlMjFhY2Y2NzMxOTUifQ==

* 🦉 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>
  • Loading branch information
gcf-owl-bot[bot] and gcf-owl-bot[bot] authored Jan 10, 2023
1 parent 649c09b commit d52e525
Show file tree
Hide file tree
Showing 80 changed files with 2,694 additions and 1,777 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -683,6 +683,7 @@ public final UnaryCallable<UpdateClusterRequest, Operation> updateClusterCallabl
* .setGcfsConfig(GcfsConfig.newBuilder().build())
* .setConfidentialNodes(ConfidentialNodes.newBuilder().build())
* .setGvnic(VirtualNIC.newBuilder().build())
* .setEtag("etag3123477")
* .setFastSocket(FastSocket.newBuilder().build())
* .setLoggingConfig(NodePoolLoggingConfig.newBuilder().build())
* .setResourceLabels(ResourceLabels.newBuilder().build())
Expand Down Expand Up @@ -733,6 +734,7 @@ public final Operation updateNodePool(UpdateNodePoolRequest request) {
* .setGcfsConfig(GcfsConfig.newBuilder().build())
* .setConfidentialNodes(ConfidentialNodes.newBuilder().build())
* .setGvnic(VirtualNIC.newBuilder().build())
* .setEtag("etag3123477")
* .setFastSocket(FastSocket.newBuilder().build())
* .setLoggingConfig(NodePoolLoggingConfig.newBuilder().build())
* .setResourceLabels(ResourceLabels.newBuilder().build())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,7 @@ public void getClusterTest() throws Exception {
.setMonitoringConfig(MonitoringConfig.newBuilder().build())
.setNodePoolAutoConfig(NodePoolAutoConfig.newBuilder().build())
.setProtectConfig(ProtectConfig.newBuilder().build())
.setEtag("etag3123477")
.build();
mockClusterManager.addResponse(expectedResponse);

Expand Down Expand Up @@ -497,6 +498,7 @@ public void updateNodePoolTest() throws Exception {
.setGcfsConfig(GcfsConfig.newBuilder().build())
.setConfidentialNodes(ConfidentialNodes.newBuilder().build())
.setGvnic(VirtualNIC.newBuilder().build())
.setEtag("etag3123477")
.setFastSocket(FastSocket.newBuilder().build())
.setLoggingConfig(NodePoolLoggingConfig.newBuilder().build())
.setResourceLabels(ResourceLabels.newBuilder().build())
Expand Down Expand Up @@ -530,6 +532,7 @@ public void updateNodePoolTest() throws Exception {
Assert.assertEquals(request.getGcfsConfig(), actualRequest.getGcfsConfig());
Assert.assertEquals(request.getConfidentialNodes(), actualRequest.getConfidentialNodes());
Assert.assertEquals(request.getGvnic(), actualRequest.getGvnic());
Assert.assertEquals(request.getEtag(), actualRequest.getEtag());
Assert.assertEquals(request.getFastSocket(), actualRequest.getFastSocket());
Assert.assertEquals(request.getLoggingConfig(), actualRequest.getLoggingConfig());
Assert.assertEquals(request.getResourceLabels(), actualRequest.getResourceLabels());
Expand Down Expand Up @@ -567,6 +570,7 @@ public void updateNodePoolExceptionTest() throws Exception {
.setGcfsConfig(GcfsConfig.newBuilder().build())
.setConfidentialNodes(ConfidentialNodes.newBuilder().build())
.setGvnic(VirtualNIC.newBuilder().build())
.setEtag("etag3123477")
.setFastSocket(FastSocket.newBuilder().build())
.setLoggingConfig(NodePoolLoggingConfig.newBuilder().build())
.setResourceLabels(ResourceLabels.newBuilder().build())
Expand Down Expand Up @@ -1359,6 +1363,7 @@ public void getNodePoolTest() throws Exception {
.setUpgradeSettings(NodePool.UpgradeSettings.newBuilder().build())
.setPlacementPolicy(NodePool.PlacementPolicy.newBuilder().build())
.setUpdateInfo(NodePool.UpdateInfo.newBuilder().build())
.setEtag("etag3123477")
.build();
mockClusterManager.addResponse(expectedResponse);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ public com.google.protobuf.ByteString getGpuPartitionSizeBytes() {
* <code>int64 max_time_shared_clients_per_gpu = 4 [deprecated = true];</code>
*
* @deprecated google.container.v1beta1.AcceleratorConfig.max_time_shared_clients_per_gpu is
* deprecated. See google/container/v1beta1/cluster_service.proto;l=4237
* deprecated. See google/container/v1beta1/cluster_service.proto;l=4257
* @return The maxTimeSharedClientsPerGpu.
*/
@java.lang.Override
Expand Down Expand Up @@ -998,7 +998,7 @@ public Builder setGpuPartitionSizeBytes(com.google.protobuf.ByteString value) {
* <code>int64 max_time_shared_clients_per_gpu = 4 [deprecated = true];</code>
*
* @deprecated google.container.v1beta1.AcceleratorConfig.max_time_shared_clients_per_gpu is
* deprecated. See google/container/v1beta1/cluster_service.proto;l=4237
* deprecated. See google/container/v1beta1/cluster_service.proto;l=4257
* @return The maxTimeSharedClientsPerGpu.
*/
@java.lang.Override
Expand All @@ -1016,7 +1016,7 @@ public long getMaxTimeSharedClientsPerGpu() {
* <code>int64 max_time_shared_clients_per_gpu = 4 [deprecated = true];</code>
*
* @deprecated google.container.v1beta1.AcceleratorConfig.max_time_shared_clients_per_gpu is
* deprecated. See google/container/v1beta1/cluster_service.proto;l=4237
* deprecated. See google/container/v1beta1/cluster_service.proto;l=4257
* @param value The maxTimeSharedClientsPerGpu to set.
* @return This builder for chaining.
*/
Expand All @@ -1037,7 +1037,7 @@ public Builder setMaxTimeSharedClientsPerGpu(long value) {
* <code>int64 max_time_shared_clients_per_gpu = 4 [deprecated = true];</code>
*
* @deprecated google.container.v1beta1.AcceleratorConfig.max_time_shared_clients_per_gpu is
* deprecated. See google/container/v1beta1/cluster_service.proto;l=4237
* deprecated. See google/container/v1beta1/cluster_service.proto;l=4257
* @return This builder for chaining.
*/
@java.lang.Deprecated
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public interface AcceleratorConfigOrBuilder
* <code>int64 max_time_shared_clients_per_gpu = 4 [deprecated = true];</code>
*
* @deprecated google.container.v1beta1.AcceleratorConfig.max_time_shared_clients_per_gpu is
* deprecated. See google/container/v1beta1/cluster_service.proto;l=4237
* deprecated. See google/container/v1beta1/cluster_service.proto;l=4257
* @return The maxTimeSharedClientsPerGpu.
*/
@java.lang.Deprecated
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ public com.google.container.v1beta1.NodeManagementOrBuilder getManagementOrBuild
* <code>string min_cpu_platform = 5 [deprecated = true];</code>
*
* @deprecated google.container.v1beta1.AutoprovisioningNodePoolDefaults.min_cpu_platform is
* deprecated. See google/container/v1beta1/cluster_service.proto;l=3987
* deprecated. See google/container/v1beta1/cluster_service.proto;l=4007
* @return The minCpuPlatform.
*/
@java.lang.Override
Expand Down Expand Up @@ -389,7 +389,7 @@ public java.lang.String getMinCpuPlatform() {
* <code>string min_cpu_platform = 5 [deprecated = true];</code>
*
* @deprecated google.container.v1beta1.AutoprovisioningNodePoolDefaults.min_cpu_platform is
* deprecated. See google/container/v1beta1/cluster_service.proto;l=3987
* deprecated. See google/container/v1beta1/cluster_service.proto;l=4007
* @return The bytes for minCpuPlatform.
*/
@java.lang.Override
Expand Down Expand Up @@ -2006,7 +2006,7 @@ public com.google.container.v1beta1.NodeManagementOrBuilder getManagementOrBuild
* <code>string min_cpu_platform = 5 [deprecated = true];</code>
*
* @deprecated google.container.v1beta1.AutoprovisioningNodePoolDefaults.min_cpu_platform is
* deprecated. See google/container/v1beta1/cluster_service.proto;l=3987
* deprecated. See google/container/v1beta1/cluster_service.proto;l=4007
* @return The minCpuPlatform.
*/
@java.lang.Deprecated
Expand Down Expand Up @@ -2042,7 +2042,7 @@ public java.lang.String getMinCpuPlatform() {
* <code>string min_cpu_platform = 5 [deprecated = true];</code>
*
* @deprecated google.container.v1beta1.AutoprovisioningNodePoolDefaults.min_cpu_platform is
* deprecated. See google/container/v1beta1/cluster_service.proto;l=3987
* deprecated. See google/container/v1beta1/cluster_service.proto;l=4007
* @return The bytes for minCpuPlatform.
*/
@java.lang.Deprecated
Expand Down Expand Up @@ -2078,7 +2078,7 @@ public com.google.protobuf.ByteString getMinCpuPlatformBytes() {
* <code>string min_cpu_platform = 5 [deprecated = true];</code>
*
* @deprecated google.container.v1beta1.AutoprovisioningNodePoolDefaults.min_cpu_platform is
* deprecated. See google/container/v1beta1/cluster_service.proto;l=3987
* deprecated. See google/container/v1beta1/cluster_service.proto;l=4007
* @param value The minCpuPlatform to set.
* @return This builder for chaining.
*/
Expand Down Expand Up @@ -2113,7 +2113,7 @@ public Builder setMinCpuPlatform(java.lang.String value) {
* <code>string min_cpu_platform = 5 [deprecated = true];</code>
*
* @deprecated google.container.v1beta1.AutoprovisioningNodePoolDefaults.min_cpu_platform is
* deprecated. See google/container/v1beta1/cluster_service.proto;l=3987
* deprecated. See google/container/v1beta1/cluster_service.proto;l=4007
* @return This builder for chaining.
*/
@java.lang.Deprecated
Expand Down Expand Up @@ -2144,7 +2144,7 @@ public Builder clearMinCpuPlatform() {
* <code>string min_cpu_platform = 5 [deprecated = true];</code>
*
* @deprecated google.container.v1beta1.AutoprovisioningNodePoolDefaults.min_cpu_platform is
* deprecated. See google/container/v1beta1/cluster_service.proto;l=3987
* deprecated. See google/container/v1beta1/cluster_service.proto;l=4007
* @param value The bytes for minCpuPlatform to set.
* @return This builder for chaining.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ public interface AutoprovisioningNodePoolDefaultsOrBuilder
* <code>string min_cpu_platform = 5 [deprecated = true];</code>
*
* @deprecated google.container.v1beta1.AutoprovisioningNodePoolDefaults.min_cpu_platform is
* deprecated. See google/container/v1beta1/cluster_service.proto;l=3987
* deprecated. See google/container/v1beta1/cluster_service.proto;l=4007
* @return The minCpuPlatform.
*/
@java.lang.Deprecated
Expand All @@ -264,7 +264,7 @@ public interface AutoprovisioningNodePoolDefaultsOrBuilder
* <code>string min_cpu_platform = 5 [deprecated = true];</code>
*
* @deprecated google.container.v1beta1.AutoprovisioningNodePoolDefaults.min_cpu_platform is
* deprecated. See google/container/v1beta1/cluster_service.proto;l=3987
* deprecated. See google/container/v1beta1/cluster_service.proto;l=4007
* @return The bytes for minCpuPlatform.
*/
@java.lang.Deprecated
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
* </code>
*
* @deprecated google.container.v1beta1.CancelOperationRequest.project_id is deprecated. See
* google/container/v1beta1/cluster_service.proto;l=3059
* google/container/v1beta1/cluster_service.proto;l=3074
* @return The projectId.
*/
@java.lang.Override
Expand Down Expand Up @@ -114,7 +114,7 @@ public java.lang.String getProjectId() {
* </code>
*
* @deprecated google.container.v1beta1.CancelOperationRequest.project_id is deprecated. See
* google/container/v1beta1/cluster_service.proto;l=3059
* google/container/v1beta1/cluster_service.proto;l=3074
* @return The bytes for projectId.
*/
@java.lang.Override
Expand Down Expand Up @@ -146,7 +146,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
* <code>string zone = 2 [deprecated = true, (.google.api.field_behavior) = REQUIRED];</code>
*
* @deprecated google.container.v1beta1.CancelOperationRequest.zone is deprecated. See
* google/container/v1beta1/cluster_service.proto;l=3068
* google/container/v1beta1/cluster_service.proto;l=3083
* @return The zone.
*/
@java.lang.Override
Expand Down Expand Up @@ -175,7 +175,7 @@ public java.lang.String getZone() {
* <code>string zone = 2 [deprecated = true, (.google.api.field_behavior) = REQUIRED];</code>
*
* @deprecated google.container.v1beta1.CancelOperationRequest.zone is deprecated. See
* google/container/v1beta1/cluster_service.proto;l=3068
* google/container/v1beta1/cluster_service.proto;l=3083
* @return The bytes for zone.
*/
@java.lang.Override
Expand Down Expand Up @@ -206,7 +206,7 @@ public com.google.protobuf.ByteString getZoneBytes() {
* </code>
*
* @deprecated google.container.v1beta1.CancelOperationRequest.operation_id is deprecated. See
* google/container/v1beta1/cluster_service.proto;l=3075
* google/container/v1beta1/cluster_service.proto;l=3090
* @return The operationId.
*/
@java.lang.Override
Expand Down Expand Up @@ -234,7 +234,7 @@ public java.lang.String getOperationId() {
* </code>
*
* @deprecated google.container.v1beta1.CancelOperationRequest.operation_id is deprecated. See
* google/container/v1beta1/cluster_service.proto;l=3075
* google/container/v1beta1/cluster_service.proto;l=3090
* @return The bytes for operationId.
*/
@java.lang.Override
Expand Down Expand Up @@ -712,7 +712,7 @@ public Builder mergeFrom(
* </code>
*
* @deprecated google.container.v1beta1.CancelOperationRequest.project_id is deprecated. See
* google/container/v1beta1/cluster_service.proto;l=3059
* google/container/v1beta1/cluster_service.proto;l=3074
* @return The projectId.
*/
@java.lang.Deprecated
Expand Down Expand Up @@ -740,7 +740,7 @@ public java.lang.String getProjectId() {
* </code>
*
* @deprecated google.container.v1beta1.CancelOperationRequest.project_id is deprecated. See
* google/container/v1beta1/cluster_service.proto;l=3059
* google/container/v1beta1/cluster_service.proto;l=3074
* @return The bytes for projectId.
*/
@java.lang.Deprecated
Expand Down Expand Up @@ -768,7 +768,7 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
* </code>
*
* @deprecated google.container.v1beta1.CancelOperationRequest.project_id is deprecated. See
* google/container/v1beta1/cluster_service.proto;l=3059
* google/container/v1beta1/cluster_service.proto;l=3074
* @param value The projectId to set.
* @return This builder for chaining.
*/
Expand All @@ -795,7 +795,7 @@ public Builder setProjectId(java.lang.String value) {
* </code>
*
* @deprecated google.container.v1beta1.CancelOperationRequest.project_id is deprecated. See
* google/container/v1beta1/cluster_service.proto;l=3059
* google/container/v1beta1/cluster_service.proto;l=3074
* @return This builder for chaining.
*/
@java.lang.Deprecated
Expand All @@ -818,7 +818,7 @@ public Builder clearProjectId() {
* </code>
*
* @deprecated google.container.v1beta1.CancelOperationRequest.project_id is deprecated. See
* google/container/v1beta1/cluster_service.proto;l=3059
* google/container/v1beta1/cluster_service.proto;l=3074
* @param value The bytes for projectId to set.
* @return This builder for chaining.
*/
Expand Down Expand Up @@ -848,7 +848,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
* <code>string zone = 2 [deprecated = true, (.google.api.field_behavior) = REQUIRED];</code>
*
* @deprecated google.container.v1beta1.CancelOperationRequest.zone is deprecated. See
* google/container/v1beta1/cluster_service.proto;l=3068
* google/container/v1beta1/cluster_service.proto;l=3083
* @return The zone.
*/
@java.lang.Deprecated
Expand Down Expand Up @@ -876,7 +876,7 @@ public java.lang.String getZone() {
* <code>string zone = 2 [deprecated = true, (.google.api.field_behavior) = REQUIRED];</code>
*
* @deprecated google.container.v1beta1.CancelOperationRequest.zone is deprecated. See
* google/container/v1beta1/cluster_service.proto;l=3068
* google/container/v1beta1/cluster_service.proto;l=3083
* @return The bytes for zone.
*/
@java.lang.Deprecated
Expand Down Expand Up @@ -904,7 +904,7 @@ public com.google.protobuf.ByteString getZoneBytes() {
* <code>string zone = 2 [deprecated = true, (.google.api.field_behavior) = REQUIRED];</code>
*
* @deprecated google.container.v1beta1.CancelOperationRequest.zone is deprecated. See
* google/container/v1beta1/cluster_service.proto;l=3068
* google/container/v1beta1/cluster_service.proto;l=3083
* @param value The zone to set.
* @return This builder for chaining.
*/
Expand All @@ -931,7 +931,7 @@ public Builder setZone(java.lang.String value) {
* <code>string zone = 2 [deprecated = true, (.google.api.field_behavior) = REQUIRED];</code>
*
* @deprecated google.container.v1beta1.CancelOperationRequest.zone is deprecated. See
* google/container/v1beta1/cluster_service.proto;l=3068
* google/container/v1beta1/cluster_service.proto;l=3083
* @return This builder for chaining.
*/
@java.lang.Deprecated
Expand All @@ -954,7 +954,7 @@ public Builder clearZone() {
* <code>string zone = 2 [deprecated = true, (.google.api.field_behavior) = REQUIRED];</code>
*
* @deprecated google.container.v1beta1.CancelOperationRequest.zone is deprecated. See
* google/container/v1beta1/cluster_service.proto;l=3068
* google/container/v1beta1/cluster_service.proto;l=3083
* @param value The bytes for zone to set.
* @return This builder for chaining.
*/
Expand Down Expand Up @@ -983,7 +983,7 @@ public Builder setZoneBytes(com.google.protobuf.ByteString value) {
* </code>
*
* @deprecated google.container.v1beta1.CancelOperationRequest.operation_id is deprecated. See
* google/container/v1beta1/cluster_service.proto;l=3075
* google/container/v1beta1/cluster_service.proto;l=3090
* @return The operationId.
*/
@java.lang.Deprecated
Expand All @@ -1010,7 +1010,7 @@ public java.lang.String getOperationId() {
* </code>
*
* @deprecated google.container.v1beta1.CancelOperationRequest.operation_id is deprecated. See
* google/container/v1beta1/cluster_service.proto;l=3075
* google/container/v1beta1/cluster_service.proto;l=3090
* @return The bytes for operationId.
*/
@java.lang.Deprecated
Expand All @@ -1037,7 +1037,7 @@ public com.google.protobuf.ByteString getOperationIdBytes() {
* </code>
*
* @deprecated google.container.v1beta1.CancelOperationRequest.operation_id is deprecated. See
* google/container/v1beta1/cluster_service.proto;l=3075
* google/container/v1beta1/cluster_service.proto;l=3090
* @param value The operationId to set.
* @return This builder for chaining.
*/
Expand All @@ -1063,7 +1063,7 @@ public Builder setOperationId(java.lang.String value) {
* </code>
*
* @deprecated google.container.v1beta1.CancelOperationRequest.operation_id is deprecated. See
* google/container/v1beta1/cluster_service.proto;l=3075
* google/container/v1beta1/cluster_service.proto;l=3090
* @return This builder for chaining.
*/
@java.lang.Deprecated
Expand All @@ -1085,7 +1085,7 @@ public Builder clearOperationId() {
* </code>
*
* @deprecated google.container.v1beta1.CancelOperationRequest.operation_id is deprecated. See
* google/container/v1beta1/cluster_service.proto;l=3075
* google/container/v1beta1/cluster_service.proto;l=3090
* @param value The bytes for operationId to set.
* @return This builder for chaining.
*/
Expand Down
Loading

0 comments on commit d52e525

Please sign in to comment.