- * Google Container Engine Cluster Manager v1 + * Google Kubernetes Engine Cluster Manager v1 **/ @javax.annotation.Generated( @@ -1166,7 +1166,7 @@ public static ClusterManagerFutureStub newFutureStub( /** *
- * Google Container Engine Cluster Manager v1
+ * Google Kubernetes Engine Cluster Manager v1
*
*/
public static abstract class ClusterManagerImplBase implements io.grpc.BindableService {
@@ -1223,7 +1223,7 @@ public void updateCluster(com.google.container.v1.UpdateClusterRequest request,
/**
*
- * Updates the version and/or image type of a specific node pool.
+ * Updates the version and/or image type for a specific node pool.
*
*/
public void updateNodePool(com.google.container.v1.UpdateNodePoolRequest request,
@@ -1233,7 +1233,7 @@ public void updateNodePool(com.google.container.v1.UpdateNodePoolRequest request
/**
*
- * Sets the autoscaling settings of a specific node pool.
+ * Sets the autoscaling settings for a specific node pool.
*
*/
public void setNodePoolAutoscaling(com.google.container.v1.SetNodePoolAutoscalingRequest request,
@@ -1243,7 +1243,7 @@ public void setNodePoolAutoscaling(com.google.container.v1.SetNodePoolAutoscalin
/**
*
- * Sets the logging service of a specific cluster.
+ * Sets the logging service for a specific cluster.
*
*/
public void setLoggingService(com.google.container.v1.SetLoggingServiceRequest request,
@@ -1253,7 +1253,7 @@ public void setLoggingService(com.google.container.v1.SetLoggingServiceRequest r
/**
*
- * Sets the monitoring service of a specific cluster.
+ * Sets the monitoring service for a specific cluster.
*
*/
public void setMonitoringService(com.google.container.v1.SetMonitoringServiceRequest request,
@@ -1263,7 +1263,7 @@ public void setMonitoringService(com.google.container.v1.SetMonitoringServiceReq
/**
*
- * Sets the addons of a specific cluster.
+ * Sets the addons for a specific cluster.
*
*/
public void setAddonsConfig(com.google.container.v1.SetAddonsConfigRequest request,
@@ -1273,7 +1273,7 @@ public void setAddonsConfig(com.google.container.v1.SetAddonsConfigRequest reque
/**
*
- * Sets the locations of a specific cluster.
+ * Sets the locations for a specific cluster.
*
*/
public void setLocations(com.google.container.v1.SetLocationsRequest request,
@@ -1283,7 +1283,7 @@ public void setLocations(com.google.container.v1.SetLocationsRequest request,
/**
*
- * Updates the master of a specific cluster.
+ * Updates the master for a specific cluster.
*
*/
public void updateMaster(com.google.container.v1.UpdateMasterRequest request,
@@ -1294,7 +1294,7 @@ public void updateMaster(com.google.container.v1.UpdateMasterRequest request,
/**
*
* Used to set master auth materials. Currently supports :-
- * Changing the admin password of a specific cluster.
+ * Changing the admin password for a specific cluster.
* This can be either via password generation or explicitly set the password.
*
*/
@@ -1351,7 +1351,7 @@ public void cancelOperation(com.google.container.v1.CancelOperationRequest reque
/**
*
- * Returns configuration info about the Container Engine service.
+ * Returns configuration info about the Kubernetes Engine service.
*
*/
public void getServerConfig(com.google.container.v1.GetServerConfigRequest request,
@@ -1462,7 +1462,7 @@ public void completeIPRotation(com.google.container.v1.CompleteIPRotationRequest
/**
*
- * Sets the size of a specific node pool.
+ * Sets the size for a specific node pool.
*
*/
public void setNodePoolSize(com.google.container.v1.SetNodePoolSizeRequest request,
@@ -1708,7 +1708,7 @@ public void setMaintenancePolicy(com.google.container.v1.SetMaintenancePolicyReq
/**
*
- * Google Container Engine Cluster Manager v1
+ * Google Kubernetes Engine Cluster Manager v1
*
*/
public static final class ClusterManagerStub extends io.grpc.stub.AbstractStub
- * Updates the version and/or image type of a specific node pool.
+ * Updates the version and/or image type for a specific node pool.
*
*/
public void updateNodePool(com.google.container.v1.UpdateNodePoolRequest request,
@@ -1794,7 +1794,7 @@ public void updateNodePool(com.google.container.v1.UpdateNodePoolRequest request
/**
*
- * Sets the autoscaling settings of a specific node pool.
+ * Sets the autoscaling settings for a specific node pool.
*
*/
public void setNodePoolAutoscaling(com.google.container.v1.SetNodePoolAutoscalingRequest request,
@@ -1805,7 +1805,7 @@ public void setNodePoolAutoscaling(com.google.container.v1.SetNodePoolAutoscalin
/**
*
- * Sets the logging service of a specific cluster.
+ * Sets the logging service for a specific cluster.
*
*/
public void setLoggingService(com.google.container.v1.SetLoggingServiceRequest request,
@@ -1816,7 +1816,7 @@ public void setLoggingService(com.google.container.v1.SetLoggingServiceRequest r
/**
*
- * Sets the monitoring service of a specific cluster.
+ * Sets the monitoring service for a specific cluster.
*
*/
public void setMonitoringService(com.google.container.v1.SetMonitoringServiceRequest request,
@@ -1827,7 +1827,7 @@ public void setMonitoringService(com.google.container.v1.SetMonitoringServiceReq
/**
*
- * Sets the addons of a specific cluster.
+ * Sets the addons for a specific cluster.
*
*/
public void setAddonsConfig(com.google.container.v1.SetAddonsConfigRequest request,
@@ -1838,7 +1838,7 @@ public void setAddonsConfig(com.google.container.v1.SetAddonsConfigRequest reque
/**
*
- * Sets the locations of a specific cluster.
+ * Sets the locations for a specific cluster.
*
*/
public void setLocations(com.google.container.v1.SetLocationsRequest request,
@@ -1849,7 +1849,7 @@ public void setLocations(com.google.container.v1.SetLocationsRequest request,
/**
*
- * Updates the master of a specific cluster.
+ * Updates the master for a specific cluster.
*
*/
public void updateMaster(com.google.container.v1.UpdateMasterRequest request,
@@ -1861,7 +1861,7 @@ public void updateMaster(com.google.container.v1.UpdateMasterRequest request,
/**
*
* Used to set master auth materials. Currently supports :-
- * Changing the admin password of a specific cluster.
+ * Changing the admin password for a specific cluster.
* This can be either via password generation or explicitly set the password.
*
*/
@@ -1923,7 +1923,7 @@ public void cancelOperation(com.google.container.v1.CancelOperationRequest reque
/**
*
- * Returns configuration info about the Container Engine service.
+ * Returns configuration info about the Kubernetes Engine service.
*
*/
public void getServerConfig(com.google.container.v1.GetServerConfigRequest request,
@@ -2045,7 +2045,7 @@ public void completeIPRotation(com.google.container.v1.CompleteIPRotationRequest
/**
*
- * Sets the size of a specific node pool.
+ * Sets the size for a specific node pool.
*
*/
public void setNodePoolSize(com.google.container.v1.SetNodePoolSizeRequest request,
@@ -2079,7 +2079,7 @@ public void setMaintenancePolicy(com.google.container.v1.SetMaintenancePolicyReq
/**
*
- * Google Container Engine Cluster Manager v1
+ * Google Kubernetes Engine Cluster Manager v1
*
*/
public static final class ClusterManagerBlockingStub extends io.grpc.stub.AbstractStub
- * Updates the version and/or image type of a specific node pool.
+ * Updates the version and/or image type for a specific node pool.
*
*/
public com.google.container.v1.Operation updateNodePool(com.google.container.v1.UpdateNodePoolRequest request) {
@@ -2160,7 +2160,7 @@ public com.google.container.v1.Operation updateNodePool(com.google.container.v1.
/**
*
- * Sets the autoscaling settings of a specific node pool.
+ * Sets the autoscaling settings for a specific node pool.
*
*/
public com.google.container.v1.Operation setNodePoolAutoscaling(com.google.container.v1.SetNodePoolAutoscalingRequest request) {
@@ -2170,7 +2170,7 @@ public com.google.container.v1.Operation setNodePoolAutoscaling(com.google.conta
/**
*
- * Sets the logging service of a specific cluster.
+ * Sets the logging service for a specific cluster.
*
*/
public com.google.container.v1.Operation setLoggingService(com.google.container.v1.SetLoggingServiceRequest request) {
@@ -2180,7 +2180,7 @@ public com.google.container.v1.Operation setLoggingService(com.google.container.
/**
*
- * Sets the monitoring service of a specific cluster.
+ * Sets the monitoring service for a specific cluster.
*
*/
public com.google.container.v1.Operation setMonitoringService(com.google.container.v1.SetMonitoringServiceRequest request) {
@@ -2190,7 +2190,7 @@ public com.google.container.v1.Operation setMonitoringService(com.google.contain
/**
*
- * Sets the addons of a specific cluster.
+ * Sets the addons for a specific cluster.
*
*/
public com.google.container.v1.Operation setAddonsConfig(com.google.container.v1.SetAddonsConfigRequest request) {
@@ -2200,7 +2200,7 @@ public com.google.container.v1.Operation setAddonsConfig(com.google.container.v1
/**
*
- * Sets the locations of a specific cluster.
+ * Sets the locations for a specific cluster.
*
*/
public com.google.container.v1.Operation setLocations(com.google.container.v1.SetLocationsRequest request) {
@@ -2210,7 +2210,7 @@ public com.google.container.v1.Operation setLocations(com.google.container.v1.Se
/**
*
- * Updates the master of a specific cluster.
+ * Updates the master for a specific cluster.
*
*/
public com.google.container.v1.Operation updateMaster(com.google.container.v1.UpdateMasterRequest request) {
@@ -2221,7 +2221,7 @@ public com.google.container.v1.Operation updateMaster(com.google.container.v1.Up
/**
*
* Used to set master auth materials. Currently supports :-
- * Changing the admin password of a specific cluster.
+ * Changing the admin password for a specific cluster.
* This can be either via password generation or explicitly set the password.
*
*/
@@ -2278,7 +2278,7 @@ public com.google.protobuf.Empty cancelOperation(com.google.container.v1.CancelO
/**
*
- * Returns configuration info about the Container Engine service.
+ * Returns configuration info about the Kubernetes Engine service.
*
*/
public com.google.container.v1.ServerConfig getServerConfig(com.google.container.v1.GetServerConfigRequest request) {
@@ -2389,7 +2389,7 @@ public com.google.container.v1.Operation completeIPRotation(com.google.container
/**
*
- * Sets the size of a specific node pool.
+ * Sets the size for a specific node pool.
*
*/
public com.google.container.v1.Operation setNodePoolSize(com.google.container.v1.SetNodePoolSizeRequest request) {
@@ -2420,7 +2420,7 @@ public com.google.container.v1.Operation setMaintenancePolicy(com.google.contain
/**
*
- * Google Container Engine Cluster Manager v1
+ * Google Kubernetes Engine Cluster Manager v1
*
*/
public static final class ClusterManagerFutureStub extends io.grpc.stub.AbstractStub
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -123,13 +131,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
@@ -147,13 +156,14 @@ public java.lang.String getProjectId() {
private volatile java.lang.Object zone_;
/**
*
- * The name of the Google Compute Engine
+ * Deprecated. 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -167,13 +177,14 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * Deprecated. 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
@@ -191,12 +202,13 @@ public java.lang.String getZone() {
private volatile java.lang.Object operationId_;
/**
*
- * The server-assigned `name` of the operation.
+ * Deprecated. The server-assigned `name` of the operation.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string operation_id = 3;
+ * string operation_id = 3 [deprecated = true];
*/
- public java.lang.String getOperationId() {
+ @java.lang.Deprecated public java.lang.String getOperationId() {
java.lang.Object ref = operationId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -210,12 +222,13 @@ public java.lang.String getOperationId() {
}
/**
*
- * The server-assigned `name` of the operation.
+ * Deprecated. The server-assigned `name` of the operation.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string operation_id = 3;
+ * string operation_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getOperationIdBytes() {
java.lang.Object ref = operationId_;
if (ref instanceof java.lang.String) {
@@ -229,6 +242,50 @@ public java.lang.String getOperationId() {
}
}
+ public static final int NAME_FIELD_NUMBER = 4;
+ private volatile java.lang.Object name_;
+ /**
+ * + * The name (project, location, operation id) of the operation to cancel. + * Specified in the format 'projects/*/locations/*/operations/*'. + *+ * + *
string name = 4;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ }
+ }
+ /**
+ * + * The name (project, location, operation id) of the operation to cancel. + * Specified in the format 'projects/*/locations/*/operations/*'. + *+ * + *
string name = 4;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -252,6 +309,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
if (!getOperationIdBytes().isEmpty()) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 3, operationId_);
}
+ if (!getNameBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 4, name_);
+ }
unknownFields.writeTo(output);
}
@@ -270,6 +330,9 @@ public int getSerializedSize() {
if (!getOperationIdBytes().isEmpty()) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, operationId_);
}
+ if (!getNameBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, name_);
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -292,6 +355,8 @@ public boolean equals(final java.lang.Object obj) {
.equals(other.getZone());
result = result && getOperationId()
.equals(other.getOperationId());
+ result = result && getName()
+ .equals(other.getName());
result = result && unknownFields.equals(other.unknownFields);
return result;
}
@@ -309,6 +374,8 @@ public int hashCode() {
hash = (53 * hash) + getZone().hashCode();
hash = (37 * hash) + OPERATION_ID_FIELD_NUMBER;
hash = (53 * hash) + getOperationId().hashCode();
+ hash = (37 * hash) + NAME_FIELD_NUMBER;
+ hash = (53 * hash) + getName().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -452,6 +519,8 @@ public Builder clear() {
operationId_ = "";
+ name_ = "";
+
return this;
}
@@ -481,6 +550,7 @@ public com.google.container.v1.CancelOperationRequest buildPartial() {
result.projectId_ = projectId_;
result.zone_ = zone_;
result.operationId_ = operationId_;
+ result.name_ = name_;
onBuilt();
return result;
}
@@ -541,6 +611,10 @@ public Builder mergeFrom(com.google.container.v1.CancelOperationRequest other) {
operationId_ = other.operationId_;
onChanged();
}
+ if (!other.getName().isEmpty()) {
+ name_ = other.name_;
+ onChanged();
+ }
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -573,13 +647,14 @@ public Builder mergeFrom(
private java.lang.Object projectId_ = "";
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -593,13 +668,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof String) {
@@ -614,13 +690,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectId(
+ @java.lang.Deprecated public Builder setProjectId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -632,13 +709,14 @@ public Builder setProjectId(
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder clearProjectId() {
+ @java.lang.Deprecated public Builder clearProjectId() {
projectId_ = getDefaultInstance().getProjectId();
onChanged();
@@ -646,13 +724,14 @@ public Builder clearProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectIdBytes(
+ @java.lang.Deprecated public Builder setProjectIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -667,13 +746,14 @@ public Builder setProjectIdBytes(
private java.lang.Object zone_ = "";
/**
*
- * The name of the Google Compute Engine
+ * Deprecated. 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -687,13 +767,14 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * Deprecated. 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof String) {
@@ -708,13 +789,14 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * Deprecated. 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZone(
+ @java.lang.Deprecated public Builder setZone(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -726,13 +808,14 @@ public Builder setZone(
}
/**
*
- * The name of the Google Compute Engine
+ * Deprecated. 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder clearZone() {
+ @java.lang.Deprecated public Builder clearZone() {
zone_ = getDefaultInstance().getZone();
onChanged();
@@ -740,13 +823,14 @@ public Builder clearZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * Deprecated. 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZoneBytes(
+ @java.lang.Deprecated public Builder setZoneBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -761,12 +845,13 @@ public Builder setZoneBytes(
private java.lang.Object operationId_ = "";
/**
*
- * The server-assigned `name` of the operation.
+ * Deprecated. The server-assigned `name` of the operation.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string operation_id = 3;
+ * string operation_id = 3 [deprecated = true];
*/
- public java.lang.String getOperationId() {
+ @java.lang.Deprecated public java.lang.String getOperationId() {
java.lang.Object ref = operationId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -780,12 +865,13 @@ public java.lang.String getOperationId() {
}
/**
*
- * The server-assigned `name` of the operation.
+ * Deprecated. The server-assigned `name` of the operation.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string operation_id = 3;
+ * string operation_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getOperationIdBytes() {
java.lang.Object ref = operationId_;
if (ref instanceof String) {
@@ -800,12 +886,13 @@ public java.lang.String getOperationId() {
}
/**
*
- * The server-assigned `name` of the operation.
+ * Deprecated. The server-assigned `name` of the operation.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string operation_id = 3;
+ * string operation_id = 3 [deprecated = true];
*/
- public Builder setOperationId(
+ @java.lang.Deprecated public Builder setOperationId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -817,12 +904,13 @@ public Builder setOperationId(
}
/**
*
- * The server-assigned `name` of the operation.
+ * Deprecated. The server-assigned `name` of the operation.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string operation_id = 3;
+ * string operation_id = 3 [deprecated = true];
*/
- public Builder clearOperationId() {
+ @java.lang.Deprecated public Builder clearOperationId() {
operationId_ = getDefaultInstance().getOperationId();
onChanged();
@@ -830,12 +918,13 @@ public Builder clearOperationId() {
}
/**
*
- * The server-assigned `name` of the operation.
+ * Deprecated. The server-assigned `name` of the operation.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string operation_id = 3;
+ * string operation_id = 3 [deprecated = true];
*/
- public Builder setOperationIdBytes(
+ @java.lang.Deprecated public Builder setOperationIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -846,6 +935,100 @@ public Builder setOperationIdBytes(
onChanged();
return this;
}
+
+ private java.lang.Object name_ = "";
+ /**
+ * + * The name (project, location, operation id) of the operation to cancel. + * Specified in the format 'projects/*/locations/*/operations/*'. + *+ * + *
string name = 4;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ * + * The name (project, location, operation id) of the operation to cancel. + * Specified in the format 'projects/*/locations/*/operations/*'. + *+ * + *
string name = 4;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ * + * The name (project, location, operation id) of the operation to cancel. + * Specified in the format 'projects/*/locations/*/operations/*'. + *+ * + *
string name = 4;
+ */
+ public Builder setName(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * + * The name (project, location, operation id) of the operation to cancel. + * Specified in the format 'projects/*/locations/*/operations/*'. + *+ * + *
string name = 4;
+ */
+ public Builder clearName() {
+
+ name_ = getDefaultInstance().getName();
+ onChanged();
+ return this;
+ }
+ /**
+ * + * The name (project, location, operation id) of the operation to cancel. + * Specified in the format 'projects/*/locations/*/operations/*'. + *+ * + *
string name = 4;
+ */
+ public Builder setNameBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CancelOperationRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CancelOperationRequestOrBuilder.java
index 138b310b51d2..d70eff25baca 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CancelOperationRequestOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CancelOperationRequestOrBuilder.java
@@ -9,59 +9,85 @@ public interface CancelOperationRequestOrBuilder extends
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- java.lang.String getProjectId();
+ @java.lang.Deprecated java.lang.String getProjectId();
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getProjectIdBytes();
/**
*
- * The name of the Google Compute Engine
+ * Deprecated. 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;
+ * string zone = 2 [deprecated = true];
*/
- java.lang.String getZone();
+ @java.lang.Deprecated java.lang.String getZone();
/**
*
- * The name of the Google Compute Engine
+ * Deprecated. 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;
+ * string zone = 2 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getZoneBytes();
/**
*
- * The server-assigned `name` of the operation.
+ * Deprecated. The server-assigned `name` of the operation.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string operation_id = 3;
+ * string operation_id = 3 [deprecated = true];
*/
- java.lang.String getOperationId();
+ @java.lang.Deprecated java.lang.String getOperationId();
/**
*
- * The server-assigned `name` of the operation.
+ * Deprecated. The server-assigned `name` of the operation.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string operation_id = 3;
+ * string operation_id = 3 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getOperationIdBytes();
+
+ /**
+ * + * The name (project, location, operation id) of the operation to cancel. + * Specified in the format 'projects/*/locations/*/operations/*'. + *+ * + *
string name = 4;
+ */
+ java.lang.String getName();
+ /**
+ * + * The name (project, location, operation id) of the operation to cancel. + * Specified in the format 'projects/*/locations/*/operations/*'. + *+ * + *
string name = 4;
+ */
+ com.google.protobuf.ByteString
+ getNameBytes();
}
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/Cluster.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/Cluster.java
index 6c1c4a2a859c..81d411774a82 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/Cluster.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/Cluster.java
@@ -5,7 +5,7 @@
/**
* - * A Google Container Engine cluster. + * A Google Kubernetes Engine cluster. ** * Protobuf type {@code google.container.v1.Cluster} @@ -46,6 +46,7 @@ private Cluster() { instanceGroupUrls_ = com.google.protobuf.LazyStringArrayList.EMPTY; currentNodeCount_ = 0; expireTime_ = ""; + location_ = ""; } @java.lang.Override @@ -266,6 +267,32 @@ private Cluster( break; } + case 218: { + com.google.container.v1.NetworkConfig.Builder subBuilder = null; + if (networkConfig_ != null) { + subBuilder = networkConfig_.toBuilder(); + } + networkConfig_ = input.readMessage(com.google.container.v1.NetworkConfig.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(networkConfig_); + networkConfig_ = subBuilder.buildPartial(); + } + + break; + } + case 298: { + com.google.container.v1.PrivateClusterConfig.Builder subBuilder = null; + if (privateClusterConfig_ != null) { + subBuilder = privateClusterConfig_.toBuilder(); + } + privateClusterConfig_ = input.readMessage(com.google.container.v1.PrivateClusterConfig.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(privateClusterConfig_); + privateClusterConfig_ = subBuilder.buildPartial(); + } + + break; + } case 802: { java.lang.String s = input.readStringRequireUtf8(); @@ -333,9 +360,9 @@ private Cluster( } case 890: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField1_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField1_ & 0x00000004) == 0x00000004)) { instanceGroupUrls_ = new com.google.protobuf.LazyStringArrayList(); - mutable_bitField1_ |= 0x00000001; + mutable_bitField1_ |= 0x00000004; } instanceGroupUrls_.add(s); break; @@ -351,6 +378,12 @@ private Cluster( expireTime_ = s; break; } + case 914: { + java.lang.String s = input.readStringRequireUtf8(); + + location_ = s; + break; + } default: { if (!parseUnknownFieldProto3( input, unknownFields, extensionRegistry, tag)) { @@ -372,7 +405,7 @@ private Cluster( if (((mutable_bitField0_ & 0x00001000) == 0x00001000)) { locations_ = locations_.getUnmodifiableView(); } - if (((mutable_bitField1_ & 0x00000001) == 0x00000001)) { + if (((mutable_bitField1_ & 0x00000004) == 0x00000004)) { instanceGroupUrls_ = instanceGroupUrls_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -465,6 +498,15 @@ public enum Status *
ERROR = 5;
*/
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;
+ */
+ DEGRADED(6),
UNRECOGNIZED(-1),
;
@@ -520,6 +562,15 @@ public enum Status
* ERROR = 5;
*/
public static final int ERROR_VALUE = 5;
+ /**
+ * + * The DEGRADED state indicates the cluster requires user action to restore + * full functionality. Details can be found in the `statusMessage` field. + *+ * + *
DEGRADED = 6;
+ */
+ public static final int DEGRADED_VALUE = 6;
public final int getNumber() {
@@ -546,6 +597,7 @@ public static Status forNumber(int value) {
case 3: return RECONCILING;
case 4: return STOPPING;
case 5: return ERROR;
+ case 6: return DEGRADED;
default: return null;
}
}
@@ -599,6 +651,7 @@ private Status(int value) {
}
private int bitField0_;
+ private int bitField1_;
public static final int NAME_FIELD_NUMBER = 1;
private volatile java.lang.Object name_;
/**
@@ -1453,7 +1506,6 @@ public com.google.container.v1.IPAllocationPolicyOrBuilder getIpAllocationPolicy
private com.google.container.v1.MasterAuthorizedNetworksConfig masterAuthorizedNetworksConfig_;
/**
*
- * Master authorized networks is a Beta feature.
* The configuration options for master authorized networks feature.
*
*
@@ -1464,7 +1516,6 @@ public boolean hasMasterAuthorizedNetworksConfig() {
}
/**
*
- * Master authorized networks is a Beta feature.
* The configuration options for master authorized networks feature.
*
*
@@ -1475,7 +1526,6 @@ public com.google.container.v1.MasterAuthorizedNetworksConfig getMasterAuthorize
}
/**
*
- * Master authorized networks is a Beta feature.
* The configuration options for master authorized networks feature.
*
*
@@ -1518,6 +1568,72 @@ public com.google.container.v1.MaintenancePolicyOrBuilder getMaintenancePolicyOr
return getMaintenancePolicy();
}
+ public static final int NETWORK_CONFIG_FIELD_NUMBER = 27;
+ private com.google.container.v1.NetworkConfig networkConfig_;
+ /**
+ * + * Configuration for cluster networking. + *+ * + *
.google.container.v1.NetworkConfig network_config = 27;
+ */
+ public boolean hasNetworkConfig() {
+ return networkConfig_ != null;
+ }
+ /**
+ * + * Configuration for cluster networking. + *+ * + *
.google.container.v1.NetworkConfig network_config = 27;
+ */
+ public com.google.container.v1.NetworkConfig getNetworkConfig() {
+ return networkConfig_ == null ? com.google.container.v1.NetworkConfig.getDefaultInstance() : networkConfig_;
+ }
+ /**
+ * + * Configuration for cluster networking. + *+ * + *
.google.container.v1.NetworkConfig network_config = 27;
+ */
+ public com.google.container.v1.NetworkConfigOrBuilder getNetworkConfigOrBuilder() {
+ return getNetworkConfig();
+ }
+
+ public static final int PRIVATE_CLUSTER_CONFIG_FIELD_NUMBER = 37;
+ private com.google.container.v1.PrivateClusterConfig privateClusterConfig_;
+ /**
+ * + * Configuration for private cluster. + *+ * + *
.google.container.v1.PrivateClusterConfig private_cluster_config = 37;
+ */
+ public boolean hasPrivateClusterConfig() {
+ return privateClusterConfig_ != null;
+ }
+ /**
+ * + * Configuration for private cluster. + *+ * + *
.google.container.v1.PrivateClusterConfig private_cluster_config = 37;
+ */
+ public com.google.container.v1.PrivateClusterConfig getPrivateClusterConfig() {
+ return privateClusterConfig_ == null ? com.google.container.v1.PrivateClusterConfig.getDefaultInstance() : privateClusterConfig_;
+ }
+ /**
+ * + * Configuration for private cluster. + *+ * + *
.google.container.v1.PrivateClusterConfig private_cluster_config = 37;
+ */
+ public com.google.container.v1.PrivateClusterConfigOrBuilder getPrivateClusterConfigOrBuilder() {
+ return getPrivateClusterConfig();
+ }
+
public static final int SELF_LINK_FIELD_NUMBER = 100;
private volatile java.lang.Object selfLink_;
/**
@@ -1567,11 +1683,12 @@ public java.lang.String getSelfLink() {
* [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;
+ * string zone = 101 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -1588,11 +1705,12 @@ public java.lang.String getZone() {
* [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;
+ * string zone = 101 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
@@ -1664,6 +1782,13 @@ public java.lang.String getEndpoint() {
* 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;
@@ -1686,6 +1811,13 @@ public java.lang.String getInitialClusterVersion() {
* 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;
@@ -1750,14 +1882,16 @@ public java.lang.String getCurrentMasterVersion() {
private volatile java.lang.Object currentNodeVersion_;
/**
*
- * [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.
+ * [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;
+ * string current_node_version = 105 [deprecated = true];
*/
- public java.lang.String getCurrentNodeVersion() {
+ @java.lang.Deprecated public java.lang.String getCurrentNodeVersion() {
java.lang.Object ref = currentNodeVersion_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -1771,14 +1905,16 @@ public java.lang.String getCurrentNodeVersion() {
}
/**
*
- * [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.
+ * [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;
+ * string current_node_version = 105 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getCurrentNodeVersionBytes() {
java.lang.Object ref = currentNodeVersion_;
if (ref instanceof java.lang.String) {
@@ -1977,9 +2113,9 @@ public java.lang.String getServicesIpv4Cidr() {
* Deprecated. Use node_pools.instance_group_urls.
*
*
- * repeated string instance_group_urls = 111;
+ * repeated string instance_group_urls = 111 [deprecated = true];
*/
- public com.google.protobuf.ProtocolStringList
+ @java.lang.Deprecated public com.google.protobuf.ProtocolStringList
getInstanceGroupUrlsList() {
return instanceGroupUrls_;
}
@@ -1988,9 +2124,9 @@ public java.lang.String getServicesIpv4Cidr() {
* Deprecated. Use node_pools.instance_group_urls.
*
*
- * repeated string instance_group_urls = 111;
+ * repeated string instance_group_urls = 111 [deprecated = true];
*/
- public int getInstanceGroupUrlsCount() {
+ @java.lang.Deprecated public int getInstanceGroupUrlsCount() {
return instanceGroupUrls_.size();
}
/**
@@ -1998,9 +2134,9 @@ public int getInstanceGroupUrlsCount() {
* Deprecated. Use node_pools.instance_group_urls.
*
*
- * repeated string instance_group_urls = 111;
+ * repeated string instance_group_urls = 111 [deprecated = true];
*/
- public java.lang.String getInstanceGroupUrls(int index) {
+ @java.lang.Deprecated public java.lang.String getInstanceGroupUrls(int index) {
return instanceGroupUrls_.get(index);
}
/**
@@ -2008,9 +2144,9 @@ public java.lang.String getInstanceGroupUrls(int index) {
* Deprecated. Use node_pools.instance_group_urls.
*
*
- * repeated string instance_group_urls = 111;
+ * repeated string instance_group_urls = 111 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getInstanceGroupUrlsBytes(int index) {
return instanceGroupUrls_.getByteString(index);
}
@@ -2072,6 +2208,54 @@ public java.lang.String getExpireTime() {
}
}
+ public static final int LOCATION_FIELD_NUMBER = 114;
+ private volatile java.lang.Object location_;
+ /**
+ * + * [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;
+ */
+ public java.lang.String getLocation() {
+ java.lang.Object ref = location_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ location_ = s;
+ return s;
+ }
+ }
+ /**
+ * + * [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;
+ */
+ public com.google.protobuf.ByteString
+ getLocationBytes() {
+ java.lang.Object ref = location_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ location_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -2152,6 +2336,12 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
if (maintenancePolicy_ != null) {
output.writeMessage(23, getMaintenancePolicy());
}
+ if (networkConfig_ != null) {
+ output.writeMessage(27, getNetworkConfig());
+ }
+ if (privateClusterConfig_ != null) {
+ output.writeMessage(37, getPrivateClusterConfig());
+ }
if (!getSelfLinkBytes().isEmpty()) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 100, selfLink_);
}
@@ -2194,6 +2384,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
if (!getExpireTimeBytes().isEmpty()) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 113, expireTime_);
}
+ if (!getLocationBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 114, location_);
+ }
unknownFields.writeTo(output);
}
@@ -2289,6 +2482,14 @@ public int getSerializedSize() {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(23, getMaintenancePolicy());
}
+ if (networkConfig_ != null) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeMessageSize(27, getNetworkConfig());
+ }
+ if (privateClusterConfig_ != null) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeMessageSize(37, getPrivateClusterConfig());
+ }
if (!getSelfLinkBytes().isEmpty()) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(100, selfLink_);
}
@@ -2339,6 +2540,9 @@ public int getSerializedSize() {
if (!getExpireTimeBytes().isEmpty()) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(113, expireTime_);
}
+ if (!getLocationBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(114, location_);
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -2421,6 +2625,16 @@ public boolean equals(final java.lang.Object obj) {
result = result && getMaintenancePolicy()
.equals(other.getMaintenancePolicy());
}
+ result = result && (hasNetworkConfig() == other.hasNetworkConfig());
+ if (hasNetworkConfig()) {
+ result = result && getNetworkConfig()
+ .equals(other.getNetworkConfig());
+ }
+ result = result && (hasPrivateClusterConfig() == other.hasPrivateClusterConfig());
+ if (hasPrivateClusterConfig()) {
+ result = result && getPrivateClusterConfig()
+ .equals(other.getPrivateClusterConfig());
+ }
result = result && getSelfLink()
.equals(other.getSelfLink());
result = result && getZone()
@@ -2448,6 +2662,8 @@ public boolean equals(final java.lang.Object obj) {
== other.getCurrentNodeCount());
result = result && getExpireTime()
.equals(other.getExpireTime());
+ result = result && getLocation()
+ .equals(other.getLocation());
result = result && unknownFields.equals(other.unknownFields);
return result;
}
@@ -2524,6 +2740,14 @@ public int hashCode() {
hash = (37 * hash) + MAINTENANCE_POLICY_FIELD_NUMBER;
hash = (53 * hash) + getMaintenancePolicy().hashCode();
}
+ if (hasNetworkConfig()) {
+ hash = (37 * hash) + NETWORK_CONFIG_FIELD_NUMBER;
+ hash = (53 * hash) + getNetworkConfig().hashCode();
+ }
+ if (hasPrivateClusterConfig()) {
+ hash = (37 * hash) + PRIVATE_CLUSTER_CONFIG_FIELD_NUMBER;
+ hash = (53 * hash) + getPrivateClusterConfig().hashCode();
+ }
hash = (37 * hash) + SELF_LINK_FIELD_NUMBER;
hash = (53 * hash) + getSelfLink().hashCode();
hash = (37 * hash) + ZONE_FIELD_NUMBER;
@@ -2554,6 +2778,8 @@ public int hashCode() {
hash = (53 * hash) + getCurrentNodeCount();
hash = (37 * hash) + EXPIRE_TIME_FIELD_NUMBER;
hash = (53 * hash) + getExpireTime().hashCode();
+ hash = (37 * hash) + LOCATION_FIELD_NUMBER;
+ hash = (53 * hash) + getLocation().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -2651,7 +2877,7 @@ protected Builder newBuilderForType(
}
/**
*
- * A Google Container Engine cluster.
+ * A Google Kubernetes Engine cluster.
*
*
* Protobuf type {@code google.container.v1.Cluster}
@@ -2791,6 +3017,18 @@ public Builder clear() {
maintenancePolicy_ = null;
maintenancePolicyBuilder_ = null;
}
+ if (networkConfigBuilder_ == null) {
+ networkConfig_ = null;
+ } else {
+ networkConfig_ = null;
+ networkConfigBuilder_ = null;
+ }
+ if (privateClusterConfigBuilder_ == null) {
+ privateClusterConfig_ = null;
+ } else {
+ privateClusterConfig_ = null;
+ privateClusterConfigBuilder_ = null;
+ }
selfLink_ = "";
zone_ = "";
@@ -2814,11 +3052,13 @@ public Builder clear() {
servicesIpv4Cidr_ = "";
instanceGroupUrls_ = com.google.protobuf.LazyStringArrayList.EMPTY;
- bitField1_ = (bitField1_ & ~0x00000001);
+ bitField1_ = (bitField1_ & ~0x00000004);
currentNodeCount_ = 0;
expireTime_ = "";
+ location_ = "";
+
return this;
}
@@ -2848,6 +3088,7 @@ public com.google.container.v1.Cluster buildPartial() {
int from_bitField0_ = bitField0_;
int from_bitField1_ = bitField1_;
int to_bitField0_ = 0;
+ int to_bitField1_ = 0;
result.name_ = name_;
result.description_ = description_;
result.initialNodeCount_ = initialNodeCount_;
@@ -2914,6 +3155,16 @@ public com.google.container.v1.Cluster buildPartial() {
} else {
result.maintenancePolicy_ = maintenancePolicyBuilder_.build();
}
+ if (networkConfigBuilder_ == null) {
+ result.networkConfig_ = networkConfig_;
+ } else {
+ result.networkConfig_ = networkConfigBuilder_.build();
+ }
+ if (privateClusterConfigBuilder_ == null) {
+ result.privateClusterConfig_ = privateClusterConfig_;
+ } else {
+ result.privateClusterConfig_ = privateClusterConfigBuilder_.build();
+ }
result.selfLink_ = selfLink_;
result.zone_ = zone_;
result.endpoint_ = endpoint_;
@@ -2925,14 +3176,16 @@ public com.google.container.v1.Cluster buildPartial() {
result.statusMessage_ = statusMessage_;
result.nodeIpv4CidrSize_ = nodeIpv4CidrSize_;
result.servicesIpv4Cidr_ = servicesIpv4Cidr_;
- if (((bitField1_ & 0x00000001) == 0x00000001)) {
+ if (((bitField1_ & 0x00000004) == 0x00000004)) {
instanceGroupUrls_ = instanceGroupUrls_.getUnmodifiableView();
- bitField1_ = (bitField1_ & ~0x00000001);
+ bitField1_ = (bitField1_ & ~0x00000004);
}
result.instanceGroupUrls_ = instanceGroupUrls_;
result.currentNodeCount_ = currentNodeCount_;
result.expireTime_ = expireTime_;
+ result.location_ = location_;
result.bitField0_ = to_bitField0_;
+ result.bitField1_ = to_bitField1_;
onBuilt();
return result;
}
@@ -3081,6 +3334,12 @@ public Builder mergeFrom(com.google.container.v1.Cluster other) {
if (other.hasMaintenancePolicy()) {
mergeMaintenancePolicy(other.getMaintenancePolicy());
}
+ if (other.hasNetworkConfig()) {
+ mergeNetworkConfig(other.getNetworkConfig());
+ }
+ if (other.hasPrivateClusterConfig()) {
+ mergePrivateClusterConfig(other.getPrivateClusterConfig());
+ }
if (!other.getSelfLink().isEmpty()) {
selfLink_ = other.selfLink_;
onChanged();
@@ -3126,7 +3385,7 @@ public Builder mergeFrom(com.google.container.v1.Cluster other) {
if (!other.instanceGroupUrls_.isEmpty()) {
if (instanceGroupUrls_.isEmpty()) {
instanceGroupUrls_ = other.instanceGroupUrls_;
- bitField1_ = (bitField1_ & ~0x00000001);
+ bitField1_ = (bitField1_ & ~0x00000004);
} else {
ensureInstanceGroupUrlsIsMutable();
instanceGroupUrls_.addAll(other.instanceGroupUrls_);
@@ -3140,6 +3399,10 @@ public Builder mergeFrom(com.google.container.v1.Cluster other) {
expireTime_ = other.expireTime_;
onChanged();
}
+ if (!other.getLocation().isEmpty()) {
+ location_ = other.location_;
+ onChanged();
+ }
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -5744,7 +6007,6 @@ public com.google.container.v1.IPAllocationPolicyOrBuilder getIpAllocationPolicy
com.google.container.v1.MasterAuthorizedNetworksConfig, com.google.container.v1.MasterAuthorizedNetworksConfig.Builder, com.google.container.v1.MasterAuthorizedNetworksConfigOrBuilder> masterAuthorizedNetworksConfigBuilder_;
/**
*
- * Master authorized networks is a Beta feature.
* The configuration options for master authorized networks feature.
*
*
@@ -5755,7 +6017,6 @@ public boolean hasMasterAuthorizedNetworksConfig() {
}
/**
*
- * Master authorized networks is a Beta feature.
* The configuration options for master authorized networks feature.
*
*
@@ -5770,7 +6031,6 @@ public com.google.container.v1.MasterAuthorizedNetworksConfig getMasterAuthorize
}
/**
*
- * Master authorized networks is a Beta feature.
* The configuration options for master authorized networks feature.
*
*
@@ -5791,7 +6051,6 @@ public Builder setMasterAuthorizedNetworksConfig(com.google.container.v1.MasterA
}
/**
*
- * Master authorized networks is a Beta feature.
* The configuration options for master authorized networks feature.
*
*
@@ -5810,7 +6069,6 @@ public Builder setMasterAuthorizedNetworksConfig(
}
/**
*
- * Master authorized networks is a Beta feature.
* The configuration options for master authorized networks feature.
*
*
@@ -5833,7 +6091,6 @@ public Builder mergeMasterAuthorizedNetworksConfig(com.google.container.v1.Maste
}
/**
*
- * Master authorized networks is a Beta feature.
* The configuration options for master authorized networks feature.
*
*
@@ -5852,7 +6109,6 @@ public Builder clearMasterAuthorizedNetworksConfig() {
}
/**
*
- * Master authorized networks is a Beta feature.
* The configuration options for master authorized networks feature.
*
*
@@ -5865,7 +6121,6 @@ public com.google.container.v1.MasterAuthorizedNetworksConfig.Builder getMasterA
}
/**
*
- * Master authorized networks is a Beta feature.
* The configuration options for master authorized networks feature.
*
*
@@ -5881,7 +6136,6 @@ public com.google.container.v1.MasterAuthorizedNetworksConfigOrBuilder getMaster
}
/**
*
- * Master authorized networks is a Beta feature.
* The configuration options for master authorized networks feature.
*
*
@@ -6054,6 +6308,312 @@ public com.google.container.v1.MaintenancePolicyOrBuilder getMaintenancePolicyOr
return maintenancePolicyBuilder_;
}
+ private com.google.container.v1.NetworkConfig networkConfig_ = null;
+ private com.google.protobuf.SingleFieldBuilderV3<
+ com.google.container.v1.NetworkConfig, com.google.container.v1.NetworkConfig.Builder, com.google.container.v1.NetworkConfigOrBuilder> networkConfigBuilder_;
+ /**
+ * + * Configuration for cluster networking. + *+ * + *
.google.container.v1.NetworkConfig network_config = 27;
+ */
+ public boolean hasNetworkConfig() {
+ return networkConfigBuilder_ != null || networkConfig_ != null;
+ }
+ /**
+ * + * Configuration for cluster networking. + *+ * + *
.google.container.v1.NetworkConfig network_config = 27;
+ */
+ public com.google.container.v1.NetworkConfig getNetworkConfig() {
+ if (networkConfigBuilder_ == null) {
+ return networkConfig_ == null ? com.google.container.v1.NetworkConfig.getDefaultInstance() : networkConfig_;
+ } else {
+ return networkConfigBuilder_.getMessage();
+ }
+ }
+ /**
+ * + * Configuration for cluster networking. + *+ * + *
.google.container.v1.NetworkConfig network_config = 27;
+ */
+ public Builder setNetworkConfig(com.google.container.v1.NetworkConfig value) {
+ if (networkConfigBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ networkConfig_ = value;
+ onChanged();
+ } else {
+ networkConfigBuilder_.setMessage(value);
+ }
+
+ return this;
+ }
+ /**
+ * + * Configuration for cluster networking. + *+ * + *
.google.container.v1.NetworkConfig network_config = 27;
+ */
+ public Builder setNetworkConfig(
+ com.google.container.v1.NetworkConfig.Builder builderForValue) {
+ if (networkConfigBuilder_ == null) {
+ networkConfig_ = builderForValue.build();
+ onChanged();
+ } else {
+ networkConfigBuilder_.setMessage(builderForValue.build());
+ }
+
+ return this;
+ }
+ /**
+ * + * Configuration for cluster networking. + *+ * + *
.google.container.v1.NetworkConfig network_config = 27;
+ */
+ public Builder mergeNetworkConfig(com.google.container.v1.NetworkConfig value) {
+ if (networkConfigBuilder_ == null) {
+ if (networkConfig_ != null) {
+ networkConfig_ =
+ com.google.container.v1.NetworkConfig.newBuilder(networkConfig_).mergeFrom(value).buildPartial();
+ } else {
+ networkConfig_ = value;
+ }
+ onChanged();
+ } else {
+ networkConfigBuilder_.mergeFrom(value);
+ }
+
+ return this;
+ }
+ /**
+ * + * Configuration for cluster networking. + *+ * + *
.google.container.v1.NetworkConfig network_config = 27;
+ */
+ public Builder clearNetworkConfig() {
+ if (networkConfigBuilder_ == null) {
+ networkConfig_ = null;
+ onChanged();
+ } else {
+ networkConfig_ = null;
+ networkConfigBuilder_ = null;
+ }
+
+ return this;
+ }
+ /**
+ * + * Configuration for cluster networking. + *+ * + *
.google.container.v1.NetworkConfig network_config = 27;
+ */
+ public com.google.container.v1.NetworkConfig.Builder getNetworkConfigBuilder() {
+
+ onChanged();
+ return getNetworkConfigFieldBuilder().getBuilder();
+ }
+ /**
+ * + * Configuration for cluster networking. + *+ * + *
.google.container.v1.NetworkConfig network_config = 27;
+ */
+ public com.google.container.v1.NetworkConfigOrBuilder getNetworkConfigOrBuilder() {
+ if (networkConfigBuilder_ != null) {
+ return networkConfigBuilder_.getMessageOrBuilder();
+ } else {
+ return networkConfig_ == null ?
+ com.google.container.v1.NetworkConfig.getDefaultInstance() : networkConfig_;
+ }
+ }
+ /**
+ * + * Configuration for cluster networking. + *+ * + *
.google.container.v1.NetworkConfig network_config = 27;
+ */
+ private com.google.protobuf.SingleFieldBuilderV3<
+ com.google.container.v1.NetworkConfig, com.google.container.v1.NetworkConfig.Builder, com.google.container.v1.NetworkConfigOrBuilder>
+ getNetworkConfigFieldBuilder() {
+ if (networkConfigBuilder_ == null) {
+ networkConfigBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+ com.google.container.v1.NetworkConfig, com.google.container.v1.NetworkConfig.Builder, com.google.container.v1.NetworkConfigOrBuilder>(
+ getNetworkConfig(),
+ getParentForChildren(),
+ isClean());
+ networkConfig_ = null;
+ }
+ return networkConfigBuilder_;
+ }
+
+ private com.google.container.v1.PrivateClusterConfig privateClusterConfig_ = null;
+ private com.google.protobuf.SingleFieldBuilderV3<
+ com.google.container.v1.PrivateClusterConfig, com.google.container.v1.PrivateClusterConfig.Builder, com.google.container.v1.PrivateClusterConfigOrBuilder> privateClusterConfigBuilder_;
+ /**
+ * + * Configuration for private cluster. + *+ * + *
.google.container.v1.PrivateClusterConfig private_cluster_config = 37;
+ */
+ public boolean hasPrivateClusterConfig() {
+ return privateClusterConfigBuilder_ != null || privateClusterConfig_ != null;
+ }
+ /**
+ * + * Configuration for private cluster. + *+ * + *
.google.container.v1.PrivateClusterConfig private_cluster_config = 37;
+ */
+ public com.google.container.v1.PrivateClusterConfig getPrivateClusterConfig() {
+ if (privateClusterConfigBuilder_ == null) {
+ return privateClusterConfig_ == null ? com.google.container.v1.PrivateClusterConfig.getDefaultInstance() : privateClusterConfig_;
+ } else {
+ return privateClusterConfigBuilder_.getMessage();
+ }
+ }
+ /**
+ * + * Configuration for private cluster. + *+ * + *
.google.container.v1.PrivateClusterConfig private_cluster_config = 37;
+ */
+ public Builder setPrivateClusterConfig(com.google.container.v1.PrivateClusterConfig value) {
+ if (privateClusterConfigBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ privateClusterConfig_ = value;
+ onChanged();
+ } else {
+ privateClusterConfigBuilder_.setMessage(value);
+ }
+
+ return this;
+ }
+ /**
+ * + * Configuration for private cluster. + *+ * + *
.google.container.v1.PrivateClusterConfig private_cluster_config = 37;
+ */
+ public Builder setPrivateClusterConfig(
+ com.google.container.v1.PrivateClusterConfig.Builder builderForValue) {
+ if (privateClusterConfigBuilder_ == null) {
+ privateClusterConfig_ = builderForValue.build();
+ onChanged();
+ } else {
+ privateClusterConfigBuilder_.setMessage(builderForValue.build());
+ }
+
+ return this;
+ }
+ /**
+ * + * Configuration for private cluster. + *+ * + *
.google.container.v1.PrivateClusterConfig private_cluster_config = 37;
+ */
+ public Builder mergePrivateClusterConfig(com.google.container.v1.PrivateClusterConfig value) {
+ if (privateClusterConfigBuilder_ == null) {
+ if (privateClusterConfig_ != null) {
+ privateClusterConfig_ =
+ com.google.container.v1.PrivateClusterConfig.newBuilder(privateClusterConfig_).mergeFrom(value).buildPartial();
+ } else {
+ privateClusterConfig_ = value;
+ }
+ onChanged();
+ } else {
+ privateClusterConfigBuilder_.mergeFrom(value);
+ }
+
+ return this;
+ }
+ /**
+ * + * Configuration for private cluster. + *+ * + *
.google.container.v1.PrivateClusterConfig private_cluster_config = 37;
+ */
+ public Builder clearPrivateClusterConfig() {
+ if (privateClusterConfigBuilder_ == null) {
+ privateClusterConfig_ = null;
+ onChanged();
+ } else {
+ privateClusterConfig_ = null;
+ privateClusterConfigBuilder_ = null;
+ }
+
+ return this;
+ }
+ /**
+ * + * Configuration for private cluster. + *+ * + *
.google.container.v1.PrivateClusterConfig private_cluster_config = 37;
+ */
+ public com.google.container.v1.PrivateClusterConfig.Builder getPrivateClusterConfigBuilder() {
+
+ onChanged();
+ return getPrivateClusterConfigFieldBuilder().getBuilder();
+ }
+ /**
+ * + * Configuration for private cluster. + *+ * + *
.google.container.v1.PrivateClusterConfig private_cluster_config = 37;
+ */
+ public com.google.container.v1.PrivateClusterConfigOrBuilder getPrivateClusterConfigOrBuilder() {
+ if (privateClusterConfigBuilder_ != null) {
+ return privateClusterConfigBuilder_.getMessageOrBuilder();
+ } else {
+ return privateClusterConfig_ == null ?
+ com.google.container.v1.PrivateClusterConfig.getDefaultInstance() : privateClusterConfig_;
+ }
+ }
+ /**
+ * + * Configuration for private cluster. + *+ * + *
.google.container.v1.PrivateClusterConfig private_cluster_config = 37;
+ */
+ private com.google.protobuf.SingleFieldBuilderV3<
+ com.google.container.v1.PrivateClusterConfig, com.google.container.v1.PrivateClusterConfig.Builder, com.google.container.v1.PrivateClusterConfigOrBuilder>
+ getPrivateClusterConfigFieldBuilder() {
+ if (privateClusterConfigBuilder_ == null) {
+ privateClusterConfigBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+ com.google.container.v1.PrivateClusterConfig, com.google.container.v1.PrivateClusterConfig.Builder, com.google.container.v1.PrivateClusterConfigOrBuilder>(
+ getPrivateClusterConfig(),
+ getParentForChildren(),
+ isClean());
+ privateClusterConfig_ = null;
+ }
+ return privateClusterConfigBuilder_;
+ }
+
private java.lang.Object selfLink_ = "";
/**
*
@@ -6149,11 +6709,12 @@ public Builder setSelfLinkBytes(
* [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;
+ * string zone = 101 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -6170,11 +6731,12 @@ public java.lang.String getZone() {
* [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;
+ * string zone = 101 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof String) {
@@ -6192,11 +6754,12 @@ public java.lang.String getZone() {
* [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;
+ * string zone = 101 [deprecated = true];
*/
- public Builder setZone(
+ @java.lang.Deprecated public Builder setZone(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -6211,11 +6774,12 @@ public Builder setZone(
* [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;
+ * string zone = 101 [deprecated = true];
*/
- public Builder clearZone() {
+ @java.lang.Deprecated public Builder clearZone() {
zone_ = getDefaultInstance().getZone();
onChanged();
@@ -6226,11 +6790,12 @@ public Builder clearZone() {
* [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;
+ * string zone = 101 [deprecated = true];
*/
- public Builder setZoneBytes(
+ @java.lang.Deprecated public Builder setZoneBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -6358,6 +6923,13 @@ public Builder setEndpointBytes(
* 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;
@@ -6380,6 +6952,13 @@ public java.lang.String getInitialClusterVersion() {
* 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;
@@ -6403,6 +6982,13 @@ public java.lang.String getInitialClusterVersion() {
* 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;
@@ -6423,6 +7009,13 @@ public Builder setInitialClusterVersion(
* 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;
@@ -6439,6 +7032,13 @@ public Builder clearInitialClusterVersion() {
* 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;
@@ -6547,14 +7147,16 @@ public Builder setCurrentMasterVersionBytes(
private java.lang.Object currentNodeVersion_ = "";
/**
*
- * [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.
+ * [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;
+ * string current_node_version = 105 [deprecated = true];
*/
- public java.lang.String getCurrentNodeVersion() {
+ @java.lang.Deprecated public java.lang.String getCurrentNodeVersion() {
java.lang.Object ref = currentNodeVersion_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -6568,14 +7170,16 @@ public java.lang.String getCurrentNodeVersion() {
}
/**
*
- * [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.
+ * [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;
+ * string current_node_version = 105 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getCurrentNodeVersionBytes() {
java.lang.Object ref = currentNodeVersion_;
if (ref instanceof String) {
@@ -6590,14 +7194,16 @@ public java.lang.String getCurrentNodeVersion() {
}
/**
*
- * [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.
+ * [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;
+ * string current_node_version = 105 [deprecated = true];
*/
- public Builder setCurrentNodeVersion(
+ @java.lang.Deprecated public Builder setCurrentNodeVersion(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -6609,14 +7215,16 @@ public Builder setCurrentNodeVersion(
}
/**
*
- * [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.
+ * [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;
+ * string current_node_version = 105 [deprecated = true];
*/
- public Builder clearCurrentNodeVersion() {
+ @java.lang.Deprecated public Builder clearCurrentNodeVersion() {
currentNodeVersion_ = getDefaultInstance().getCurrentNodeVersion();
onChanged();
@@ -6624,14 +7232,16 @@ public Builder clearCurrentNodeVersion() {
}
/**
*
- * [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.
+ * [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;
+ * string current_node_version = 105 [deprecated = true];
*/
- public Builder setCurrentNodeVersionBytes(
+ @java.lang.Deprecated public Builder setCurrentNodeVersionBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -7051,9 +7661,9 @@ public Builder setServicesIpv4CidrBytes(
private com.google.protobuf.LazyStringList instanceGroupUrls_ = com.google.protobuf.LazyStringArrayList.EMPTY;
private void ensureInstanceGroupUrlsIsMutable() {
- if (!((bitField1_ & 0x00000001) == 0x00000001)) {
+ if (!((bitField1_ & 0x00000004) == 0x00000004)) {
instanceGroupUrls_ = new com.google.protobuf.LazyStringArrayList(instanceGroupUrls_);
- bitField1_ |= 0x00000001;
+ bitField1_ |= 0x00000004;
}
}
/**
@@ -7061,9 +7671,9 @@ private void ensureInstanceGroupUrlsIsMutable() {
* Deprecated. Use node_pools.instance_group_urls.
*
*
- * repeated string instance_group_urls = 111;
+ * repeated string instance_group_urls = 111 [deprecated = true];
*/
- public com.google.protobuf.ProtocolStringList
+ @java.lang.Deprecated public com.google.protobuf.ProtocolStringList
getInstanceGroupUrlsList() {
return instanceGroupUrls_.getUnmodifiableView();
}
@@ -7072,9 +7682,9 @@ private void ensureInstanceGroupUrlsIsMutable() {
* Deprecated. Use node_pools.instance_group_urls.
*
*
- * repeated string instance_group_urls = 111;
+ * repeated string instance_group_urls = 111 [deprecated = true];
*/
- public int getInstanceGroupUrlsCount() {
+ @java.lang.Deprecated public int getInstanceGroupUrlsCount() {
return instanceGroupUrls_.size();
}
/**
@@ -7082,9 +7692,9 @@ public int getInstanceGroupUrlsCount() {
* Deprecated. Use node_pools.instance_group_urls.
*
*
- * repeated string instance_group_urls = 111;
+ * repeated string instance_group_urls = 111 [deprecated = true];
*/
- public java.lang.String getInstanceGroupUrls(int index) {
+ @java.lang.Deprecated public java.lang.String getInstanceGroupUrls(int index) {
return instanceGroupUrls_.get(index);
}
/**
@@ -7092,9 +7702,9 @@ public java.lang.String getInstanceGroupUrls(int index) {
* Deprecated. Use node_pools.instance_group_urls.
*
*
- * repeated string instance_group_urls = 111;
+ * repeated string instance_group_urls = 111 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getInstanceGroupUrlsBytes(int index) {
return instanceGroupUrls_.getByteString(index);
}
@@ -7103,9 +7713,9 @@ public java.lang.String getInstanceGroupUrls(int index) {
* Deprecated. Use node_pools.instance_group_urls.
*
*
- * repeated string instance_group_urls = 111;
+ * repeated string instance_group_urls = 111 [deprecated = true];
*/
- public Builder setInstanceGroupUrls(
+ @java.lang.Deprecated public Builder setInstanceGroupUrls(
int index, java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -7120,9 +7730,9 @@ public Builder setInstanceGroupUrls(
* Deprecated. Use node_pools.instance_group_urls.
*
*
- * repeated string instance_group_urls = 111;
+ * repeated string instance_group_urls = 111 [deprecated = true];
*/
- public Builder addInstanceGroupUrls(
+ @java.lang.Deprecated public Builder addInstanceGroupUrls(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -7137,9 +7747,9 @@ public Builder addInstanceGroupUrls(
* Deprecated. Use node_pools.instance_group_urls.
*
*
- * repeated string instance_group_urls = 111;
+ * repeated string instance_group_urls = 111 [deprecated = true];
*/
- public Builder addAllInstanceGroupUrls(
+ @java.lang.Deprecated public Builder addAllInstanceGroupUrls(
java.lang.Iterablerepeated string instance_group_urls = 111;
+ * repeated string instance_group_urls = 111 [deprecated = true];
*/
- public Builder clearInstanceGroupUrls() {
+ @java.lang.Deprecated public Builder clearInstanceGroupUrls() {
instanceGroupUrls_ = com.google.protobuf.LazyStringArrayList.EMPTY;
- bitField1_ = (bitField1_ & ~0x00000001);
+ bitField1_ = (bitField1_ & ~0x00000004);
onChanged();
return this;
}
@@ -7165,9 +7775,9 @@ public Builder clearInstanceGroupUrls() {
* Deprecated. Use node_pools.instance_group_urls.
*
*
- * repeated string instance_group_urls = 111;
+ * repeated string instance_group_urls = 111 [deprecated = true];
*/
- public Builder addInstanceGroupUrlsBytes(
+ @java.lang.Deprecated public Builder addInstanceGroupUrlsBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -7310,6 +7920,110 @@ public Builder setExpireTimeBytes(
onChanged();
return this;
}
+
+ private java.lang.Object location_ = "";
+ /**
+ * + * [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;
+ */
+ public java.lang.String getLocation() {
+ java.lang.Object ref = location_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ location_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ * + * [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;
+ */
+ public com.google.protobuf.ByteString
+ getLocationBytes() {
+ java.lang.Object ref = location_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ location_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ * + * [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;
+ */
+ public Builder setLocation(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ location_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * + * [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;
+ */
+ public Builder clearLocation() {
+
+ location_ = getDefaultInstance().getLocation();
+ onChanged();
+ return this;
+ }
+ /**
+ * + * [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;
+ */
+ public Builder setLocationBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ location_ = value;
+ onChanged();
+ return this;
+ }
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ClusterOrBuilder.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ClusterOrBuilder.java
index 2c971059f569..82bf9784700f 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ClusterOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ClusterOrBuilder.java
@@ -553,7 +553,6 @@ java.lang.String getResourceLabelsOrThrow(
/**
*
- * Master authorized networks is a Beta feature.
* The configuration options for master authorized networks feature.
*
*
@@ -562,7 +561,6 @@ java.lang.String getResourceLabelsOrThrow(
boolean hasMasterAuthorizedNetworksConfig();
/**
*
- * Master authorized networks is a Beta feature.
* The configuration options for master authorized networks feature.
*
*
@@ -571,7 +569,6 @@ java.lang.String getResourceLabelsOrThrow(
com.google.container.v1.MasterAuthorizedNetworksConfig getMasterAuthorizedNetworksConfig();
/**
*
- * Master authorized networks is a Beta feature.
* The configuration options for master authorized networks feature.
*
*
@@ -604,6 +601,56 @@ java.lang.String getResourceLabelsOrThrow(
*/
com.google.container.v1.MaintenancePolicyOrBuilder getMaintenancePolicyOrBuilder();
+ /**
+ * + * Configuration for cluster networking. + *+ * + *
.google.container.v1.NetworkConfig network_config = 27;
+ */
+ boolean hasNetworkConfig();
+ /**
+ * + * Configuration for cluster networking. + *+ * + *
.google.container.v1.NetworkConfig network_config = 27;
+ */
+ com.google.container.v1.NetworkConfig getNetworkConfig();
+ /**
+ * + * Configuration for cluster networking. + *+ * + *
.google.container.v1.NetworkConfig network_config = 27;
+ */
+ com.google.container.v1.NetworkConfigOrBuilder getNetworkConfigOrBuilder();
+
+ /**
+ * + * Configuration for private cluster. + *+ * + *
.google.container.v1.PrivateClusterConfig private_cluster_config = 37;
+ */
+ boolean hasPrivateClusterConfig();
+ /**
+ * + * Configuration for private cluster. + *+ * + *
.google.container.v1.PrivateClusterConfig private_cluster_config = 37;
+ */
+ com.google.container.v1.PrivateClusterConfig getPrivateClusterConfig();
+ /**
+ * + * Configuration for private cluster. + *+ * + *
.google.container.v1.PrivateClusterConfig private_cluster_config = 37;
+ */
+ com.google.container.v1.PrivateClusterConfigOrBuilder getPrivateClusterConfigOrBuilder();
+
/**
*
* [Output only] Server-defined URL for the resource.
@@ -627,21 +674,23 @@ java.lang.String getResourceLabelsOrThrow(
* [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;
+ * string zone = 101 [deprecated = true];
*/
- java.lang.String getZone();
+ @java.lang.Deprecated java.lang.String getZone();
/**
*
* [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;
+ * string zone = 101 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getZoneBytes();
/**
@@ -676,6 +725,13 @@ java.lang.String getResourceLabelsOrThrow(
* 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;
@@ -687,6 +743,13 @@ java.lang.String getResourceLabelsOrThrow(
* 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;
@@ -714,24 +777,28 @@ java.lang.String getResourceLabelsOrThrow(
/**
*
- * [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.
+ * [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;
+ * string current_node_version = 105 [deprecated = true];
*/
- java.lang.String getCurrentNodeVersion();
+ @java.lang.Deprecated java.lang.String getCurrentNodeVersion();
/**
*
- * [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.
+ * [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;
+ * string current_node_version = 105 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getCurrentNodeVersionBytes();
/**
@@ -833,34 +900,34 @@ java.lang.String getResourceLabelsOrThrow(
* Deprecated. Use node_pools.instance_group_urls.
*
*
- * repeated string instance_group_urls = 111;
+ * repeated string instance_group_urls = 111 [deprecated = true];
*/
- java.util.List
* Deprecated. Use node_pools.instance_group_urls.
*
*
- * repeated string instance_group_urls = 111;
+ * repeated string instance_group_urls = 111 [deprecated = true];
*/
- int getInstanceGroupUrlsCount();
+ @java.lang.Deprecated int getInstanceGroupUrlsCount();
/**
*
* Deprecated. Use node_pools.instance_group_urls.
*
*
- * repeated string instance_group_urls = 111;
+ * repeated string instance_group_urls = 111 [deprecated = true];
*/
- java.lang.String getInstanceGroupUrls(int index);
+ @java.lang.Deprecated java.lang.String getInstanceGroupUrls(int index);
/**
*
* Deprecated. Use node_pools.instance_group_urls.
*
*
- * repeated string instance_group_urls = 111;
+ * repeated string instance_group_urls = 111 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getInstanceGroupUrlsBytes(int index);
/**
@@ -891,4 +958,28 @@ java.lang.String getResourceLabelsOrThrow(
*/
com.google.protobuf.ByteString
getExpireTimeBytes();
+
+ /**
+ * + * [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;
+ */
+ java.lang.String getLocation();
+ /**
+ * + * [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;
+ */
+ com.google.protobuf.ByteString
+ getLocationBytes();
}
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ClusterServiceProto.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ClusterServiceProto.java
index 81671c0542bc..9391f90ba17f 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ClusterServiceProto.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ClusterServiceProto.java
@@ -64,6 +64,11 @@ public static void registerAllExtensions(
static final
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internal_static_google_container_v1_NetworkPolicyConfig_fieldAccessorTable;
+ static final com.google.protobuf.Descriptors.Descriptor
+ internal_static_google_container_v1_PrivateClusterConfig_descriptor;
+ static final
+ com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+ internal_static_google_container_v1_PrivateClusterConfig_fieldAccessorTable;
static final com.google.protobuf.Descriptors.Descriptor
internal_static_google_container_v1_MasterAuthorizedNetworksConfig_descriptor;
static final
@@ -324,6 +329,11 @@ public static void registerAllExtensions(
static final
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internal_static_google_container_v1_SetMaintenancePolicyRequest_fieldAccessorTable;
+ static final com.google.protobuf.Descriptors.Descriptor
+ internal_static_google_container_v1_NetworkConfig_descriptor;
+ static final
+ com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+ internal_static_google_container_v1_NetworkConfig_fieldAccessorTable;
public static com.google.protobuf.Descriptors.FileDescriptor
getDescriptor() {
@@ -336,7 +346,7 @@ public static void registerAllExtensions(
"\n)google/container/v1/cluster_service.pr" +
"oto\022\023google.container.v1\032\034google/api/ann" +
"otations.proto\032\033google/protobuf/empty.pr" +
- "oto\"\355\003\n\nNodeConfig\022\024\n\014machine_type\030\001 \001(\t" +
+ "oto\"\200\004\n\nNodeConfig\022\024\n\014machine_type\030\001 \001(\t" +
"\022\024\n\014disk_size_gb\030\002 \001(\005\022\024\n\014oauth_scopes\030\003" +
" \003(\t\022\027\n\017service_account\030\t \001(\t\022?\n\010metadat" +
"a\030\004 \003(\0132-.google.container.v1.NodeConfig" +
@@ -345,380 +355,459 @@ public static void registerAllExtensions(
"fig.LabelsEntry\022\027\n\017local_ssd_count\030\007 \001(\005" +
"\022\014\n\004tags\030\010 \003(\t\022\023\n\013preemptible\030\n \001(\010\022<\n\014a" +
"ccelerators\030\013 \003(\0132&.google.container.v1." +
- "AcceleratorConfig\022\030\n\020min_cpu_platform\030\r " +
- "\001(\t\032/\n\rMetadataEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005val" +
- "ue\030\002 \001(\t:\0028\001\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t" +
- "\022\r\n\005value\030\002 \001(\t:\0028\001\"\321\001\n\nMasterAuth\022\020\n\010us" +
- "ername\030\001 \001(\t\022\020\n\010password\030\002 \001(\t\022O\n\031client" +
- "_certificate_config\030\003 \001(\0132,.google.conta" +
- "iner.v1.ClientCertificateConfig\022\036\n\026clust" +
- "er_ca_certificate\030d \001(\t\022\032\n\022client_certif" +
- "icate\030e \001(\t\022\022\n\nclient_key\030f \001(\t\";\n\027Clien" +
- "tCertificateConfig\022 \n\030issue_client_certi" +
- "ficate\030\001 \001(\010\"\267\002\n\014AddonsConfig\022C\n\023http_lo" +
- "ad_balancing\030\001 \001(\0132&.google.container.v1" +
- ".HttpLoadBalancing\022Q\n\032horizontal_pod_aut" +
- "oscaling\030\002 \001(\0132-.google.container.v1.Hor" +
- "izontalPodAutoscaling\022F\n\024kubernetes_dash" +
- "board\030\003 \001(\0132(.google.container.v1.Kubern" +
- "etesDashboard\022G\n\025network_policy_config\030\004" +
- " \001(\0132(.google.container.v1.NetworkPolicy" +
- "Config\"%\n\021HttpLoadBalancing\022\020\n\010disabled\030" +
- "\001 \001(\010\",\n\030HorizontalPodAutoscaling\022\020\n\010dis" +
- "abled\030\001 \001(\010\"\'\n\023KubernetesDashboard\022\020\n\010di" +
- "sabled\030\001 \001(\010\"\'\n\023NetworkPolicyConfig\022\020\n\010d" +
- "isabled\030\001 \001(\010\"\274\001\n\036MasterAuthorizedNetwor" +
- "ksConfig\022\017\n\007enabled\030\001 \001(\010\022R\n\013cidr_blocks" +
- "\030\002 \003(\0132=.google.container.v1.MasterAutho" +
- "rizedNetworksConfig.CidrBlock\0325\n\tCidrBlo" +
- "ck\022\024\n\014display_name\030\001 \001(\t\022\022\n\ncidr_block\030\002" +
- " \001(\t\"\035\n\nLegacyAbac\022\017\n\007enabled\030\001 \001(\010\"\221\001\n\r" +
- "NetworkPolicy\022=\n\010provider\030\001 \001(\0162+.google" +
- ".container.v1.NetworkPolicy.Provider\022\017\n\007" +
- "enabled\030\002 \001(\010\"0\n\010Provider\022\030\n\024PROVIDER_UN" +
- "SPECIFIED\020\000\022\n\n\006CALICO\020\001\"\335\002\n\022IPAllocation" +
- "Policy\022\026\n\016use_ip_aliases\030\001 \001(\010\022\031\n\021create" +
- "_subnetwork\030\002 \001(\010\022\027\n\017subnetwork_name\030\003 \001" +
- "(\t\022\031\n\021cluster_ipv4_cidr\030\004 \001(\t\022\026\n\016node_ip" +
- "v4_cidr\030\005 \001(\t\022\032\n\022services_ipv4_cidr\030\006 \001(" +
- "\t\022$\n\034cluster_secondary_range_name\030\007 \001(\t\022" +
- "%\n\035services_secondary_range_name\030\010 \001(\t\022\037" +
- "\n\027cluster_ipv4_cidr_block\030\t \001(\t\022\034\n\024node_" +
- "ipv4_cidr_block\030\n \001(\t\022 \n\030services_ipv4_c" +
- "idr_block\030\013 \001(\t\"\252\013\n\007Cluster\022\014\n\004name\030\001 \001(" +
- "\t\022\023\n\013description\030\002 \001(\t\022\032\n\022initial_node_c" +
- "ount\030\003 \001(\005\0224\n\013node_config\030\004 \001(\0132\037.google" +
- ".container.v1.NodeConfig\0224\n\013master_auth\030" +
- "\005 \001(\0132\037.google.container.v1.MasterAuth\022\027" +
- "\n\017logging_service\030\006 \001(\t\022\032\n\022monitoring_se" +
- "rvice\030\007 \001(\t\022\017\n\007network\030\010 \001(\t\022\031\n\021cluster_" +
- "ipv4_cidr\030\t \001(\t\0228\n\raddons_config\030\n \001(\0132!" +
- ".google.container.v1.AddonsConfig\022\022\n\nsub" +
- "network\030\013 \001(\t\0221\n\nnode_pools\030\014 \003(\0132\035.goog" +
- "le.container.v1.NodePool\022\021\n\tlocations\030\r " +
- "\003(\t\022\037\n\027enable_kubernetes_alpha\030\016 \001(\010\022I\n\017" +
- "resource_labels\030\017 \003(\01320.google.container" +
- ".v1.Cluster.ResourceLabelsEntry\022\031\n\021label" +
- "_fingerprint\030\020 \001(\t\0224\n\013legacy_abac\030\022 \001(\0132" +
- "\037.google.container.v1.LegacyAbac\022:\n\016netw" +
- "ork_policy\030\023 \001(\0132\".google.container.v1.N" +
- "etworkPolicy\022E\n\024ip_allocation_policy\030\024 \001" +
- "(\0132\'.google.container.v1.IPAllocationPol" +
- "icy\022^\n!master_authorized_networks_config" +
- "\030\026 \001(\01323.google.container.v1.MasterAutho" +
- "rizedNetworksConfig\022B\n\022maintenance_polic" +
- "y\030\027 \001(\0132&.google.container.v1.Maintenanc" +
- "ePolicy\022\021\n\tself_link\030d \001(\t\022\014\n\004zone\030e \001(\t" +
- "\022\020\n\010endpoint\030f \001(\t\022\037\n\027initial_cluster_ve" +
- "rsion\030g \001(\t\022\036\n\026current_master_version\030h " +
- "\001(\t\022\034\n\024current_node_version\030i \001(\t\022\023\n\013cre" +
- "ate_time\030j \001(\t\0223\n\006status\030k \001(\0162#.google." +
- "container.v1.Cluster.Status\022\026\n\016status_me" +
- "ssage\030l \001(\t\022\033\n\023node_ipv4_cidr_size\030m \001(\005" +
- "\022\032\n\022services_ipv4_cidr\030n \001(\t\022\033\n\023instance" +
- "_group_urls\030o \003(\t\022\032\n\022current_node_count\030" +
- "p \001(\005\022\023\n\013expire_time\030q \001(\t\0325\n\023ResourceLa" +
- "belsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028" +
- "\001\"i\n\006Status\022\026\n\022STATUS_UNSPECIFIED\020\000\022\020\n\014P" +
- "ROVISIONING\020\001\022\013\n\007RUNNING\020\002\022\017\n\013RECONCILIN" +
- "G\020\003\022\014\n\010STOPPING\020\004\022\t\n\005ERROR\020\005\"\301\003\n\rCluster" +
- "Update\022\034\n\024desired_node_version\030\004 \001(\t\022\"\n\032" +
- "desired_monitoring_service\030\005 \001(\t\022@\n\025desi" +
- "red_addons_config\030\006 \001(\0132!.google.contain" +
- "er.v1.AddonsConfig\022\034\n\024desired_node_pool_" +
- "id\030\007 \001(\t\022\032\n\022desired_image_type\030\010 \001(\t\022O\n\035" +
- "desired_node_pool_autoscaling\030\t \001(\0132(.go" +
- "ogle.container.v1.NodePoolAutoscaling\022\031\n" +
- "\021desired_locations\030\n \003(\t\022f\n)desired_mast" +
- "er_authorized_networks_config\030\014 \001(\01323.go" +
- "ogle.container.v1.MasterAuthorizedNetwor" +
- "ksConfig\022\036\n\026desired_master_version\030d \001(\t" +
- "\"\345\005\n\tOperation\022\014\n\004name\030\001 \001(\t\022\014\n\004zone\030\002 \001" +
- "(\t\022;\n\016operation_type\030\003 \001(\0162#.google.cont" +
- "ainer.v1.Operation.Type\0225\n\006status\030\004 \001(\0162" +
- "%.google.container.v1.Operation.Status\022\016" +
- "\n\006detail\030\010 \001(\t\022\026\n\016status_message\030\005 \001(\t\022\021" +
- "\n\tself_link\030\006 \001(\t\022\023\n\013target_link\030\007 \001(\t\022\022" +
- "\n\nstart_time\030\n \001(\t\022\020\n\010end_time\030\013 \001(\t\"R\n\006" +
- "Status\022\026\n\022STATUS_UNSPECIFIED\020\000\022\013\n\007PENDIN" +
- "G\020\001\022\013\n\007RUNNING\020\002\022\010\n\004DONE\020\003\022\014\n\010ABORTING\020\004" +
- "\"\375\002\n\004Type\022\024\n\020TYPE_UNSPECIFIED\020\000\022\022\n\016CREAT" +
- "E_CLUSTER\020\001\022\022\n\016DELETE_CLUSTER\020\002\022\022\n\016UPGRA" +
- "DE_MASTER\020\003\022\021\n\rUPGRADE_NODES\020\004\022\022\n\016REPAIR" +
- "_CLUSTER\020\005\022\022\n\016UPDATE_CLUSTER\020\006\022\024\n\020CREATE" +
- "_NODE_POOL\020\007\022\024\n\020DELETE_NODE_POOL\020\010\022\034\n\030SE" +
- "T_NODE_POOL_MANAGEMENT\020\t\022\025\n\021AUTO_REPAIR_" +
- "NODES\020\n\022\026\n\022AUTO_UPGRADE_NODES\020\013\022\016\n\nSET_L" +
- "ABELS\020\014\022\023\n\017SET_MASTER_AUTH\020\r\022\026\n\022SET_NODE" +
- "_POOL_SIZE\020\016\022\026\n\022SET_NETWORK_POLICY\020\017\022\032\n\026" +
- "SET_MAINTENANCE_POLICY\020\020\"g\n\024CreateCluste" +
- "rRequest\022\022\n\nproject_id\030\001 \001(\t\022\014\n\004zone\030\002 \001" +
- "(\t\022-\n\007cluster\030\003 \001(\0132\034.google.container.v" +
- "1.Cluster\"I\n\021GetClusterRequest\022\022\n\nprojec" +
- "t_id\030\001 \001(\t\022\014\n\004zone\030\002 \001(\t\022\022\n\ncluster_id\030\003" +
- " \001(\t\"\200\001\n\024UpdateClusterRequest\022\022\n\nproject" +
- "_id\030\001 \001(\t\022\014\n\004zone\030\002 \001(\t\022\022\n\ncluster_id\030\003 " +
- "\001(\t\0222\n\006update\030\004 \001(\0132\".google.container.v" +
- "1.ClusterUpdate\"\215\001\n\025UpdateNodePoolReques" +
- "t\022\022\n\nproject_id\030\001 \001(\t\022\014\n\004zone\030\002 \001(\t\022\022\n\nc" +
- "luster_id\030\003 \001(\t\022\024\n\014node_pool_id\030\004 \001(\t\022\024\n" +
- "\014node_version\030\005 \001(\t\022\022\n\nimage_type\030\006 \001(\t\"" +
- "\252\001\n\035SetNodePoolAutoscalingRequest\022\022\n\npro" +
- "ject_id\030\001 \001(\t\022\014\n\004zone\030\002 \001(\t\022\022\n\ncluster_i" +
- "d\030\003 \001(\t\022\024\n\014node_pool_id\030\004 \001(\t\022=\n\013autosca" +
- "ling\030\005 \001(\0132(.google.container.v1.NodePoo" +
- "lAutoscaling\"i\n\030SetLoggingServiceRequest" +
- "\022\022\n\nproject_id\030\001 \001(\t\022\014\n\004zone\030\002 \001(\t\022\022\n\ncl" +
- "uster_id\030\003 \001(\t\022\027\n\017logging_service\030\004 \001(\t\"" +
- "o\n\033SetMonitoringServiceRequest\022\022\n\nprojec" +
- "t_id\030\001 \001(\t\022\014\n\004zone\030\002 \001(\t\022\022\n\ncluster_id\030\003" +
- " \001(\t\022\032\n\022monitoring_service\030\004 \001(\t\"\210\001\n\026Set" +
- "AddonsConfigRequest\022\022\n\nproject_id\030\001 \001(\t\022" +
- "\014\n\004zone\030\002 \001(\t\022\022\n\ncluster_id\030\003 \001(\t\0228\n\radd" +
+ "AcceleratorConfig\022\021\n\tdisk_type\030\014 \001(\t\022\030\n\020" +
+ "min_cpu_platform\030\r \001(\t\032/\n\rMetadataEntry\022" +
+ "\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\032-\n\013Label" +
+ "sEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\321" +
+ "\001\n\nMasterAuth\022\020\n\010username\030\001 \001(\t\022\020\n\010passw" +
+ "ord\030\002 \001(\t\022O\n\031client_certificate_config\030\003" +
+ " \001(\0132,.google.container.v1.ClientCertifi" +
+ "cateConfig\022\036\n\026cluster_ca_certificate\030d \001" +
+ "(\t\022\032\n\022client_certificate\030e \001(\t\022\022\n\nclient" +
+ "_key\030f \001(\t\";\n\027ClientCertificateConfig\022 \n" +
+ "\030issue_client_certificate\030\001 \001(\010\"\267\002\n\014Addo" +
+ "nsConfig\022C\n\023http_load_balancing\030\001 \001(\0132&." +
+ "google.container.v1.HttpLoadBalancing\022Q\n" +
+ "\032horizontal_pod_autoscaling\030\002 \001(\0132-.goog" +
+ "le.container.v1.HorizontalPodAutoscaling" +
+ "\022F\n\024kubernetes_dashboard\030\003 \001(\0132(.google." +
+ "container.v1.KubernetesDashboard\022G\n\025netw" +
+ "ork_policy_config\030\004 \001(\0132(.google.contain" +
+ "er.v1.NetworkPolicyConfig\"%\n\021HttpLoadBal" +
+ "ancing\022\020\n\010disabled\030\001 \001(\010\",\n\030HorizontalPo" +
+ "dAutoscaling\022\020\n\010disabled\030\001 \001(\010\"\'\n\023Kubern" +
+ "etesDashboard\022\020\n\010disabled\030\001 \001(\010\"\'\n\023Netwo" +
+ "rkPolicyConfig\022\020\n\010disabled\030\001 \001(\010\"\250\001\n\024Pri" +
+ "vateClusterConfig\022\034\n\024enable_private_node" +
+ "s\030\001 \001(\010\022\037\n\027enable_private_endpoint\030\002 \001(\010" +
+ "\022\036\n\026master_ipv4_cidr_block\030\003 \001(\t\022\030\n\020priv" +
+ "ate_endpoint\030\004 \001(\t\022\027\n\017public_endpoint\030\005 " +
+ "\001(\t\"\274\001\n\036MasterAuthorizedNetworksConfig\022\017" +
+ "\n\007enabled\030\001 \001(\010\022R\n\013cidr_blocks\030\002 \003(\0132=.g" +
+ "oogle.container.v1.MasterAuthorizedNetwo" +
+ "rksConfig.CidrBlock\0325\n\tCidrBlock\022\024\n\014disp" +
+ "lay_name\030\001 \001(\t\022\022\n\ncidr_block\030\002 \001(\t\"\035\n\nLe" +
+ "gacyAbac\022\017\n\007enabled\030\001 \001(\010\"\221\001\n\rNetworkPol" +
+ "icy\022=\n\010provider\030\001 \001(\0162+.google.container" +
+ ".v1.NetworkPolicy.Provider\022\017\n\007enabled\030\002 " +
+ "\001(\010\"0\n\010Provider\022\030\n\024PROVIDER_UNSPECIFIED\020" +
+ "\000\022\n\n\006CALICO\020\001\"\351\002\n\022IPAllocationPolicy\022\026\n\016" +
+ "use_ip_aliases\030\001 \001(\010\022\031\n\021create_subnetwor" +
+ "k\030\002 \001(\010\022\027\n\017subnetwork_name\030\003 \001(\t\022\035\n\021clus" +
+ "ter_ipv4_cidr\030\004 \001(\tB\002\030\001\022\032\n\016node_ipv4_cid" +
+ "r\030\005 \001(\tB\002\030\001\022\036\n\022services_ipv4_cidr\030\006 \001(\tB" +
+ "\002\030\001\022$\n\034cluster_secondary_range_name\030\007 \001(" +
+ "\t\022%\n\035services_secondary_range_name\030\010 \001(\t" +
+ "\022\037\n\027cluster_ipv4_cidr_block\030\t \001(\t\022\034\n\024nod" +
+ "e_ipv4_cidr_block\030\n \001(\t\022 \n\030services_ipv4" +
+ "_cidr_block\030\013 \001(\t\"\335\014\n\007Cluster\022\014\n\004name\030\001 " +
+ "\001(\t\022\023\n\013description\030\002 \001(\t\022\032\n\022initial_node" +
+ "_count\030\003 \001(\005\0224\n\013node_config\030\004 \001(\0132\037.goog" +
+ "le.container.v1.NodeConfig\0224\n\013master_aut" +
+ "h\030\005 \001(\0132\037.google.container.v1.MasterAuth" +
+ "\022\027\n\017logging_service\030\006 \001(\t\022\032\n\022monitoring_" +
+ "service\030\007 \001(\t\022\017\n\007network\030\010 \001(\t\022\031\n\021cluste" +
+ "r_ipv4_cidr\030\t \001(\t\0228\n\raddons_config\030\n \001(\013" +
+ "2!.google.container.v1.AddonsConfig\022\022\n\ns" +
+ "ubnetwork\030\013 \001(\t\0221\n\nnode_pools\030\014 \003(\0132\035.go" +
+ "ogle.container.v1.NodePool\022\021\n\tlocations\030" +
+ "\r \003(\t\022\037\n\027enable_kubernetes_alpha\030\016 \001(\010\022I" +
+ "\n\017resource_labels\030\017 \003(\01320.google.contain" +
+ "er.v1.Cluster.ResourceLabelsEntry\022\031\n\021lab" +
+ "el_fingerprint\030\020 \001(\t\0224\n\013legacy_abac\030\022 \001(" +
+ "\0132\037.google.container.v1.LegacyAbac\022:\n\016ne" +
+ "twork_policy\030\023 \001(\0132\".google.container.v1" +
+ ".NetworkPolicy\022E\n\024ip_allocation_policy\030\024" +
+ " \001(\0132\'.google.container.v1.IPAllocationP" +
+ "olicy\022^\n!master_authorized_networks_conf" +
+ "ig\030\026 \001(\01323.google.container.v1.MasterAut" +
+ "horizedNetworksConfig\022B\n\022maintenance_pol" +
+ "icy\030\027 \001(\0132&.google.container.v1.Maintena" +
+ "ncePolicy\022:\n\016network_config\030\033 \001(\0132\".goog" +
+ "le.container.v1.NetworkConfig\022I\n\026private" +
+ "_cluster_config\030% \001(\0132).google.container" +
+ ".v1.PrivateClusterConfig\022\021\n\tself_link\030d " +
+ "\001(\t\022\020\n\004zone\030e \001(\tB\002\030\001\022\020\n\010endpoint\030f \001(\t\022" +
+ "\037\n\027initial_cluster_version\030g \001(\t\022\036\n\026curr" +
+ "ent_master_version\030h \001(\t\022 \n\024current_node" +
+ "_version\030i \001(\tB\002\030\001\022\023\n\013create_time\030j \001(\t\022" +
+ "3\n\006status\030k \001(\0162#.google.container.v1.Cl" +
+ "uster.Status\022\026\n\016status_message\030l \001(\t\022\033\n\023" +
+ "node_ipv4_cidr_size\030m \001(\005\022\032\n\022services_ip" +
+ "v4_cidr\030n \001(\t\022\037\n\023instance_group_urls\030o \003" +
+ "(\tB\002\030\001\022\032\n\022current_node_count\030p \001(\005\022\023\n\013ex" +
+ "pire_time\030q \001(\t\022\020\n\010location\030r \001(\t\0325\n\023Res" +
+ "ourceLabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002" +
+ " \001(\t:\0028\001\"w\n\006Status\022\026\n\022STATUS_UNSPECIFIED" +
+ "\020\000\022\020\n\014PROVISIONING\020\001\022\013\n\007RUNNING\020\002\022\017\n\013REC" +
+ "ONCILING\020\003\022\014\n\010STOPPING\020\004\022\t\n\005ERROR\020\005\022\014\n\010D" +
+ "EGRADED\020\006\"\301\003\n\rClusterUpdate\022\034\n\024desired_n" +
+ "ode_version\030\004 \001(\t\022\"\n\032desired_monitoring_" +
+ "service\030\005 \001(\t\022@\n\025desired_addons_config\030\006" +
+ " \001(\0132!.google.container.v1.AddonsConfig\022" +
+ "\034\n\024desired_node_pool_id\030\007 \001(\t\022\032\n\022desired" +
+ "_image_type\030\010 \001(\t\022O\n\035desired_node_pool_a" +
+ "utoscaling\030\t \001(\0132(.google.container.v1.N" +
+ "odePoolAutoscaling\022\031\n\021desired_locations\030" +
+ "\n \003(\t\022f\n)desired_master_authorized_netwo" +
+ "rks_config\030\014 \001(\01323.google.container.v1.M" +
+ "asterAuthorizedNetworksConfig\022\036\n\026desired" +
+ "_master_version\030d \001(\t\"\373\005\n\tOperation\022\014\n\004n" +
+ "ame\030\001 \001(\t\022\020\n\004zone\030\002 \001(\tB\002\030\001\022;\n\016operation" +
+ "_type\030\003 \001(\0162#.google.container.v1.Operat" +
+ "ion.Type\0225\n\006status\030\004 \001(\0162%.google.contai" +
+ "ner.v1.Operation.Status\022\016\n\006detail\030\010 \001(\t\022" +
+ "\026\n\016status_message\030\005 \001(\t\022\021\n\tself_link\030\006 \001" +
+ "(\t\022\023\n\013target_link\030\007 \001(\t\022\020\n\010location\030\t \001(" +
+ "\t\022\022\n\nstart_time\030\n \001(\t\022\020\n\010end_time\030\013 \001(\t\"" +
+ "R\n\006Status\022\026\n\022STATUS_UNSPECIFIED\020\000\022\013\n\007PEN" +
+ "DING\020\001\022\013\n\007RUNNING\020\002\022\010\n\004DONE\020\003\022\014\n\010ABORTIN" +
+ "G\020\004\"\375\002\n\004Type\022\024\n\020TYPE_UNSPECIFIED\020\000\022\022\n\016CR" +
+ "EATE_CLUSTER\020\001\022\022\n\016DELETE_CLUSTER\020\002\022\022\n\016UP" +
+ "GRADE_MASTER\020\003\022\021\n\rUPGRADE_NODES\020\004\022\022\n\016REP" +
+ "AIR_CLUSTER\020\005\022\022\n\016UPDATE_CLUSTER\020\006\022\024\n\020CRE" +
+ "ATE_NODE_POOL\020\007\022\024\n\020DELETE_NODE_POOL\020\010\022\034\n" +
+ "\030SET_NODE_POOL_MANAGEMENT\020\t\022\025\n\021AUTO_REPA" +
+ "IR_NODES\020\n\022\026\n\022AUTO_UPGRADE_NODES\020\013\022\016\n\nSE" +
+ "T_LABELS\020\014\022\023\n\017SET_MASTER_AUTH\020\r\022\026\n\022SET_N" +
+ "ODE_POOL_SIZE\020\016\022\026\n\022SET_NETWORK_POLICY\020\017\022" +
+ "\032\n\026SET_MAINTENANCE_POLICY\020\020\"\177\n\024CreateClu" +
+ "sterRequest\022\026\n\nproject_id\030\001 \001(\tB\002\030\001\022\020\n\004z" +
+ "one\030\002 \001(\tB\002\030\001\022-\n\007cluster\030\003 \001(\0132\034.google." +
+ "container.v1.Cluster\022\016\n\006parent\030\005 \001(\t\"c\n\021" +
+ "GetClusterRequest\022\026\n\nproject_id\030\001 \001(\tB\002\030" +
+ "\001\022\020\n\004zone\030\002 \001(\tB\002\030\001\022\026\n\ncluster_id\030\003 \001(\tB" +
+ "\002\030\001\022\014\n\004name\030\005 \001(\t\"\232\001\n\024UpdateClusterReque" +
+ "st\022\026\n\nproject_id\030\001 \001(\tB\002\030\001\022\020\n\004zone\030\002 \001(\t" +
+ "B\002\030\001\022\026\n\ncluster_id\030\003 \001(\tB\002\030\001\0222\n\006update\030\004" +
+ " \001(\0132\".google.container.v1.ClusterUpdate" +
+ "\022\014\n\004name\030\005 \001(\t\"\253\001\n\025UpdateNodePoolRequest" +
+ "\022\026\n\nproject_id\030\001 \001(\tB\002\030\001\022\020\n\004zone\030\002 \001(\tB\002" +
+ "\030\001\022\026\n\ncluster_id\030\003 \001(\tB\002\030\001\022\030\n\014node_pool_" +
+ "id\030\004 \001(\tB\002\030\001\022\024\n\014node_version\030\005 \001(\t\022\022\n\nim" +
+ "age_type\030\006 \001(\t\022\014\n\004name\030\010 \001(\t\"\310\001\n\035SetNode" +
+ "PoolAutoscalingRequest\022\026\n\nproject_id\030\001 \001" +
+ "(\tB\002\030\001\022\020\n\004zone\030\002 \001(\tB\002\030\001\022\026\n\ncluster_id\030\003" +
+ " \001(\tB\002\030\001\022\030\n\014node_pool_id\030\004 \001(\tB\002\030\001\022=\n\013au" +
+ "toscaling\030\005 \001(\0132(.google.container.v1.No" +
+ "dePoolAutoscaling\022\014\n\004name\030\006 \001(\t\"\177\n\030SetLo" +
+ "ggingServiceRequest\022\026\n\nproject_id\030\001 \001(\tB" +
+ "\002\030\001\022\014\n\004zone\030\002 \001(\t\022\026\n\ncluster_id\030\003 \001(\tB\002\030" +
+ "\001\022\027\n\017logging_service\030\004 \001(\t\022\014\n\004name\030\005 \001(\t" +
+ "\"\211\001\n\033SetMonitoringServiceRequest\022\026\n\nproj" +
+ "ect_id\030\001 \001(\tB\002\030\001\022\020\n\004zone\030\002 \001(\tB\002\030\001\022\026\n\ncl" +
+ "uster_id\030\003 \001(\tB\002\030\001\022\032\n\022monitoring_service" +
+ "\030\004 \001(\t\022\014\n\004name\030\006 \001(\t\"\242\001\n\026SetAddonsConfig" +
+ "Request\022\026\n\nproject_id\030\001 \001(\tB\002\030\001\022\020\n\004zone\030" +
+ "\002 \001(\tB\002\030\001\022\026\n\ncluster_id\030\003 \001(\tB\002\030\001\0228\n\radd" +
"ons_config\030\004 \001(\0132!.google.container.v1.A" +
- "ddonsConfig\"^\n\023SetLocationsRequest\022\022\n\npr" +
- "oject_id\030\001 \001(\t\022\014\n\004zone\030\002 \001(\t\022\022\n\ncluster_" +
- "id\030\003 \001(\t\022\021\n\tlocations\030\004 \003(\t\"c\n\023UpdateMas" +
- "terRequest\022\022\n\nproject_id\030\001 \001(\t\022\014\n\004zone\030\002" +
- " \001(\t\022\022\n\ncluster_id\030\003 \001(\t\022\026\n\016master_versi" +
- "on\030\004 \001(\t\"\221\002\n\024SetMasterAuthRequest\022\022\n\npro" +
- "ject_id\030\001 \001(\t\022\014\n\004zone\030\002 \001(\t\022\022\n\ncluster_i" +
- "d\030\003 \001(\t\022@\n\006action\030\004 \001(\01620.google.contain" +
- "er.v1.SetMasterAuthRequest.Action\022/\n\006upd" +
- "ate\030\005 \001(\0132\037.google.container.v1.MasterAu" +
- "th\"P\n\006Action\022\013\n\007UNKNOWN\020\000\022\020\n\014SET_PASSWOR" +
- "D\020\001\022\025\n\021GENERATE_PASSWORD\020\002\022\020\n\014SET_USERNA" +
- "ME\020\003\"L\n\024DeleteClusterRequest\022\022\n\nproject_" +
- "id\030\001 \001(\t\022\014\n\004zone\030\002 \001(\t\022\022\n\ncluster_id\030\003 \001" +
- "(\t\"7\n\023ListClustersRequest\022\022\n\nproject_id\030" +
- "\001 \001(\t\022\014\n\004zone\030\002 \001(\t\"]\n\024ListClustersRespo" +
- "nse\022.\n\010clusters\030\001 \003(\0132\034.google.container" +
- ".v1.Cluster\022\025\n\rmissing_zones\030\002 \003(\t\"M\n\023Ge" +
- "tOperationRequest\022\022\n\nproject_id\030\001 \001(\t\022\014\n" +
- "\004zone\030\002 \001(\t\022\024\n\014operation_id\030\003 \001(\t\"9\n\025Lis" +
- "tOperationsRequest\022\022\n\nproject_id\030\001 \001(\t\022\014" +
- "\n\004zone\030\002 \001(\t\"P\n\026CancelOperationRequest\022\022" +
- "\n\nproject_id\030\001 \001(\t\022\014\n\004zone\030\002 \001(\t\022\024\n\014oper" +
- "ation_id\030\003 \001(\t\"c\n\026ListOperationsResponse" +
- "\0222\n\noperations\030\001 \003(\0132\036.google.container." +
- "v1.Operation\022\025\n\rmissing_zones\030\002 \003(\t\":\n\026G" +
- "etServerConfigRequest\022\022\n\nproject_id\030\001 \001(" +
- "\t\022\014\n\004zone\030\002 \001(\t\"\242\001\n\014ServerConfig\022\037\n\027defa" +
+ "ddonsConfig\022\014\n\004name\030\006 \001(\t\"x\n\023SetLocation" +
+ "sRequest\022\026\n\nproject_id\030\001 \001(\tB\002\030\001\022\020\n\004zone" +
+ "\030\002 \001(\tB\002\030\001\022\026\n\ncluster_id\030\003 \001(\tB\002\030\001\022\021\n\tlo" +
+ "cations\030\004 \003(\t\022\014\n\004name\030\006 \001(\t\"}\n\023UpdateMas" +
+ "terRequest\022\026\n\nproject_id\030\001 \001(\tB\002\030\001\022\020\n\004zo" +
+ "ne\030\002 \001(\tB\002\030\001\022\026\n\ncluster_id\030\003 \001(\tB\002\030\001\022\026\n\016" +
+ "master_version\030\004 \001(\t\022\014\n\004name\030\007 \001(\t\"\253\002\n\024S" +
+ "etMasterAuthRequest\022\026\n\nproject_id\030\001 \001(\tB" +
+ "\002\030\001\022\020\n\004zone\030\002 \001(\tB\002\030\001\022\026\n\ncluster_id\030\003 \001(" +
+ "\tB\002\030\001\022@\n\006action\030\004 \001(\01620.google.container" +
+ ".v1.SetMasterAuthRequest.Action\022/\n\006updat" +
+ "e\030\005 \001(\0132\037.google.container.v1.MasterAuth" +
+ "\022\014\n\004name\030\007 \001(\t\"P\n\006Action\022\013\n\007UNKNOWN\020\000\022\020\n" +
+ "\014SET_PASSWORD\020\001\022\025\n\021GENERATE_PASSWORD\020\002\022\020" +
+ "\n\014SET_USERNAME\020\003\"f\n\024DeleteClusterRequest" +
+ "\022\026\n\nproject_id\030\001 \001(\tB\002\030\001\022\020\n\004zone\030\002 \001(\tB\002" +
+ "\030\001\022\026\n\ncluster_id\030\003 \001(\tB\002\030\001\022\014\n\004name\030\004 \001(\t" +
+ "\"O\n\023ListClustersRequest\022\026\n\nproject_id\030\001 " +
+ "\001(\tB\002\030\001\022\020\n\004zone\030\002 \001(\tB\002\030\001\022\016\n\006parent\030\004 \001(" +
+ "\t\"]\n\024ListClustersResponse\022.\n\010clusters\030\001 " +
+ "\003(\0132\034.google.container.v1.Cluster\022\025\n\rmis" +
+ "sing_zones\030\002 \003(\t\"g\n\023GetOperationRequest\022" +
+ "\026\n\nproject_id\030\001 \001(\tB\002\030\001\022\020\n\004zone\030\002 \001(\tB\002\030" +
+ "\001\022\030\n\014operation_id\030\003 \001(\tB\002\030\001\022\014\n\004name\030\005 \001(" +
+ "\t\"Q\n\025ListOperationsRequest\022\026\n\nproject_id" +
+ "\030\001 \001(\tB\002\030\001\022\020\n\004zone\030\002 \001(\tB\002\030\001\022\016\n\006parent\030\004" +
+ " \001(\t\"j\n\026CancelOperationRequest\022\026\n\nprojec" +
+ "t_id\030\001 \001(\tB\002\030\001\022\020\n\004zone\030\002 \001(\tB\002\030\001\022\030\n\014oper" +
+ "ation_id\030\003 \001(\tB\002\030\001\022\014\n\004name\030\004 \001(\t\"c\n\026List" +
+ "OperationsResponse\0222\n\noperations\030\001 \003(\0132\036" +
+ ".google.container.v1.Operation\022\025\n\rmissin" +
+ "g_zones\030\002 \003(\t\"P\n\026GetServerConfigRequest\022" +
+ "\026\n\nproject_id\030\001 \001(\tB\002\030\001\022\020\n\004zone\030\002 \001(\tB\002\030" +
+ "\001\022\014\n\004name\030\004 \001(\t\"\242\001\n\014ServerConfig\022\037\n\027defa" +
"ult_cluster_version\030\001 \001(\t\022\033\n\023valid_node_" +
"versions\030\003 \003(\t\022\032\n\022default_image_type\030\004 \001" +
"(\t\022\031\n\021valid_image_types\030\005 \003(\t\022\035\n\025valid_m" +
- "aster_versions\030\006 \003(\t\"\177\n\025CreateNodePoolRe" +
- "quest\022\022\n\nproject_id\030\001 \001(\t\022\014\n\004zone\030\002 \001(\t\022" +
- "\022\n\ncluster_id\030\003 \001(\t\0220\n\tnode_pool\030\004 \001(\0132\035" +
- ".google.container.v1.NodePool\"c\n\025DeleteN" +
- "odePoolRequest\022\022\n\nproject_id\030\001 \001(\t\022\014\n\004zo" +
- "ne\030\002 \001(\t\022\022\n\ncluster_id\030\003 \001(\t\022\024\n\014node_poo" +
- "l_id\030\004 \001(\t\"L\n\024ListNodePoolsRequest\022\022\n\npr" +
- "oject_id\030\001 \001(\t\022\014\n\004zone\030\002 \001(\t\022\022\n\ncluster_" +
- "id\030\003 \001(\t\"`\n\022GetNodePoolRequest\022\022\n\nprojec" +
- "t_id\030\001 \001(\t\022\014\n\004zone\030\002 \001(\t\022\022\n\ncluster_id\030\003" +
- " \001(\t\022\024\n\014node_pool_id\030\004 \001(\t\"\360\003\n\010NodePool\022" +
- "\014\n\004name\030\001 \001(\t\022/\n\006config\030\002 \001(\0132\037.google.c" +
- "ontainer.v1.NodeConfig\022\032\n\022initial_node_c" +
- "ount\030\003 \001(\005\022\021\n\tself_link\030d \001(\t\022\017\n\007version" +
- "\030e \001(\t\022\033\n\023instance_group_urls\030f \003(\t\0224\n\006s" +
- "tatus\030g \001(\0162$.google.container.v1.NodePo" +
- "ol.Status\022\026\n\016status_message\030h \001(\t\022=\n\013aut" +
- "oscaling\030\004 \001(\0132(.google.container.v1.Nod" +
- "ePoolAutoscaling\0227\n\nmanagement\030\005 \001(\0132#.g" +
- "oogle.container.v1.NodeManagement\"\201\001\n\006St" +
- "atus\022\026\n\022STATUS_UNSPECIFIED\020\000\022\020\n\014PROVISIO" +
- "NING\020\001\022\013\n\007RUNNING\020\002\022\026\n\022RUNNING_WITH_ERRO" +
- "R\020\003\022\017\n\013RECONCILING\020\004\022\014\n\010STOPPING\020\005\022\t\n\005ER" +
- "ROR\020\006\"}\n\016NodeManagement\022\024\n\014auto_upgrade\030" +
- "\001 \001(\010\022\023\n\013auto_repair\030\002 \001(\010\022@\n\017upgrade_op" +
- "tions\030\n \001(\0132\'.google.container.v1.AutoUp" +
- "gradeOptions\"J\n\022AutoUpgradeOptions\022\037\n\027au" +
- "to_upgrade_start_time\030\001 \001(\t\022\023\n\013descripti" +
- "on\030\002 \001(\t\"K\n\021MaintenancePolicy\0226\n\006window\030" +
- "\001 \001(\0132&.google.container.v1.MaintenanceW" +
- "indow\"n\n\021MaintenanceWindow\022O\n\030daily_main" +
- "tenance_window\030\002 \001(\0132+.google.container." +
- "v1.DailyMaintenanceWindowH\000B\010\n\006policy\">\n" +
- "\026DailyMaintenanceWindow\022\022\n\nstart_time\030\002 " +
- "\001(\t\022\020\n\010duration\030\003 \001(\t\"\243\001\n\034SetNodePoolMan" +
- "agementRequest\022\022\n\nproject_id\030\001 \001(\t\022\014\n\004zo" +
- "ne\030\002 \001(\t\022\022\n\ncluster_id\030\003 \001(\t\022\024\n\014node_poo" +
- "l_id\030\004 \001(\t\0227\n\nmanagement\030\005 \001(\0132#.google." +
- "container.v1.NodeManagement\"x\n\026SetNodePo" +
- "olSizeRequest\022\022\n\nproject_id\030\001 \001(\t\022\014\n\004zon" +
- "e\030\002 \001(\t\022\022\n\ncluster_id\030\003 \001(\t\022\024\n\014node_pool" +
- "_id\030\004 \001(\t\022\022\n\nnode_count\030\005 \001(\005\"l\n\036Rollbac" +
- "kNodePoolUpgradeRequest\022\022\n\nproject_id\030\001 " +
- "\001(\t\022\014\n\004zone\030\002 \001(\t\022\022\n\ncluster_id\030\003 \001(\t\022\024\n" +
- "\014node_pool_id\030\004 \001(\t\"J\n\025ListNodePoolsResp" +
- "onse\0221\n\nnode_pools\030\001 \003(\0132\035.google.contai" +
- "ner.v1.NodePool\"V\n\023NodePoolAutoscaling\022\017" +
- "\n\007enabled\030\001 \001(\010\022\026\n\016min_node_count\030\002 \001(\005\022" +
- "\026\n\016max_node_count\030\003 \001(\005\"\356\001\n\020SetLabelsReq" +
- "uest\022\022\n\nproject_id\030\001 \001(\t\022\014\n\004zone\030\002 \001(\t\022\022" +
- "\n\ncluster_id\030\003 \001(\t\022R\n\017resource_labels\030\004 " +
- "\003(\01329.google.container.v1.SetLabelsReque" +
- "st.ResourceLabelsEntry\022\031\n\021label_fingerpr" +
- "int\030\005 \001(\t\0325\n\023ResourceLabelsEntry\022\013\n\003key\030" +
- "\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"]\n\024SetLegacyAba" +
- "cRequest\022\022\n\nproject_id\030\001 \001(\t\022\014\n\004zone\030\002 \001" +
- "(\t\022\022\n\ncluster_id\030\003 \001(\t\022\017\n\007enabled\030\004 \001(\010\"" +
- "N\n\026StartIPRotationRequest\022\022\n\nproject_id\030" +
- "\001 \001(\t\022\014\n\004zone\030\002 \001(\t\022\022\n\ncluster_id\030\003 \001(\t\"" +
- "Q\n\031CompleteIPRotationRequest\022\022\n\nproject_" +
- "id\030\001 \001(\t\022\014\n\004zone\030\002 \001(\t\022\022\n\ncluster_id\030\003 \001" +
- "(\t\"H\n\021AcceleratorConfig\022\031\n\021accelerator_c" +
- "ount\030\001 \001(\003\022\030\n\020accelerator_type\030\002 \001(\t\"\213\001\n" +
- "\027SetNetworkPolicyRequest\022\022\n\nproject_id\030\001" +
- " \001(\t\022\014\n\004zone\030\002 \001(\t\022\022\n\ncluster_id\030\003 \001(\t\022:" +
- "\n\016network_policy\030\004 \001(\0132\".google.containe" +
- "r.v1.NetworkPolicy\"\227\001\n\033SetMaintenancePol" +
- "icyRequest\022\022\n\nproject_id\030\001 \001(\t\022\014\n\004zone\030\002" +
- " \001(\t\022\022\n\ncluster_id\030\003 \001(\t\022B\n\022maintenance_" +
- "policy\030\004 \001(\0132&.google.container.v1.Maint" +
- "enancePolicy2\343*\n\016ClusterManager\022\234\001\n\014List" +
- "Clusters\022(.google.container.v1.ListClust" +
- "ersRequest\032).google.container.v1.ListClu" +
- "stersResponse\"7\202\323\344\223\0021\022//v1/projects/{pro" +
- "ject_id}/zones/{zone}/clusters\022\230\001\n\nGetCl" +
- "uster\022&.google.container.v1.GetClusterRe" +
- "quest\032\034.google.container.v1.Cluster\"D\202\323\344" +
- "\223\002>\022\n\026D" +
+ "ailyMaintenanceWindow\022\022\n\nstart_time\030\002 \001(" +
+ "\t\022\020\n\010duration\030\003 \001(\t\"\301\001\n\034SetNodePoolManag" +
+ "ementRequest\022\026\n\nproject_id\030\001 \001(\tB\002\030\001\022\020\n\004" +
+ "zone\030\002 \001(\tB\002\030\001\022\026\n\ncluster_id\030\003 \001(\tB\002\030\001\022\030" +
+ "\n\014node_pool_id\030\004 \001(\tB\002\030\001\0227\n\nmanagement\030\005" +
+ " \001(\0132#.google.container.v1.NodeManagemen" +
+ "t\022\014\n\004name\030\007 \001(\t\"\226\001\n\026SetNodePoolSizeReque" +
+ "st\022\026\n\nproject_id\030\001 \001(\tB\002\030\001\022\020\n\004zone\030\002 \001(\t" +
+ "B\002\030\001\022\026\n\ncluster_id\030\003 \001(\tB\002\030\001\022\030\n\014node_poo" +
+ "l_id\030\004 \001(\tB\002\030\001\022\022\n\nnode_count\030\005 \001(\005\022\014\n\004na" +
+ "me\030\007 \001(\t\"\212\001\n\036RollbackNodePoolUpgradeRequ" +
+ "est\022\026\n\nproject_id\030\001 \001(\tB\002\030\001\022\020\n\004zone\030\002 \001(" +
+ "\tB\002\030\001\022\026\n\ncluster_id\030\003 \001(\tB\002\030\001\022\030\n\014node_po" +
+ "ol_id\030\004 \001(\tB\002\030\001\022\014\n\004name\030\006 \001(\t\"J\n\025ListNod" +
+ "ePoolsResponse\0221\n\nnode_pools\030\001 \003(\0132\035.goo" +
+ "gle.container.v1.NodePool\"V\n\023NodePoolAut" +
+ "oscaling\022\017\n\007enabled\030\001 \001(\010\022\026\n\016min_node_co" +
+ "unt\030\002 \001(\005\022\026\n\016max_node_count\030\003 \001(\005\"\210\002\n\020Se" +
+ "tLabelsRequest\022\026\n\nproject_id\030\001 \001(\tB\002\030\001\022\020" +
+ "\n\004zone\030\002 \001(\tB\002\030\001\022\026\n\ncluster_id\030\003 \001(\tB\002\030\001" +
+ "\022R\n\017resource_labels\030\004 \003(\01329.google.conta" +
+ "iner.v1.SetLabelsRequest.ResourceLabelsE" +
+ "ntry\022\031\n\021label_fingerprint\030\005 \001(\t\022\014\n\004name\030" +
+ "\007 \001(\t\0325\n\023ResourceLabelsEntry\022\013\n\003key\030\001 \001(" +
+ "\t\022\r\n\005value\030\002 \001(\t:\0028\001\"w\n\024SetLegacyAbacReq" +
+ "uest\022\026\n\nproject_id\030\001 \001(\tB\002\030\001\022\020\n\004zone\030\002 \001" +
+ "(\tB\002\030\001\022\026\n\ncluster_id\030\003 \001(\tB\002\030\001\022\017\n\007enable" +
+ "d\030\004 \001(\010\022\014\n\004name\030\006 \001(\t\"\204\001\n\026StartIPRotatio" +
+ "nRequest\022\026\n\nproject_id\030\001 \001(\tB\002\030\001\022\020\n\004zone" +
+ "\030\002 \001(\tB\002\030\001\022\026\n\ncluster_id\030\003 \001(\tB\002\030\001\022\014\n\004na" +
+ "me\030\006 \001(\t\022\032\n\022rotate_credentials\030\007 \001(\010\"k\n\031" +
+ "CompleteIPRotationRequest\022\026\n\nproject_id\030" +
+ "\001 \001(\tB\002\030\001\022\020\n\004zone\030\002 \001(\tB\002\030\001\022\026\n\ncluster_i" +
+ "d\030\003 \001(\tB\002\030\001\022\014\n\004name\030\007 \001(\t\"H\n\021Accelerator" +
+ "Config\022\031\n\021accelerator_count\030\001 \001(\003\022\030\n\020acc" +
+ "elerator_type\030\002 \001(\t\"\245\001\n\027SetNetworkPolicy" +
+ "Request\022\026\n\nproject_id\030\001 \001(\tB\002\030\001\022\020\n\004zone\030" +
+ "\002 \001(\tB\002\030\001\022\026\n\ncluster_id\030\003 \001(\tB\002\030\001\022:\n\016net" +
+ "work_policy\030\004 \001(\0132\".google.container.v1." +
+ "NetworkPolicy\022\014\n\004name\030\006 \001(\t\"\245\001\n\033SetMaint" +
+ "enancePolicyRequest\022\022\n\nproject_id\030\001 \001(\t\022" +
+ "\014\n\004zone\030\002 \001(\t\022\022\n\ncluster_id\030\003 \001(\t\022B\n\022mai" +
+ "ntenance_policy\030\004 \001(\0132&.google.container" +
+ ".v1.MaintenancePolicy\022\014\n\004name\030\005 \001(\t\"4\n\rN" +
+ "etworkConfig\022\017\n\007network\030\001 \001(\t\022\022\n\nsubnetw" +
+ "ork\030\002 \001(\t2\3139\n\016ClusterManager\022\314\001\n\014ListClu" +
+ "sters\022(.google.container.v1.ListClusters" +
+ "Request\032).google.container.v1.ListCluste" +
+ "rsResponse\"g\202\323\344\223\002a\022,/v1/{parent=projects" +
+ "/*/locations/*}/clustersZ1\022//v1/projects" +
+ "/{project_id}/zones/{zone}/clusters\022\310\001\n\n" +
+ "GetCluster\022&.google.container.v1.GetClus" +
+ "terRequest\032\034.google.container.v1.Cluster" +
+ "\"t\202\323\344\223\002n\022,/v1/{name=projects/*/locations" +
+ "/*/clusters/*}Z>\022**/v1/{name=projects/*" +
+ "/locations/*/clusters/*}:setResourceLabe" +
+ "ls:\001*ZP\"K/v1/projects/{project_id}/zones" +
+ "/{zone}/clusters/{cluster_id}/resourceLa" +
+ "bels:\001*\022\361\001\n\rSetLegacyAbac\022).google.conta" +
+ "iner.v1.SetLegacyAbacRequest\032\036.google.co" +
+ "ntainer.v1.Operation\"\224\001\202\323\344\223\002\215\001\":/v1/{nam" +
+ "e=projects/*/locations/*/clusters/*}:set" +
+ "LegacyAbac:\001*ZL\"G/v1/projects/{project_i" +
+ "d}/zones/{zone}/clusters/{cluster_id}/le" +
+ "gacyAbac:\001*\022\374\001\n\017StartIPRotation\022+.google" +
+ ".container.v1.StartIPRotationRequest\032\036.g" +
+ "oogle.container.v1.Operation\"\233\001\202\323\344\223\002\224\001\"<" +
+ "/v1/{name=projects/*/locations/*/cluster" +
+ "s/*}:startIpRotation:\001*ZQ\"L/v1/projects/" +
+ "{project_id}/zones/{zone}/clusters/{clus" +
+ "ter_id}:startIpRotation:\001*\022\210\002\n\022CompleteI" +
+ "PRotation\022..google.container.v1.Complete" +
+ "IPRotationRequest\032\036.google.container.v1." +
+ "Operation\"\241\001\202\323\344\223\002\232\001\"?/v1/{name=projects/" +
+ "*/locations/*/clusters/*}:completeIpRota" +
+ "tion:\001*ZT\"O/v1/projects/{project_id}/zon" +
+ "es/{zone}/clusters/{cluster_id}:complete" +
+ "IpRotation:\001*\022\221\002\n\017SetNodePoolSize\022+.goog" +
+ "le.container.v1.SetNodePoolSizeRequest\032\036" +
+ ".google.container.v1.Operation\"\260\001\202\323\344\223\002\251\001" +
+ "\"@/v1/{name=projects/*/locations/*/clust" +
+ "ers/*/nodePools/*}:setSize:\001*Zb\"]/v1/pro" +
+ "jects/{project_id}/zones/{zone}/clusters" +
+ "/{cluster_id}/nodePools/{node_pool_id}/s" +
+ "etSize:\001*\022\200\002\n\020SetNetworkPolicy\022,.google." +
+ "container.v1.SetNetworkPolicyRequest\032\036.g" +
+ "oogle.container.v1.Operation\"\235\001\202\323\344\223\002\226\001\"=" +
+ "/v1/{name=projects/*/locations/*/cluster" +
+ "s/*}:setNetworkPolicy:\001*ZR\"M/v1/projects" +
+ "/{project_id}/zones/{zone}/clusters/{clu" +
+ "ster_id}:setNetworkPolicy:\001*\022\220\002\n\024SetMain" +
+ "tenancePolicy\0220.google.container.v1.SetM" +
+ "aintenancePolicyRequest\032\036.google.contain" +
+ "er.v1.Operation\"\245\001\202\323\344\223\002\236\001\"A/v1/{name=pro" +
+ "jects/*/locations/*/clusters/*}:setMaint" +
+ "enancePolicy:\001*ZV\"Q/v1/projects/{project" +
+ "_id}/zones/{zone}/clusters/{cluster_id}:" +
+ "setMaintenancePolicy:\001*B\246\001\n\027com.google.c" +
+ "ontainer.v1B\023ClusterServiceProtoP\001Zstring desired_node_version = 4;
@@ -194,8 +200,14 @@ public java.lang.String getDesiredNodeVersion() {
/**
*
* The Kubernetes version to change the nodes to (typically an
- * upgrade). Use `-` to upgrade to the latest version supported by
- * the server.
+ * upgrade).
+ * Users may specify either explicit versions offered by
+ * Kubernetes Engine or version aliases, which have the following behavior:
+ * - "latest": picks the highest valid Kubernetes version
+ * - "1.X": picks the highest valid patch+gke.N patch in the 1.X version
+ * - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version
+ * - "1.X.Y-gke.N": picks an explicit Kubernetes version
+ * - "-": picks the Kubernetes master version
*
*
* string desired_node_version = 4;
@@ -498,7 +510,6 @@ public java.lang.String getDesiredLocations(int index) {
private com.google.container.v1.MasterAuthorizedNetworksConfig desiredMasterAuthorizedNetworksConfig_;
/**
*
- * Master authorized networks is a Beta feature.
* The desired configuration options for master authorized networks feature.
*
*
@@ -509,7 +520,6 @@ public boolean hasDesiredMasterAuthorizedNetworksConfig() {
}
/**
*
- * Master authorized networks is a Beta feature.
* The desired configuration options for master authorized networks feature.
*
*
@@ -520,7 +530,6 @@ public com.google.container.v1.MasterAuthorizedNetworksConfig getDesiredMasterAu
}
/**
*
- * Master authorized networks is a Beta feature.
* The desired configuration options for master authorized networks feature.
*
*
@@ -534,9 +543,14 @@ public com.google.container.v1.MasterAuthorizedNetworksConfigOrBuilder getDesire
private volatile java.lang.Object desiredMasterVersion_;
/**
*
- * The Kubernetes version to change the master to. The only valid value is the
- * latest supported version. Use "-" to have the server automatically select
- * the latest version.
+ * 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 desired_master_version = 100;
@@ -555,9 +569,14 @@ public java.lang.String getDesiredMasterVersion() {
}
/**
*
- * 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.
+ * 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 desired_master_version = 100;
@@ -1085,8 +1104,14 @@ public Builder mergeFrom(
/**
*
* The Kubernetes version to change the nodes to (typically an
- * upgrade). Use `-` to upgrade to the latest version supported by
- * the server.
+ * upgrade).
+ * Users may specify either explicit versions offered by
+ * Kubernetes Engine or version aliases, which have the following behavior:
+ * - "latest": picks the highest valid Kubernetes version
+ * - "1.X": picks the highest valid patch+gke.N patch in the 1.X version
+ * - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version
+ * - "1.X.Y-gke.N": picks an explicit Kubernetes version
+ * - "-": picks the Kubernetes master version
*
*
* string desired_node_version = 4;
@@ -1106,8 +1131,14 @@ public java.lang.String getDesiredNodeVersion() {
/**
*
* The Kubernetes version to change the nodes to (typically an
- * upgrade). Use `-` to upgrade to the latest version supported by
- * the server.
+ * upgrade).
+ * Users may specify either explicit versions offered by
+ * Kubernetes Engine or version aliases, which have the following behavior:
+ * - "latest": picks the highest valid Kubernetes version
+ * - "1.X": picks the highest valid patch+gke.N patch in the 1.X version
+ * - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version
+ * - "1.X.Y-gke.N": picks an explicit Kubernetes version
+ * - "-": picks the Kubernetes master version
*
*
* string desired_node_version = 4;
@@ -1128,8 +1159,14 @@ public java.lang.String getDesiredNodeVersion() {
/**
*
* The Kubernetes version to change the nodes to (typically an
- * upgrade). Use `-` to upgrade to the latest version supported by
- * the server.
+ * upgrade).
+ * Users may specify either explicit versions offered by
+ * Kubernetes Engine or version aliases, which have the following behavior:
+ * - "latest": picks the highest valid Kubernetes version
+ * - "1.X": picks the highest valid patch+gke.N patch in the 1.X version
+ * - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version
+ * - "1.X.Y-gke.N": picks an explicit Kubernetes version
+ * - "-": picks the Kubernetes master version
*
*
* string desired_node_version = 4;
@@ -1147,8 +1184,14 @@ public Builder setDesiredNodeVersion(
/**
*
* The Kubernetes version to change the nodes to (typically an
- * upgrade). Use `-` to upgrade to the latest version supported by
- * the server.
+ * upgrade).
+ * Users may specify either explicit versions offered by
+ * Kubernetes Engine or version aliases, which have the following behavior:
+ * - "latest": picks the highest valid Kubernetes version
+ * - "1.X": picks the highest valid patch+gke.N patch in the 1.X version
+ * - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version
+ * - "1.X.Y-gke.N": picks an explicit Kubernetes version
+ * - "-": picks the Kubernetes master version
*
*
* string desired_node_version = 4;
@@ -1162,8 +1205,14 @@ public Builder clearDesiredNodeVersion() {
/**
*
* The Kubernetes version to change the nodes to (typically an
- * upgrade). Use `-` to upgrade to the latest version supported by
- * the server.
+ * upgrade).
+ * Users may specify either explicit versions offered by
+ * Kubernetes Engine or version aliases, which have the following behavior:
+ * - "latest": picks the highest valid Kubernetes version
+ * - "1.X": picks the highest valid patch+gke.N patch in the 1.X version
+ * - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version
+ * - "1.X.Y-gke.N": picks an explicit Kubernetes version
+ * - "-": picks the Kubernetes master version
*
*
* string desired_node_version = 4;
@@ -1995,7 +2044,6 @@ public Builder addDesiredLocationsBytes(
com.google.container.v1.MasterAuthorizedNetworksConfig, com.google.container.v1.MasterAuthorizedNetworksConfig.Builder, com.google.container.v1.MasterAuthorizedNetworksConfigOrBuilder> desiredMasterAuthorizedNetworksConfigBuilder_;
/**
*
- * Master authorized networks is a Beta feature.
* The desired configuration options for master authorized networks feature.
*
*
@@ -2006,7 +2054,6 @@ public boolean hasDesiredMasterAuthorizedNetworksConfig() {
}
/**
*
- * Master authorized networks is a Beta feature.
* The desired configuration options for master authorized networks feature.
*
*
@@ -2021,7 +2068,6 @@ public com.google.container.v1.MasterAuthorizedNetworksConfig getDesiredMasterAu
}
/**
*
- * Master authorized networks is a Beta feature.
* The desired configuration options for master authorized networks feature.
*
*
@@ -2042,7 +2088,6 @@ public Builder setDesiredMasterAuthorizedNetworksConfig(com.google.container.v1.
}
/**
*
- * Master authorized networks is a Beta feature.
* The desired configuration options for master authorized networks feature.
*
*
@@ -2061,7 +2106,6 @@ public Builder setDesiredMasterAuthorizedNetworksConfig(
}
/**
*
- * Master authorized networks is a Beta feature.
* The desired configuration options for master authorized networks feature.
*
*
@@ -2084,7 +2128,6 @@ public Builder mergeDesiredMasterAuthorizedNetworksConfig(com.google.container.v
}
/**
*
- * Master authorized networks is a Beta feature.
* The desired configuration options for master authorized networks feature.
*
*
@@ -2103,7 +2146,6 @@ public Builder clearDesiredMasterAuthorizedNetworksConfig() {
}
/**
*
- * Master authorized networks is a Beta feature.
* The desired configuration options for master authorized networks feature.
*
*
@@ -2116,7 +2158,6 @@ public com.google.container.v1.MasterAuthorizedNetworksConfig.Builder getDesired
}
/**
*
- * Master authorized networks is a Beta feature.
* The desired configuration options for master authorized networks feature.
*
*
@@ -2132,7 +2173,6 @@ public com.google.container.v1.MasterAuthorizedNetworksConfigOrBuilder getDesire
}
/**
*
- * Master authorized networks is a Beta feature.
* The desired configuration options for master authorized networks feature.
*
*
@@ -2155,9 +2195,14 @@ public com.google.container.v1.MasterAuthorizedNetworksConfigOrBuilder getDesire
private java.lang.Object desiredMasterVersion_ = "";
/**
*
- * The Kubernetes version to change the master to. The only valid value is the
- * latest supported version. Use "-" to have the server automatically select
- * the latest version.
+ * 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 desired_master_version = 100;
@@ -2176,9 +2221,14 @@ public java.lang.String getDesiredMasterVersion() {
}
/**
*
- * 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.
+ * 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 desired_master_version = 100;
@@ -2198,9 +2248,14 @@ public java.lang.String getDesiredMasterVersion() {
}
/**
*
- * 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.
+ * 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 desired_master_version = 100;
@@ -2217,9 +2272,14 @@ public Builder setDesiredMasterVersion(
}
/**
*
- * 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.
+ * 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 desired_master_version = 100;
@@ -2232,9 +2292,14 @@ public Builder clearDesiredMasterVersion() {
}
/**
*
- * 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.
+ * 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 desired_master_version = 100;
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ClusterUpdateOrBuilder.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ClusterUpdateOrBuilder.java
index c26632b0b8f2..2cc051544388 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ClusterUpdateOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ClusterUpdateOrBuilder.java
@@ -10,8 +10,14 @@ public interface ClusterUpdateOrBuilder extends
/**
*
* The Kubernetes version to change the nodes to (typically an
- * upgrade). Use `-` to upgrade to the latest version supported by
- * the server.
+ * upgrade).
+ * Users may specify either explicit versions offered by
+ * Kubernetes Engine or version aliases, which have the following behavior:
+ * - "latest": picks the highest valid Kubernetes version
+ * - "1.X": picks the highest valid patch+gke.N patch in the 1.X version
+ * - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version
+ * - "1.X.Y-gke.N": picks an explicit Kubernetes version
+ * - "-": picks the Kubernetes master version
*
*
* string desired_node_version = 4;
@@ -20,8 +26,14 @@ public interface ClusterUpdateOrBuilder extends
/**
*
* The Kubernetes version to change the nodes to (typically an
- * upgrade). Use `-` to upgrade to the latest version supported by
- * the server.
+ * upgrade).
+ * Users may specify either explicit versions offered by
+ * Kubernetes Engine or version aliases, which have the following behavior:
+ * - "latest": picks the highest valid Kubernetes version
+ * - "1.X": picks the highest valid patch+gke.N patch in the 1.X version
+ * - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version
+ * - "1.X.Y-gke.N": picks an explicit Kubernetes version
+ * - "-": picks the Kubernetes master version
*
*
* string desired_node_version = 4;
@@ -213,7 +225,6 @@ public interface ClusterUpdateOrBuilder extends
/**
*
- * Master authorized networks is a Beta feature.
* The desired configuration options for master authorized networks feature.
*
*
@@ -222,7 +233,6 @@ public interface ClusterUpdateOrBuilder extends
boolean hasDesiredMasterAuthorizedNetworksConfig();
/**
*
- * Master authorized networks is a Beta feature.
* The desired configuration options for master authorized networks feature.
*
*
@@ -231,7 +241,6 @@ public interface ClusterUpdateOrBuilder extends
com.google.container.v1.MasterAuthorizedNetworksConfig getDesiredMasterAuthorizedNetworksConfig();
/**
*
- * Master authorized networks is a Beta feature.
* The desired configuration options for master authorized networks feature.
*
*
@@ -241,9 +250,14 @@ public interface ClusterUpdateOrBuilder extends
/**
*
- * 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.
+ * 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 desired_master_version = 100;
@@ -251,9 +265,14 @@ public interface ClusterUpdateOrBuilder extends
java.lang.String getDesiredMasterVersion();
/**
*
- * 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.
+ * 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 desired_master_version = 100;
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CompleteIPRotationRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CompleteIPRotationRequest.java
index 4802c2e75408..a5cdc0da2f12 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CompleteIPRotationRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CompleteIPRotationRequest.java
@@ -23,6 +23,7 @@ private CompleteIPRotationRequest() {
projectId_ = "";
zone_ = "";
clusterId_ = "";
+ name_ = "";
}
@java.lang.Override
@@ -67,6 +68,12 @@ private CompleteIPRotationRequest(
clusterId_ = s;
break;
}
+ case 58: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ name_ = s;
+ break;
+ }
default: {
if (!parseUnknownFieldProto3(
input, unknownFields, extensionRegistry, tag)) {
@@ -103,13 +110,14 @@ private CompleteIPRotationRequest(
private volatile java.lang.Object projectId_;
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -123,13 +131,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
@@ -147,14 +156,15 @@ public java.lang.String getProjectId() {
private volatile java.lang.Object zone_;
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -168,14 +178,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
@@ -193,12 +204,13 @@ public java.lang.String getZone() {
private volatile java.lang.Object clusterId_;
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public java.lang.String getClusterId() {
+ @java.lang.Deprecated public java.lang.String getClusterId() {
java.lang.Object ref = clusterId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -212,12 +224,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIdBytes() {
java.lang.Object ref = clusterId_;
if (ref instanceof java.lang.String) {
@@ -231,6 +244,50 @@ public java.lang.String getClusterId() {
}
}
+ public static final int NAME_FIELD_NUMBER = 7;
+ private volatile java.lang.Object name_;
+ /**
+ * + * The name (project, location, cluster id) of the cluster to complete IP + * rotation. Specified in the format 'projects/*/locations/*/clusters/*'. + *+ * + *
string name = 7;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ }
+ }
+ /**
+ * + * The name (project, location, cluster id) of the cluster to complete IP + * rotation. Specified in the format 'projects/*/locations/*/clusters/*'. + *+ * + *
string name = 7;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -254,6 +311,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
if (!getClusterIdBytes().isEmpty()) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 3, clusterId_);
}
+ if (!getNameBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 7, name_);
+ }
unknownFields.writeTo(output);
}
@@ -272,6 +332,9 @@ public int getSerializedSize() {
if (!getClusterIdBytes().isEmpty()) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, clusterId_);
}
+ if (!getNameBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, name_);
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -294,6 +357,8 @@ public boolean equals(final java.lang.Object obj) {
.equals(other.getZone());
result = result && getClusterId()
.equals(other.getClusterId());
+ result = result && getName()
+ .equals(other.getName());
result = result && unknownFields.equals(other.unknownFields);
return result;
}
@@ -311,6 +376,8 @@ public int hashCode() {
hash = (53 * hash) + getZone().hashCode();
hash = (37 * hash) + CLUSTER_ID_FIELD_NUMBER;
hash = (53 * hash) + getClusterId().hashCode();
+ hash = (37 * hash) + NAME_FIELD_NUMBER;
+ hash = (53 * hash) + getName().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -454,6 +521,8 @@ public Builder clear() {
clusterId_ = "";
+ name_ = "";
+
return this;
}
@@ -483,6 +552,7 @@ public com.google.container.v1.CompleteIPRotationRequest buildPartial() {
result.projectId_ = projectId_;
result.zone_ = zone_;
result.clusterId_ = clusterId_;
+ result.name_ = name_;
onBuilt();
return result;
}
@@ -543,6 +613,10 @@ public Builder mergeFrom(com.google.container.v1.CompleteIPRotationRequest other
clusterId_ = other.clusterId_;
onChanged();
}
+ if (!other.getName().isEmpty()) {
+ name_ = other.name_;
+ onChanged();
+ }
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -575,13 +649,14 @@ public Builder mergeFrom(
private java.lang.Object projectId_ = "";
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -595,13 +670,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof String) {
@@ -616,13 +692,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectId(
+ @java.lang.Deprecated public Builder setProjectId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -634,13 +711,14 @@ public Builder setProjectId(
}
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder clearProjectId() {
+ @java.lang.Deprecated public Builder clearProjectId() {
projectId_ = getDefaultInstance().getProjectId();
onChanged();
@@ -648,13 +726,14 @@ public Builder clearProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectIdBytes(
+ @java.lang.Deprecated public Builder setProjectIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -669,14 +748,15 @@ public Builder setProjectIdBytes(
private java.lang.Object zone_ = "";
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -690,14 +770,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof String) {
@@ -712,14 +793,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZone(
+ @java.lang.Deprecated public Builder setZone(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -731,14 +813,15 @@ public Builder setZone(
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder clearZone() {
+ @java.lang.Deprecated public Builder clearZone() {
zone_ = getDefaultInstance().getZone();
onChanged();
@@ -746,14 +829,15 @@ public Builder clearZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZoneBytes(
+ @java.lang.Deprecated public Builder setZoneBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -768,12 +852,13 @@ public Builder setZoneBytes(
private java.lang.Object clusterId_ = "";
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public java.lang.String getClusterId() {
+ @java.lang.Deprecated public java.lang.String getClusterId() {
java.lang.Object ref = clusterId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -787,12 +872,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIdBytes() {
java.lang.Object ref = clusterId_;
if (ref instanceof String) {
@@ -807,12 +893,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder setClusterId(
+ @java.lang.Deprecated public Builder setClusterId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -824,12 +911,13 @@ public Builder setClusterId(
}
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder clearClusterId() {
+ @java.lang.Deprecated public Builder clearClusterId() {
clusterId_ = getDefaultInstance().getClusterId();
onChanged();
@@ -837,12 +925,13 @@ public Builder clearClusterId() {
}
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder setClusterIdBytes(
+ @java.lang.Deprecated public Builder setClusterIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -853,6 +942,100 @@ public Builder setClusterIdBytes(
onChanged();
return this;
}
+
+ private java.lang.Object name_ = "";
+ /**
+ * + * The name (project, location, cluster id) of the cluster to complete IP + * rotation. Specified in the format 'projects/*/locations/*/clusters/*'. + *+ * + *
string name = 7;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ * + * The name (project, location, cluster id) of the cluster to complete IP + * rotation. Specified in the format 'projects/*/locations/*/clusters/*'. + *+ * + *
string name = 7;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ * + * The name (project, location, cluster id) of the cluster to complete IP + * rotation. Specified in the format 'projects/*/locations/*/clusters/*'. + *+ * + *
string name = 7;
+ */
+ public Builder setName(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * + * The name (project, location, cluster id) of the cluster to complete IP + * rotation. Specified in the format 'projects/*/locations/*/clusters/*'. + *+ * + *
string name = 7;
+ */
+ public Builder clearName() {
+
+ name_ = getDefaultInstance().getName();
+ onChanged();
+ return this;
+ }
+ /**
+ * + * The name (project, location, cluster id) of the cluster to complete IP + * rotation. Specified in the format 'projects/*/locations/*/clusters/*'. + *+ * + *
string name = 7;
+ */
+ public Builder setNameBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CompleteIPRotationRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CompleteIPRotationRequestOrBuilder.java
index dcd620fa3b89..cf86d155a19a 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CompleteIPRotationRequestOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CompleteIPRotationRequestOrBuilder.java
@@ -9,61 +9,87 @@ public interface CompleteIPRotationRequestOrBuilder extends
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- java.lang.String getProjectId();
+ @java.lang.Deprecated java.lang.String getProjectId();
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getProjectIdBytes();
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- java.lang.String getZone();
+ @java.lang.Deprecated java.lang.String getZone();
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getZoneBytes();
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- java.lang.String getClusterId();
+ @java.lang.Deprecated java.lang.String getClusterId();
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getClusterIdBytes();
+
+ /**
+ * + * The name (project, location, cluster id) of the cluster to complete IP + * rotation. Specified in the format 'projects/*/locations/*/clusters/*'. + *+ * + *
string name = 7;
+ */
+ java.lang.String getName();
+ /**
+ * + * The name (project, location, cluster id) of the cluster to complete IP + * rotation. Specified in the format 'projects/*/locations/*/clusters/*'. + *+ * + *
string name = 7;
+ */
+ com.google.protobuf.ByteString
+ getNameBytes();
}
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CreateClusterRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CreateClusterRequest.java
index 46fd92c290c4..e84533776194 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CreateClusterRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CreateClusterRequest.java
@@ -22,6 +22,7 @@ private CreateClusterRequest(com.google.protobuf.GeneratedMessageV3.Builder b
private CreateClusterRequest() {
projectId_ = "";
zone_ = "";
+ parent_ = "";
}
@java.lang.Override
@@ -73,6 +74,12 @@ private CreateClusterRequest(
break;
}
+ case 42: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ parent_ = s;
+ break;
+ }
default: {
if (!parseUnknownFieldProto3(
input, unknownFields, extensionRegistry, tag)) {
@@ -109,13 +116,14 @@ private CreateClusterRequest(
private volatile java.lang.Object projectId_;
/**
*
- * The Google Developers Console [project ID or project
+ * 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 parent field.
*
*
- * string project_id = 1;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -129,13 +137,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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 parent field.
*
*
- * string project_id = 1;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
@@ -153,14 +162,15 @@ public java.lang.String getProjectId() {
private volatile java.lang.Object zone_;
/**
*
- * The name of the Google Compute Engine
+ * 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 parent field.
*
*
- * string zone = 2;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -174,14 +184,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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 parent field.
*
*
- * string zone = 2;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
@@ -231,6 +242,50 @@ public com.google.container.v1.ClusterOrBuilder getClusterOrBuilder() {
return getCluster();
}
+ public static final int PARENT_FIELD_NUMBER = 5;
+ private volatile java.lang.Object parent_;
+ /**
+ * + * The parent (project and location) where the cluster will be created. + * Specified in the format 'projects/*/locations/*'. + *+ * + *
string parent = 5;
+ */
+ public java.lang.String getParent() {
+ java.lang.Object ref = parent_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ parent_ = s;
+ return s;
+ }
+ }
+ /**
+ * + * The parent (project and location) where the cluster will be created. + * Specified in the format 'projects/*/locations/*'. + *+ * + *
string parent = 5;
+ */
+ public com.google.protobuf.ByteString
+ getParentBytes() {
+ java.lang.Object ref = parent_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ parent_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -254,6 +309,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
if (cluster_ != null) {
output.writeMessage(3, getCluster());
}
+ if (!getParentBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 5, parent_);
+ }
unknownFields.writeTo(output);
}
@@ -273,6 +331,9 @@ public int getSerializedSize() {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(3, getCluster());
}
+ if (!getParentBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, parent_);
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -298,6 +359,8 @@ public boolean equals(final java.lang.Object obj) {
result = result && getCluster()
.equals(other.getCluster());
}
+ result = result && getParent()
+ .equals(other.getParent());
result = result && unknownFields.equals(other.unknownFields);
return result;
}
@@ -317,6 +380,8 @@ public int hashCode() {
hash = (37 * hash) + CLUSTER_FIELD_NUMBER;
hash = (53 * hash) + getCluster().hashCode();
}
+ hash = (37 * hash) + PARENT_FIELD_NUMBER;
+ hash = (53 * hash) + getParent().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -464,6 +529,8 @@ public Builder clear() {
cluster_ = null;
clusterBuilder_ = null;
}
+ parent_ = "";
+
return this;
}
@@ -497,6 +564,7 @@ public com.google.container.v1.CreateClusterRequest buildPartial() {
} else {
result.cluster_ = clusterBuilder_.build();
}
+ result.parent_ = parent_;
onBuilt();
return result;
}
@@ -556,6 +624,10 @@ public Builder mergeFrom(com.google.container.v1.CreateClusterRequest other) {
if (other.hasCluster()) {
mergeCluster(other.getCluster());
}
+ if (!other.getParent().isEmpty()) {
+ parent_ = other.parent_;
+ onChanged();
+ }
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -588,13 +660,14 @@ public Builder mergeFrom(
private java.lang.Object projectId_ = "";
/**
*
- * The Google Developers Console [project ID or project
+ * 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 parent field.
*
*
- * string project_id = 1;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -608,13 +681,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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 parent field.
*
*
- * string project_id = 1;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof String) {
@@ -629,13 +703,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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 parent field.
*
*
- * string project_id = 1;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectId(
+ @java.lang.Deprecated public Builder setProjectId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -647,13 +722,14 @@ public Builder setProjectId(
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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 parent field.
*
*
- * string project_id = 1;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder clearProjectId() {
+ @java.lang.Deprecated public Builder clearProjectId() {
projectId_ = getDefaultInstance().getProjectId();
onChanged();
@@ -661,13 +737,14 @@ public Builder clearProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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 parent field.
*
*
- * string project_id = 1;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectIdBytes(
+ @java.lang.Deprecated public Builder setProjectIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -682,14 +759,15 @@ public Builder setProjectIdBytes(
private java.lang.Object zone_ = "";
/**
*
- * The name of the Google Compute Engine
+ * 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 parent field.
*
*
- * string zone = 2;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -703,14 +781,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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 parent field.
*
*
- * string zone = 2;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof String) {
@@ -725,14 +804,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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 parent field.
*
*
- * string zone = 2;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZone(
+ @java.lang.Deprecated public Builder setZone(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -744,14 +824,15 @@ public Builder setZone(
}
/**
*
- * The name of the Google Compute Engine
+ * 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 parent field.
*
*
- * string zone = 2;
+ * string zone = 2 [deprecated = true];
*/
- public Builder clearZone() {
+ @java.lang.Deprecated public Builder clearZone() {
zone_ = getDefaultInstance().getZone();
onChanged();
@@ -759,14 +840,15 @@ public Builder clearZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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 parent field.
*
*
- * string zone = 2;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZoneBytes(
+ @java.lang.Deprecated public Builder setZoneBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -939,6 +1021,100 @@ public com.google.container.v1.ClusterOrBuilder getClusterOrBuilder() {
}
return clusterBuilder_;
}
+
+ private java.lang.Object parent_ = "";
+ /**
+ * + * The parent (project and location) where the cluster will be created. + * Specified in the format 'projects/*/locations/*'. + *+ * + *
string parent = 5;
+ */
+ public java.lang.String getParent() {
+ java.lang.Object ref = parent_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ parent_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ * + * The parent (project and location) where the cluster will be created. + * Specified in the format 'projects/*/locations/*'. + *+ * + *
string parent = 5;
+ */
+ public com.google.protobuf.ByteString
+ getParentBytes() {
+ java.lang.Object ref = parent_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ parent_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ * + * The parent (project and location) where the cluster will be created. + * Specified in the format 'projects/*/locations/*'. + *+ * + *
string parent = 5;
+ */
+ public Builder setParent(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ parent_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * + * The parent (project and location) where the cluster will be created. + * Specified in the format 'projects/*/locations/*'. + *+ * + *
string parent = 5;
+ */
+ public Builder clearParent() {
+
+ parent_ = getDefaultInstance().getParent();
+ onChanged();
+ return this;
+ }
+ /**
+ * + * The parent (project and location) where the cluster will be created. + * Specified in the format 'projects/*/locations/*'. + *+ * + *
string parent = 5;
+ */
+ public Builder setParentBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ parent_ = value;
+ onChanged();
+ return this;
+ }
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CreateClusterRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CreateClusterRequestOrBuilder.java
index f2641e17fa19..6740fbbf6759 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CreateClusterRequestOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CreateClusterRequestOrBuilder.java
@@ -9,44 +9,48 @@ public interface CreateClusterRequestOrBuilder extends
/**
*
- * The Google Developers Console [project ID or project
+ * 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 parent field.
*
*
- * string project_id = 1;
+ * string project_id = 1 [deprecated = true];
*/
- java.lang.String getProjectId();
+ @java.lang.Deprecated java.lang.String getProjectId();
/**
*
- * The Google Developers Console [project ID or project
+ * 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 parent field.
*
*
- * string project_id = 1;
+ * string project_id = 1 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getProjectIdBytes();
/**
*
- * The name of the Google Compute Engine
+ * 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 parent field.
*
*
- * string zone = 2;
+ * string zone = 2 [deprecated = true];
*/
- java.lang.String getZone();
+ @java.lang.Deprecated java.lang.String getZone();
/**
*
- * The name of the Google Compute Engine
+ * 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 parent field.
*
*
- * string zone = 2;
+ * string zone = 2 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getZoneBytes();
/**
@@ -76,4 +80,24 @@ public interface CreateClusterRequestOrBuilder extends
* .google.container.v1.Cluster cluster = 3;
*/
com.google.container.v1.ClusterOrBuilder getClusterOrBuilder();
+
+ /**
+ * + * The parent (project and location) where the cluster will be created. + * Specified in the format 'projects/*/locations/*'. + *+ * + *
string parent = 5;
+ */
+ java.lang.String getParent();
+ /**
+ * + * The parent (project and location) where the cluster will be created. + * Specified in the format 'projects/*/locations/*'. + *+ * + *
string parent = 5;
+ */
+ com.google.protobuf.ByteString
+ getParentBytes();
}
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CreateNodePoolRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CreateNodePoolRequest.java
index fc274acee746..282c23cb160b 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CreateNodePoolRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CreateNodePoolRequest.java
@@ -23,6 +23,7 @@ private CreateNodePoolRequest() {
projectId_ = "";
zone_ = "";
clusterId_ = "";
+ parent_ = "";
}
@java.lang.Override
@@ -80,6 +81,12 @@ private CreateNodePoolRequest(
break;
}
+ case 50: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ parent_ = s;
+ break;
+ }
default: {
if (!parseUnknownFieldProto3(
input, unknownFields, extensionRegistry, tag)) {
@@ -116,13 +123,14 @@ private CreateNodePoolRequest(
private volatile java.lang.Object projectId_;
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -136,13 +144,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
@@ -160,14 +169,15 @@ public java.lang.String getProjectId() {
private volatile java.lang.Object zone_;
/**
*
- * The name of the Google Compute Engine
+ * 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 parent field.
*
*
- * string zone = 2;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -181,14 +191,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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 parent field.
*
*
- * string zone = 2;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
@@ -206,12 +217,13 @@ public java.lang.String getZone() {
private volatile java.lang.Object clusterId_;
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the parent field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public java.lang.String getClusterId() {
+ @java.lang.Deprecated public java.lang.String getClusterId() {
java.lang.Object ref = clusterId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -225,12 +237,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the parent field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIdBytes() {
java.lang.Object ref = clusterId_;
if (ref instanceof java.lang.String) {
@@ -277,6 +290,52 @@ public com.google.container.v1.NodePoolOrBuilder getNodePoolOrBuilder() {
return getNodePool();
}
+ public static final int PARENT_FIELD_NUMBER = 6;
+ private volatile java.lang.Object parent_;
+ /**
+ * + * The parent (project, location, cluster id) where the node pool will be + * created. Specified in the format + * 'projects/*/locations/*/clusters/*'. + *+ * + *
string parent = 6;
+ */
+ public java.lang.String getParent() {
+ java.lang.Object ref = parent_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ parent_ = s;
+ return s;
+ }
+ }
+ /**
+ * + * The parent (project, location, cluster id) where the node pool will be + * created. Specified in the format + * 'projects/*/locations/*/clusters/*'. + *+ * + *
string parent = 6;
+ */
+ public com.google.protobuf.ByteString
+ getParentBytes() {
+ java.lang.Object ref = parent_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ parent_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -303,6 +362,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
if (nodePool_ != null) {
output.writeMessage(4, getNodePool());
}
+ if (!getParentBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 6, parent_);
+ }
unknownFields.writeTo(output);
}
@@ -325,6 +387,9 @@ public int getSerializedSize() {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(4, getNodePool());
}
+ if (!getParentBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, parent_);
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -352,6 +417,8 @@ public boolean equals(final java.lang.Object obj) {
result = result && getNodePool()
.equals(other.getNodePool());
}
+ result = result && getParent()
+ .equals(other.getParent());
result = result && unknownFields.equals(other.unknownFields);
return result;
}
@@ -373,6 +440,8 @@ public int hashCode() {
hash = (37 * hash) + NODE_POOL_FIELD_NUMBER;
hash = (53 * hash) + getNodePool().hashCode();
}
+ hash = (37 * hash) + PARENT_FIELD_NUMBER;
+ hash = (53 * hash) + getParent().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -522,6 +591,8 @@ public Builder clear() {
nodePool_ = null;
nodePoolBuilder_ = null;
}
+ parent_ = "";
+
return this;
}
@@ -556,6 +627,7 @@ public com.google.container.v1.CreateNodePoolRequest buildPartial() {
} else {
result.nodePool_ = nodePoolBuilder_.build();
}
+ result.parent_ = parent_;
onBuilt();
return result;
}
@@ -619,6 +691,10 @@ public Builder mergeFrom(com.google.container.v1.CreateNodePoolRequest other) {
if (other.hasNodePool()) {
mergeNodePool(other.getNodePool());
}
+ if (!other.getParent().isEmpty()) {
+ parent_ = other.parent_;
+ onChanged();
+ }
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -651,13 +727,14 @@ public Builder mergeFrom(
private java.lang.Object projectId_ = "";
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -671,13 +748,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof String) {
@@ -692,13 +770,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectId(
+ @java.lang.Deprecated public Builder setProjectId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -710,13 +789,14 @@ public Builder setProjectId(
}
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder clearProjectId() {
+ @java.lang.Deprecated public Builder clearProjectId() {
projectId_ = getDefaultInstance().getProjectId();
onChanged();
@@ -724,13 +804,14 @@ public Builder clearProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectIdBytes(
+ @java.lang.Deprecated public Builder setProjectIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -745,14 +826,15 @@ public Builder setProjectIdBytes(
private java.lang.Object zone_ = "";
/**
*
- * The name of the Google Compute Engine
+ * 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 parent field.
*
*
- * string zone = 2;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -766,14 +848,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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 parent field.
*
*
- * string zone = 2;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof String) {
@@ -788,14 +871,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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 parent field.
*
*
- * string zone = 2;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZone(
+ @java.lang.Deprecated public Builder setZone(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -807,14 +891,15 @@ public Builder setZone(
}
/**
*
- * The name of the Google Compute Engine
+ * 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 parent field.
*
*
- * string zone = 2;
+ * string zone = 2 [deprecated = true];
*/
- public Builder clearZone() {
+ @java.lang.Deprecated public Builder clearZone() {
zone_ = getDefaultInstance().getZone();
onChanged();
@@ -822,14 +907,15 @@ public Builder clearZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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 parent field.
*
*
- * string zone = 2;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZoneBytes(
+ @java.lang.Deprecated public Builder setZoneBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -844,12 +930,13 @@ public Builder setZoneBytes(
private java.lang.Object clusterId_ = "";
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the parent field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public java.lang.String getClusterId() {
+ @java.lang.Deprecated public java.lang.String getClusterId() {
java.lang.Object ref = clusterId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -863,12 +950,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the parent field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIdBytes() {
java.lang.Object ref = clusterId_;
if (ref instanceof String) {
@@ -883,12 +971,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the parent field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder setClusterId(
+ @java.lang.Deprecated public Builder setClusterId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -900,12 +989,13 @@ public Builder setClusterId(
}
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the parent field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder clearClusterId() {
+ @java.lang.Deprecated public Builder clearClusterId() {
clusterId_ = getDefaultInstance().getClusterId();
onChanged();
@@ -913,12 +1003,13 @@ public Builder clearClusterId() {
}
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the parent field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder setClusterIdBytes(
+ @java.lang.Deprecated public Builder setClusterIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -1082,6 +1173,105 @@ public com.google.container.v1.NodePoolOrBuilder getNodePoolOrBuilder() {
}
return nodePoolBuilder_;
}
+
+ private java.lang.Object parent_ = "";
+ /**
+ * + * The parent (project, location, cluster id) where the node pool will be + * created. Specified in the format + * 'projects/*/locations/*/clusters/*'. + *+ * + *
string parent = 6;
+ */
+ public java.lang.String getParent() {
+ java.lang.Object ref = parent_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ parent_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ * + * The parent (project, location, cluster id) where the node pool will be + * created. Specified in the format + * 'projects/*/locations/*/clusters/*'. + *+ * + *
string parent = 6;
+ */
+ public com.google.protobuf.ByteString
+ getParentBytes() {
+ java.lang.Object ref = parent_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ parent_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ * + * The parent (project, location, cluster id) where the node pool will be + * created. Specified in the format + * 'projects/*/locations/*/clusters/*'. + *+ * + *
string parent = 6;
+ */
+ public Builder setParent(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ parent_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * + * The parent (project, location, cluster id) where the node pool will be + * created. Specified in the format + * 'projects/*/locations/*/clusters/*'. + *+ * + *
string parent = 6;
+ */
+ public Builder clearParent() {
+
+ parent_ = getDefaultInstance().getParent();
+ onChanged();
+ return this;
+ }
+ /**
+ * + * The parent (project, location, cluster id) where the node pool will be + * created. Specified in the format + * 'projects/*/locations/*/clusters/*'. + *+ * + *
string parent = 6;
+ */
+ public Builder setParentBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ parent_ = value;
+ onChanged();
+ return this;
+ }
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CreateNodePoolRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CreateNodePoolRequestOrBuilder.java
index 07f00dc3ed68..e520be3d8859 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CreateNodePoolRequestOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CreateNodePoolRequestOrBuilder.java
@@ -9,62 +9,68 @@ public interface CreateNodePoolRequestOrBuilder extends
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- java.lang.String getProjectId();
+ @java.lang.Deprecated java.lang.String getProjectId();
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getProjectIdBytes();
/**
*
- * The name of the Google Compute Engine
+ * 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 parent field.
*
*
- * string zone = 2;
+ * string zone = 2 [deprecated = true];
*/
- java.lang.String getZone();
+ @java.lang.Deprecated java.lang.String getZone();
/**
*
- * The name of the Google Compute Engine
+ * 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 parent field.
*
*
- * string zone = 2;
+ * string zone = 2 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getZoneBytes();
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the parent field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- java.lang.String getClusterId();
+ @java.lang.Deprecated java.lang.String getClusterId();
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the parent field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getClusterIdBytes();
/**
@@ -91,4 +97,26 @@ public interface CreateNodePoolRequestOrBuilder extends
* .google.container.v1.NodePool node_pool = 4;
*/
com.google.container.v1.NodePoolOrBuilder getNodePoolOrBuilder();
+
+ /**
+ * + * The parent (project, location, cluster id) where the node pool will be + * created. Specified in the format + * 'projects/*/locations/*/clusters/*'. + *+ * + *
string parent = 6;
+ */
+ java.lang.String getParent();
+ /**
+ * + * The parent (project, location, cluster id) where the node pool will be + * created. Specified in the format + * 'projects/*/locations/*/clusters/*'. + *+ * + *
string parent = 6;
+ */
+ com.google.protobuf.ByteString
+ getParentBytes();
}
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/DeleteClusterRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/DeleteClusterRequest.java
index 8cd0b57026d8..b4e475180240 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/DeleteClusterRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/DeleteClusterRequest.java
@@ -23,6 +23,7 @@ private DeleteClusterRequest() {
projectId_ = "";
zone_ = "";
clusterId_ = "";
+ name_ = "";
}
@java.lang.Override
@@ -67,6 +68,12 @@ private DeleteClusterRequest(
clusterId_ = s;
break;
}
+ case 34: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ name_ = s;
+ break;
+ }
default: {
if (!parseUnknownFieldProto3(
input, unknownFields, extensionRegistry, tag)) {
@@ -103,13 +110,14 @@ private DeleteClusterRequest(
private volatile java.lang.Object projectId_;
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -123,13 +131,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
@@ -147,14 +156,15 @@ public java.lang.String getProjectId() {
private volatile java.lang.Object zone_;
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -168,14 +178,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
@@ -193,12 +204,13 @@ public java.lang.String getZone() {
private volatile java.lang.Object clusterId_;
/**
*
- * The name of the cluster to delete.
+ * Deprecated. The name of the cluster to delete.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public java.lang.String getClusterId() {
+ @java.lang.Deprecated public java.lang.String getClusterId() {
java.lang.Object ref = clusterId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -212,12 +224,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster to delete.
+ * Deprecated. The name of the cluster to delete.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIdBytes() {
java.lang.Object ref = clusterId_;
if (ref instanceof java.lang.String) {
@@ -231,6 +244,50 @@ public java.lang.String getClusterId() {
}
}
+ public static final int NAME_FIELD_NUMBER = 4;
+ private volatile java.lang.Object name_;
+ /**
+ * + * The name (project, location, cluster) of the cluster to delete. + * Specified in the format 'projects/*/locations/*/clusters/*'. + *+ * + *
string name = 4;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ }
+ }
+ /**
+ * + * The name (project, location, cluster) of the cluster to delete. + * Specified in the format 'projects/*/locations/*/clusters/*'. + *+ * + *
string name = 4;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -254,6 +311,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
if (!getClusterIdBytes().isEmpty()) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 3, clusterId_);
}
+ if (!getNameBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 4, name_);
+ }
unknownFields.writeTo(output);
}
@@ -272,6 +332,9 @@ public int getSerializedSize() {
if (!getClusterIdBytes().isEmpty()) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, clusterId_);
}
+ if (!getNameBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, name_);
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -294,6 +357,8 @@ public boolean equals(final java.lang.Object obj) {
.equals(other.getZone());
result = result && getClusterId()
.equals(other.getClusterId());
+ result = result && getName()
+ .equals(other.getName());
result = result && unknownFields.equals(other.unknownFields);
return result;
}
@@ -311,6 +376,8 @@ public int hashCode() {
hash = (53 * hash) + getZone().hashCode();
hash = (37 * hash) + CLUSTER_ID_FIELD_NUMBER;
hash = (53 * hash) + getClusterId().hashCode();
+ hash = (37 * hash) + NAME_FIELD_NUMBER;
+ hash = (53 * hash) + getName().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -454,6 +521,8 @@ public Builder clear() {
clusterId_ = "";
+ name_ = "";
+
return this;
}
@@ -483,6 +552,7 @@ public com.google.container.v1.DeleteClusterRequest buildPartial() {
result.projectId_ = projectId_;
result.zone_ = zone_;
result.clusterId_ = clusterId_;
+ result.name_ = name_;
onBuilt();
return result;
}
@@ -543,6 +613,10 @@ public Builder mergeFrom(com.google.container.v1.DeleteClusterRequest other) {
clusterId_ = other.clusterId_;
onChanged();
}
+ if (!other.getName().isEmpty()) {
+ name_ = other.name_;
+ onChanged();
+ }
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -575,13 +649,14 @@ public Builder mergeFrom(
private java.lang.Object projectId_ = "";
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -595,13 +670,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof String) {
@@ -616,13 +692,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectId(
+ @java.lang.Deprecated public Builder setProjectId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -634,13 +711,14 @@ public Builder setProjectId(
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder clearProjectId() {
+ @java.lang.Deprecated public Builder clearProjectId() {
projectId_ = getDefaultInstance().getProjectId();
onChanged();
@@ -648,13 +726,14 @@ public Builder clearProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectIdBytes(
+ @java.lang.Deprecated public Builder setProjectIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -669,14 +748,15 @@ public Builder setProjectIdBytes(
private java.lang.Object zone_ = "";
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -690,14 +770,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof String) {
@@ -712,14 +793,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZone(
+ @java.lang.Deprecated public Builder setZone(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -731,14 +813,15 @@ public Builder setZone(
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder clearZone() {
+ @java.lang.Deprecated public Builder clearZone() {
zone_ = getDefaultInstance().getZone();
onChanged();
@@ -746,14 +829,15 @@ public Builder clearZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZoneBytes(
+ @java.lang.Deprecated public Builder setZoneBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -768,12 +852,13 @@ public Builder setZoneBytes(
private java.lang.Object clusterId_ = "";
/**
*
- * The name of the cluster to delete.
+ * Deprecated. The name of the cluster to delete.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public java.lang.String getClusterId() {
+ @java.lang.Deprecated public java.lang.String getClusterId() {
java.lang.Object ref = clusterId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -787,12 +872,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster to delete.
+ * Deprecated. The name of the cluster to delete.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIdBytes() {
java.lang.Object ref = clusterId_;
if (ref instanceof String) {
@@ -807,12 +893,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster to delete.
+ * Deprecated. The name of the cluster to delete.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder setClusterId(
+ @java.lang.Deprecated public Builder setClusterId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -824,12 +911,13 @@ public Builder setClusterId(
}
/**
*
- * The name of the cluster to delete.
+ * Deprecated. The name of the cluster to delete.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder clearClusterId() {
+ @java.lang.Deprecated public Builder clearClusterId() {
clusterId_ = getDefaultInstance().getClusterId();
onChanged();
@@ -837,12 +925,13 @@ public Builder clearClusterId() {
}
/**
*
- * The name of the cluster to delete.
+ * Deprecated. The name of the cluster to delete.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder setClusterIdBytes(
+ @java.lang.Deprecated public Builder setClusterIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -853,6 +942,100 @@ public Builder setClusterIdBytes(
onChanged();
return this;
}
+
+ private java.lang.Object name_ = "";
+ /**
+ * + * The name (project, location, cluster) of the cluster to delete. + * Specified in the format 'projects/*/locations/*/clusters/*'. + *+ * + *
string name = 4;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ * + * The name (project, location, cluster) of the cluster to delete. + * Specified in the format 'projects/*/locations/*/clusters/*'. + *+ * + *
string name = 4;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ * + * The name (project, location, cluster) of the cluster to delete. + * Specified in the format 'projects/*/locations/*/clusters/*'. + *+ * + *
string name = 4;
+ */
+ public Builder setName(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * + * The name (project, location, cluster) of the cluster to delete. + * Specified in the format 'projects/*/locations/*/clusters/*'. + *+ * + *
string name = 4;
+ */
+ public Builder clearName() {
+
+ name_ = getDefaultInstance().getName();
+ onChanged();
+ return this;
+ }
+ /**
+ * + * The name (project, location, cluster) of the cluster to delete. + * Specified in the format 'projects/*/locations/*/clusters/*'. + *+ * + *
string name = 4;
+ */
+ public Builder setNameBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/DeleteClusterRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/DeleteClusterRequestOrBuilder.java
index 0069b71fa9ad..1eddeeb1fd34 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/DeleteClusterRequestOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/DeleteClusterRequestOrBuilder.java
@@ -9,61 +9,87 @@ public interface DeleteClusterRequestOrBuilder extends
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- java.lang.String getProjectId();
+ @java.lang.Deprecated java.lang.String getProjectId();
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getProjectIdBytes();
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- java.lang.String getZone();
+ @java.lang.Deprecated java.lang.String getZone();
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getZoneBytes();
/**
*
- * The name of the cluster to delete.
+ * Deprecated. The name of the cluster to delete.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- java.lang.String getClusterId();
+ @java.lang.Deprecated java.lang.String getClusterId();
/**
*
- * The name of the cluster to delete.
+ * Deprecated. The name of the cluster to delete.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getClusterIdBytes();
+
+ /**
+ * + * The name (project, location, cluster) of the cluster to delete. + * Specified in the format 'projects/*/locations/*/clusters/*'. + *+ * + *
string name = 4;
+ */
+ java.lang.String getName();
+ /**
+ * + * The name (project, location, cluster) of the cluster to delete. + * Specified in the format 'projects/*/locations/*/clusters/*'. + *+ * + *
string name = 4;
+ */
+ com.google.protobuf.ByteString
+ getNameBytes();
}
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/DeleteNodePoolRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/DeleteNodePoolRequest.java
index 4bc98edc9cc6..27438f9b21d8 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/DeleteNodePoolRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/DeleteNodePoolRequest.java
@@ -24,6 +24,7 @@ private DeleteNodePoolRequest() {
zone_ = "";
clusterId_ = "";
nodePoolId_ = "";
+ name_ = "";
}
@java.lang.Override
@@ -74,6 +75,12 @@ private DeleteNodePoolRequest(
nodePoolId_ = s;
break;
}
+ case 50: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ name_ = s;
+ break;
+ }
default: {
if (!parseUnknownFieldProto3(
input, unknownFields, extensionRegistry, tag)) {
@@ -110,13 +117,14 @@ private DeleteNodePoolRequest(
private volatile java.lang.Object projectId_;
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -130,13 +138,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
@@ -154,14 +163,15 @@ public java.lang.String getProjectId() {
private volatile java.lang.Object zone_;
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -175,14 +185,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
@@ -200,12 +211,13 @@ public java.lang.String getZone() {
private volatile java.lang.Object clusterId_;
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public java.lang.String getClusterId() {
+ @java.lang.Deprecated public java.lang.String getClusterId() {
java.lang.Object ref = clusterId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -219,12 +231,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIdBytes() {
java.lang.Object ref = clusterId_;
if (ref instanceof java.lang.String) {
@@ -242,12 +255,13 @@ public java.lang.String getClusterId() {
private volatile java.lang.Object nodePoolId_;
/**
*
- * The name of the node pool to delete.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public java.lang.String getNodePoolId() {
+ @java.lang.Deprecated public java.lang.String getNodePoolId() {
java.lang.Object ref = nodePoolId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -261,12 +275,13 @@ public java.lang.String getNodePoolId() {
}
/**
*
- * The name of the node pool to delete.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getNodePoolIdBytes() {
java.lang.Object ref = nodePoolId_;
if (ref instanceof java.lang.String) {
@@ -280,6 +295,52 @@ public java.lang.String getNodePoolId() {
}
}
+ public static final int NAME_FIELD_NUMBER = 6;
+ private volatile java.lang.Object name_;
+ /**
+ * + * 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;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ }
+ }
+ /**
+ * + * 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;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -306,6 +367,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
if (!getNodePoolIdBytes().isEmpty()) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 4, nodePoolId_);
}
+ if (!getNameBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 6, name_);
+ }
unknownFields.writeTo(output);
}
@@ -327,6 +391,9 @@ public int getSerializedSize() {
if (!getNodePoolIdBytes().isEmpty()) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, nodePoolId_);
}
+ if (!getNameBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, name_);
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -351,6 +418,8 @@ public boolean equals(final java.lang.Object obj) {
.equals(other.getClusterId());
result = result && getNodePoolId()
.equals(other.getNodePoolId());
+ result = result && getName()
+ .equals(other.getName());
result = result && unknownFields.equals(other.unknownFields);
return result;
}
@@ -370,6 +439,8 @@ public int hashCode() {
hash = (53 * hash) + getClusterId().hashCode();
hash = (37 * hash) + NODE_POOL_ID_FIELD_NUMBER;
hash = (53 * hash) + getNodePoolId().hashCode();
+ hash = (37 * hash) + NAME_FIELD_NUMBER;
+ hash = (53 * hash) + getName().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -515,6 +586,8 @@ public Builder clear() {
nodePoolId_ = "";
+ name_ = "";
+
return this;
}
@@ -545,6 +618,7 @@ public com.google.container.v1.DeleteNodePoolRequest buildPartial() {
result.zone_ = zone_;
result.clusterId_ = clusterId_;
result.nodePoolId_ = nodePoolId_;
+ result.name_ = name_;
onBuilt();
return result;
}
@@ -609,6 +683,10 @@ public Builder mergeFrom(com.google.container.v1.DeleteNodePoolRequest other) {
nodePoolId_ = other.nodePoolId_;
onChanged();
}
+ if (!other.getName().isEmpty()) {
+ name_ = other.name_;
+ onChanged();
+ }
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -641,13 +719,14 @@ public Builder mergeFrom(
private java.lang.Object projectId_ = "";
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -661,13 +740,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof String) {
@@ -682,13 +762,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectId(
+ @java.lang.Deprecated public Builder setProjectId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -700,13 +781,14 @@ public Builder setProjectId(
}
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder clearProjectId() {
+ @java.lang.Deprecated public Builder clearProjectId() {
projectId_ = getDefaultInstance().getProjectId();
onChanged();
@@ -714,13 +796,14 @@ public Builder clearProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectIdBytes(
+ @java.lang.Deprecated public Builder setProjectIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -735,14 +818,15 @@ public Builder setProjectIdBytes(
private java.lang.Object zone_ = "";
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -756,14 +840,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof String) {
@@ -778,14 +863,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZone(
+ @java.lang.Deprecated public Builder setZone(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -797,14 +883,15 @@ public Builder setZone(
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder clearZone() {
+ @java.lang.Deprecated public Builder clearZone() {
zone_ = getDefaultInstance().getZone();
onChanged();
@@ -812,14 +899,15 @@ public Builder clearZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZoneBytes(
+ @java.lang.Deprecated public Builder setZoneBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -834,12 +922,13 @@ public Builder setZoneBytes(
private java.lang.Object clusterId_ = "";
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public java.lang.String getClusterId() {
+ @java.lang.Deprecated public java.lang.String getClusterId() {
java.lang.Object ref = clusterId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -853,12 +942,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIdBytes() {
java.lang.Object ref = clusterId_;
if (ref instanceof String) {
@@ -873,12 +963,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder setClusterId(
+ @java.lang.Deprecated public Builder setClusterId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -890,12 +981,13 @@ public Builder setClusterId(
}
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder clearClusterId() {
+ @java.lang.Deprecated public Builder clearClusterId() {
clusterId_ = getDefaultInstance().getClusterId();
onChanged();
@@ -903,12 +995,13 @@ public Builder clearClusterId() {
}
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder setClusterIdBytes(
+ @java.lang.Deprecated public Builder setClusterIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -923,12 +1016,13 @@ public Builder setClusterIdBytes(
private java.lang.Object nodePoolId_ = "";
/**
*
- * The name of the node pool to delete.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public java.lang.String getNodePoolId() {
+ @java.lang.Deprecated public java.lang.String getNodePoolId() {
java.lang.Object ref = nodePoolId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -942,12 +1036,13 @@ public java.lang.String getNodePoolId() {
}
/**
*
- * The name of the node pool to delete.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getNodePoolIdBytes() {
java.lang.Object ref = nodePoolId_;
if (ref instanceof String) {
@@ -962,12 +1057,13 @@ public java.lang.String getNodePoolId() {
}
/**
*
- * The name of the node pool to delete.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public Builder setNodePoolId(
+ @java.lang.Deprecated public Builder setNodePoolId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -979,12 +1075,13 @@ public Builder setNodePoolId(
}
/**
*
- * The name of the node pool to delete.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public Builder clearNodePoolId() {
+ @java.lang.Deprecated public Builder clearNodePoolId() {
nodePoolId_ = getDefaultInstance().getNodePoolId();
onChanged();
@@ -992,12 +1089,13 @@ public Builder clearNodePoolId() {
}
/**
*
- * The name of the node pool to delete.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public Builder setNodePoolIdBytes(
+ @java.lang.Deprecated public Builder setNodePoolIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -1008,6 +1106,105 @@ public Builder setNodePoolIdBytes(
onChanged();
return this;
}
+
+ private java.lang.Object name_ = "";
+ /**
+ * + * 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;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ * + * 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;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ * + * 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;
+ */
+ public Builder setName(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * + * 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;
+ */
+ public Builder clearName() {
+
+ name_ = getDefaultInstance().getName();
+ onChanged();
+ return this;
+ }
+ /**
+ * + * 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;
+ */
+ public Builder setNameBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/DeleteNodePoolRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/DeleteNodePoolRequestOrBuilder.java
index 1a9721d269f5..152e9ce8ff8b 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/DeleteNodePoolRequestOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/DeleteNodePoolRequestOrBuilder.java
@@ -9,79 +9,109 @@ public interface DeleteNodePoolRequestOrBuilder extends
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- java.lang.String getProjectId();
+ @java.lang.Deprecated java.lang.String getProjectId();
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getProjectIdBytes();
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- java.lang.String getZone();
+ @java.lang.Deprecated java.lang.String getZone();
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getZoneBytes();
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- java.lang.String getClusterId();
+ @java.lang.Deprecated java.lang.String getClusterId();
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getClusterIdBytes();
/**
*
- * The name of the node pool to delete.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- java.lang.String getNodePoolId();
+ @java.lang.Deprecated java.lang.String getNodePoolId();
/**
*
- * The name of the node pool to delete.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getNodePoolIdBytes();
+
+ /**
+ * + * 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;
+ */
+ java.lang.String getName();
+ /**
+ * + * 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;
+ */
+ com.google.protobuf.ByteString
+ getNameBytes();
}
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetClusterRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetClusterRequest.java
index 8640ec81a6a7..5711130500d6 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetClusterRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetClusterRequest.java
@@ -23,6 +23,7 @@ private GetClusterRequest() {
projectId_ = "";
zone_ = "";
clusterId_ = "";
+ name_ = "";
}
@java.lang.Override
@@ -67,6 +68,12 @@ private GetClusterRequest(
clusterId_ = s;
break;
}
+ case 42: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ name_ = s;
+ break;
+ }
default: {
if (!parseUnknownFieldProto3(
input, unknownFields, extensionRegistry, tag)) {
@@ -103,13 +110,14 @@ private GetClusterRequest(
private volatile java.lang.Object projectId_;
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -123,13 +131,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
@@ -147,14 +156,15 @@ public java.lang.String getProjectId() {
private volatile java.lang.Object zone_;
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -168,14 +178,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
@@ -193,12 +204,13 @@ public java.lang.String getZone() {
private volatile java.lang.Object clusterId_;
/**
*
- * The name of the cluster to retrieve.
+ * Deprecated. The name of the cluster to retrieve.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public java.lang.String getClusterId() {
+ @java.lang.Deprecated public java.lang.String getClusterId() {
java.lang.Object ref = clusterId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -212,12 +224,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster to retrieve.
+ * Deprecated. The name of the cluster to retrieve.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIdBytes() {
java.lang.Object ref = clusterId_;
if (ref instanceof java.lang.String) {
@@ -231,6 +244,50 @@ public java.lang.String getClusterId() {
}
}
+ public static final int NAME_FIELD_NUMBER = 5;
+ private volatile java.lang.Object name_;
+ /**
+ * + * The name (project, location, cluster) of the cluster to retrieve. + * Specified in the format 'projects/*/locations/*/clusters/*'. + *+ * + *
string name = 5;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ }
+ }
+ /**
+ * + * The name (project, location, cluster) of the cluster to retrieve. + * Specified in the format 'projects/*/locations/*/clusters/*'. + *+ * + *
string name = 5;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -254,6 +311,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
if (!getClusterIdBytes().isEmpty()) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 3, clusterId_);
}
+ if (!getNameBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 5, name_);
+ }
unknownFields.writeTo(output);
}
@@ -272,6 +332,9 @@ public int getSerializedSize() {
if (!getClusterIdBytes().isEmpty()) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, clusterId_);
}
+ if (!getNameBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, name_);
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -294,6 +357,8 @@ public boolean equals(final java.lang.Object obj) {
.equals(other.getZone());
result = result && getClusterId()
.equals(other.getClusterId());
+ result = result && getName()
+ .equals(other.getName());
result = result && unknownFields.equals(other.unknownFields);
return result;
}
@@ -311,6 +376,8 @@ public int hashCode() {
hash = (53 * hash) + getZone().hashCode();
hash = (37 * hash) + CLUSTER_ID_FIELD_NUMBER;
hash = (53 * hash) + getClusterId().hashCode();
+ hash = (37 * hash) + NAME_FIELD_NUMBER;
+ hash = (53 * hash) + getName().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -454,6 +521,8 @@ public Builder clear() {
clusterId_ = "";
+ name_ = "";
+
return this;
}
@@ -483,6 +552,7 @@ public com.google.container.v1.GetClusterRequest buildPartial() {
result.projectId_ = projectId_;
result.zone_ = zone_;
result.clusterId_ = clusterId_;
+ result.name_ = name_;
onBuilt();
return result;
}
@@ -543,6 +613,10 @@ public Builder mergeFrom(com.google.container.v1.GetClusterRequest other) {
clusterId_ = other.clusterId_;
onChanged();
}
+ if (!other.getName().isEmpty()) {
+ name_ = other.name_;
+ onChanged();
+ }
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -575,13 +649,14 @@ public Builder mergeFrom(
private java.lang.Object projectId_ = "";
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -595,13 +670,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof String) {
@@ -616,13 +692,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectId(
+ @java.lang.Deprecated public Builder setProjectId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -634,13 +711,14 @@ public Builder setProjectId(
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder clearProjectId() {
+ @java.lang.Deprecated public Builder clearProjectId() {
projectId_ = getDefaultInstance().getProjectId();
onChanged();
@@ -648,13 +726,14 @@ public Builder clearProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectIdBytes(
+ @java.lang.Deprecated public Builder setProjectIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -669,14 +748,15 @@ public Builder setProjectIdBytes(
private java.lang.Object zone_ = "";
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -690,14 +770,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof String) {
@@ -712,14 +793,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZone(
+ @java.lang.Deprecated public Builder setZone(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -731,14 +813,15 @@ public Builder setZone(
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder clearZone() {
+ @java.lang.Deprecated public Builder clearZone() {
zone_ = getDefaultInstance().getZone();
onChanged();
@@ -746,14 +829,15 @@ public Builder clearZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZoneBytes(
+ @java.lang.Deprecated public Builder setZoneBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -768,12 +852,13 @@ public Builder setZoneBytes(
private java.lang.Object clusterId_ = "";
/**
*
- * The name of the cluster to retrieve.
+ * Deprecated. The name of the cluster to retrieve.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public java.lang.String getClusterId() {
+ @java.lang.Deprecated public java.lang.String getClusterId() {
java.lang.Object ref = clusterId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -787,12 +872,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster to retrieve.
+ * Deprecated. The name of the cluster to retrieve.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIdBytes() {
java.lang.Object ref = clusterId_;
if (ref instanceof String) {
@@ -807,12 +893,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster to retrieve.
+ * Deprecated. The name of the cluster to retrieve.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder setClusterId(
+ @java.lang.Deprecated public Builder setClusterId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -824,12 +911,13 @@ public Builder setClusterId(
}
/**
*
- * The name of the cluster to retrieve.
+ * Deprecated. The name of the cluster to retrieve.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder clearClusterId() {
+ @java.lang.Deprecated public Builder clearClusterId() {
clusterId_ = getDefaultInstance().getClusterId();
onChanged();
@@ -837,12 +925,13 @@ public Builder clearClusterId() {
}
/**
*
- * The name of the cluster to retrieve.
+ * Deprecated. The name of the cluster to retrieve.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder setClusterIdBytes(
+ @java.lang.Deprecated public Builder setClusterIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -853,6 +942,100 @@ public Builder setClusterIdBytes(
onChanged();
return this;
}
+
+ private java.lang.Object name_ = "";
+ /**
+ * + * The name (project, location, cluster) of the cluster to retrieve. + * Specified in the format 'projects/*/locations/*/clusters/*'. + *+ * + *
string name = 5;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ * + * The name (project, location, cluster) of the cluster to retrieve. + * Specified in the format 'projects/*/locations/*/clusters/*'. + *+ * + *
string name = 5;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ * + * The name (project, location, cluster) of the cluster to retrieve. + * Specified in the format 'projects/*/locations/*/clusters/*'. + *+ * + *
string name = 5;
+ */
+ public Builder setName(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * + * The name (project, location, cluster) of the cluster to retrieve. + * Specified in the format 'projects/*/locations/*/clusters/*'. + *+ * + *
string name = 5;
+ */
+ public Builder clearName() {
+
+ name_ = getDefaultInstance().getName();
+ onChanged();
+ return this;
+ }
+ /**
+ * + * The name (project, location, cluster) of the cluster to retrieve. + * Specified in the format 'projects/*/locations/*/clusters/*'. + *+ * + *
string name = 5;
+ */
+ public Builder setNameBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetClusterRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetClusterRequestOrBuilder.java
index a9eec38ce479..78bc10a9a83b 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetClusterRequestOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetClusterRequestOrBuilder.java
@@ -9,61 +9,87 @@ public interface GetClusterRequestOrBuilder extends
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- java.lang.String getProjectId();
+ @java.lang.Deprecated java.lang.String getProjectId();
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getProjectIdBytes();
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- java.lang.String getZone();
+ @java.lang.Deprecated java.lang.String getZone();
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getZoneBytes();
/**
*
- * The name of the cluster to retrieve.
+ * Deprecated. The name of the cluster to retrieve.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- java.lang.String getClusterId();
+ @java.lang.Deprecated java.lang.String getClusterId();
/**
*
- * The name of the cluster to retrieve.
+ * Deprecated. The name of the cluster to retrieve.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getClusterIdBytes();
+
+ /**
+ * + * The name (project, location, cluster) of the cluster to retrieve. + * Specified in the format 'projects/*/locations/*/clusters/*'. + *+ * + *
string name = 5;
+ */
+ java.lang.String getName();
+ /**
+ * + * The name (project, location, cluster) of the cluster to retrieve. + * Specified in the format 'projects/*/locations/*/clusters/*'. + *+ * + *
string name = 5;
+ */
+ com.google.protobuf.ByteString
+ getNameBytes();
}
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetNodePoolRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetNodePoolRequest.java
index a8f4bdd1df96..25c545a60a83 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetNodePoolRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetNodePoolRequest.java
@@ -24,6 +24,7 @@ private GetNodePoolRequest() {
zone_ = "";
clusterId_ = "";
nodePoolId_ = "";
+ name_ = "";
}
@java.lang.Override
@@ -74,6 +75,12 @@ private GetNodePoolRequest(
nodePoolId_ = s;
break;
}
+ case 50: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ name_ = s;
+ break;
+ }
default: {
if (!parseUnknownFieldProto3(
input, unknownFields, extensionRegistry, tag)) {
@@ -110,13 +117,14 @@ private GetNodePoolRequest(
private volatile java.lang.Object projectId_;
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -130,13 +138,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
@@ -154,14 +163,15 @@ public java.lang.String getProjectId() {
private volatile java.lang.Object zone_;
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -175,14 +185,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
@@ -200,12 +211,13 @@ public java.lang.String getZone() {
private volatile java.lang.Object clusterId_;
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public java.lang.String getClusterId() {
+ @java.lang.Deprecated public java.lang.String getClusterId() {
java.lang.Object ref = clusterId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -219,12 +231,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIdBytes() {
java.lang.Object ref = clusterId_;
if (ref instanceof java.lang.String) {
@@ -242,12 +255,13 @@ public java.lang.String getClusterId() {
private volatile java.lang.Object nodePoolId_;
/**
*
- * The name of the node pool.
+ * Deprecated. The name of the node pool.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string node_pool_id = 4;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public java.lang.String getNodePoolId() {
+ @java.lang.Deprecated public java.lang.String getNodePoolId() {
java.lang.Object ref = nodePoolId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -261,12 +275,13 @@ public java.lang.String getNodePoolId() {
}
/**
*
- * The name of the node pool.
+ * Deprecated. The name of the node pool.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string node_pool_id = 4;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getNodePoolIdBytes() {
java.lang.Object ref = nodePoolId_;
if (ref instanceof java.lang.String) {
@@ -280,6 +295,52 @@ public java.lang.String getNodePoolId() {
}
}
+ public static final int NAME_FIELD_NUMBER = 6;
+ private volatile java.lang.Object name_;
+ /**
+ * + * 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;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ }
+ }
+ /**
+ * + * 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;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -306,6 +367,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
if (!getNodePoolIdBytes().isEmpty()) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 4, nodePoolId_);
}
+ if (!getNameBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 6, name_);
+ }
unknownFields.writeTo(output);
}
@@ -327,6 +391,9 @@ public int getSerializedSize() {
if (!getNodePoolIdBytes().isEmpty()) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, nodePoolId_);
}
+ if (!getNameBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, name_);
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -351,6 +418,8 @@ public boolean equals(final java.lang.Object obj) {
.equals(other.getClusterId());
result = result && getNodePoolId()
.equals(other.getNodePoolId());
+ result = result && getName()
+ .equals(other.getName());
result = result && unknownFields.equals(other.unknownFields);
return result;
}
@@ -370,6 +439,8 @@ public int hashCode() {
hash = (53 * hash) + getClusterId().hashCode();
hash = (37 * hash) + NODE_POOL_ID_FIELD_NUMBER;
hash = (53 * hash) + getNodePoolId().hashCode();
+ hash = (37 * hash) + NAME_FIELD_NUMBER;
+ hash = (53 * hash) + getName().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -515,6 +586,8 @@ public Builder clear() {
nodePoolId_ = "";
+ name_ = "";
+
return this;
}
@@ -545,6 +618,7 @@ public com.google.container.v1.GetNodePoolRequest buildPartial() {
result.zone_ = zone_;
result.clusterId_ = clusterId_;
result.nodePoolId_ = nodePoolId_;
+ result.name_ = name_;
onBuilt();
return result;
}
@@ -609,6 +683,10 @@ public Builder mergeFrom(com.google.container.v1.GetNodePoolRequest other) {
nodePoolId_ = other.nodePoolId_;
onChanged();
}
+ if (!other.getName().isEmpty()) {
+ name_ = other.name_;
+ onChanged();
+ }
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -641,13 +719,14 @@ public Builder mergeFrom(
private java.lang.Object projectId_ = "";
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -661,13 +740,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof String) {
@@ -682,13 +762,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectId(
+ @java.lang.Deprecated public Builder setProjectId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -700,13 +781,14 @@ public Builder setProjectId(
}
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder clearProjectId() {
+ @java.lang.Deprecated public Builder clearProjectId() {
projectId_ = getDefaultInstance().getProjectId();
onChanged();
@@ -714,13 +796,14 @@ public Builder clearProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectIdBytes(
+ @java.lang.Deprecated public Builder setProjectIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -735,14 +818,15 @@ public Builder setProjectIdBytes(
private java.lang.Object zone_ = "";
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -756,14 +840,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof String) {
@@ -778,14 +863,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZone(
+ @java.lang.Deprecated public Builder setZone(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -797,14 +883,15 @@ public Builder setZone(
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder clearZone() {
+ @java.lang.Deprecated public Builder clearZone() {
zone_ = getDefaultInstance().getZone();
onChanged();
@@ -812,14 +899,15 @@ public Builder clearZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZoneBytes(
+ @java.lang.Deprecated public Builder setZoneBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -834,12 +922,13 @@ public Builder setZoneBytes(
private java.lang.Object clusterId_ = "";
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public java.lang.String getClusterId() {
+ @java.lang.Deprecated public java.lang.String getClusterId() {
java.lang.Object ref = clusterId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -853,12 +942,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIdBytes() {
java.lang.Object ref = clusterId_;
if (ref instanceof String) {
@@ -873,12 +963,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder setClusterId(
+ @java.lang.Deprecated public Builder setClusterId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -890,12 +981,13 @@ public Builder setClusterId(
}
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder clearClusterId() {
+ @java.lang.Deprecated public Builder clearClusterId() {
clusterId_ = getDefaultInstance().getClusterId();
onChanged();
@@ -903,12 +995,13 @@ public Builder clearClusterId() {
}
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder setClusterIdBytes(
+ @java.lang.Deprecated public Builder setClusterIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -923,12 +1016,13 @@ public Builder setClusterIdBytes(
private java.lang.Object nodePoolId_ = "";
/**
*
- * The name of the node pool.
+ * Deprecated. The name of the node pool.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string node_pool_id = 4;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public java.lang.String getNodePoolId() {
+ @java.lang.Deprecated public java.lang.String getNodePoolId() {
java.lang.Object ref = nodePoolId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -942,12 +1036,13 @@ public java.lang.String getNodePoolId() {
}
/**
*
- * The name of the node pool.
+ * Deprecated. The name of the node pool.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string node_pool_id = 4;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getNodePoolIdBytes() {
java.lang.Object ref = nodePoolId_;
if (ref instanceof String) {
@@ -962,12 +1057,13 @@ public java.lang.String getNodePoolId() {
}
/**
*
- * The name of the node pool.
+ * Deprecated. The name of the node pool.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string node_pool_id = 4;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public Builder setNodePoolId(
+ @java.lang.Deprecated public Builder setNodePoolId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -979,12 +1075,13 @@ public Builder setNodePoolId(
}
/**
*
- * The name of the node pool.
+ * Deprecated. The name of the node pool.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string node_pool_id = 4;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public Builder clearNodePoolId() {
+ @java.lang.Deprecated public Builder clearNodePoolId() {
nodePoolId_ = getDefaultInstance().getNodePoolId();
onChanged();
@@ -992,12 +1089,13 @@ public Builder clearNodePoolId() {
}
/**
*
- * The name of the node pool.
+ * Deprecated. The name of the node pool.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string node_pool_id = 4;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public Builder setNodePoolIdBytes(
+ @java.lang.Deprecated public Builder setNodePoolIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -1008,6 +1106,105 @@ public Builder setNodePoolIdBytes(
onChanged();
return this;
}
+
+ private java.lang.Object name_ = "";
+ /**
+ * + * 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;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ * + * 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;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ * + * 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;
+ */
+ public Builder setName(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * + * 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;
+ */
+ public Builder clearName() {
+
+ name_ = getDefaultInstance().getName();
+ onChanged();
+ return this;
+ }
+ /**
+ * + * 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;
+ */
+ public Builder setNameBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetNodePoolRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetNodePoolRequestOrBuilder.java
index f730b6eefb89..808858e2c3b9 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetNodePoolRequestOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetNodePoolRequestOrBuilder.java
@@ -9,79 +9,109 @@ public interface GetNodePoolRequestOrBuilder extends
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- java.lang.String getProjectId();
+ @java.lang.Deprecated java.lang.String getProjectId();
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getProjectIdBytes();
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- java.lang.String getZone();
+ @java.lang.Deprecated java.lang.String getZone();
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getZoneBytes();
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- java.lang.String getClusterId();
+ @java.lang.Deprecated java.lang.String getClusterId();
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getClusterIdBytes();
/**
*
- * The name of the node pool.
+ * Deprecated. The name of the node pool.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string node_pool_id = 4;
+ * string node_pool_id = 4 [deprecated = true];
*/
- java.lang.String getNodePoolId();
+ @java.lang.Deprecated java.lang.String getNodePoolId();
/**
*
- * The name of the node pool.
+ * Deprecated. The name of the node pool.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string node_pool_id = 4;
+ * string node_pool_id = 4 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getNodePoolIdBytes();
+
+ /**
+ * + * 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;
+ */
+ java.lang.String getName();
+ /**
+ * + * 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;
+ */
+ com.google.protobuf.ByteString
+ getNameBytes();
}
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetOperationRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetOperationRequest.java
index 47a0aa14c117..39ca84a29685 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetOperationRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetOperationRequest.java
@@ -23,6 +23,7 @@ private GetOperationRequest() {
projectId_ = "";
zone_ = "";
operationId_ = "";
+ name_ = "";
}
@java.lang.Override
@@ -67,6 +68,12 @@ private GetOperationRequest(
operationId_ = s;
break;
}
+ case 42: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ name_ = s;
+ break;
+ }
default: {
if (!parseUnknownFieldProto3(
input, unknownFields, extensionRegistry, tag)) {
@@ -103,13 +110,14 @@ private GetOperationRequest(
private volatile java.lang.Object projectId_;
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -123,13 +131,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
@@ -147,14 +156,15 @@ public java.lang.String getProjectId() {
private volatile java.lang.Object zone_;
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -168,14 +178,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
@@ -193,12 +204,13 @@ public java.lang.String getZone() {
private volatile java.lang.Object operationId_;
/**
*
- * The server-assigned `name` of the operation.
+ * Deprecated. The server-assigned `name` of the operation.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string operation_id = 3;
+ * string operation_id = 3 [deprecated = true];
*/
- public java.lang.String getOperationId() {
+ @java.lang.Deprecated public java.lang.String getOperationId() {
java.lang.Object ref = operationId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -212,12 +224,13 @@ public java.lang.String getOperationId() {
}
/**
*
- * The server-assigned `name` of the operation.
+ * Deprecated. The server-assigned `name` of the operation.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string operation_id = 3;
+ * string operation_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getOperationIdBytes() {
java.lang.Object ref = operationId_;
if (ref instanceof java.lang.String) {
@@ -231,6 +244,50 @@ public java.lang.String getOperationId() {
}
}
+ public static final int NAME_FIELD_NUMBER = 5;
+ private volatile java.lang.Object name_;
+ /**
+ * + * The name (project, location, operation id) of the operation to get. + * Specified in the format 'projects/*/locations/*/operations/*'. + *+ * + *
string name = 5;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ }
+ }
+ /**
+ * + * The name (project, location, operation id) of the operation to get. + * Specified in the format 'projects/*/locations/*/operations/*'. + *+ * + *
string name = 5;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -254,6 +311,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
if (!getOperationIdBytes().isEmpty()) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 3, operationId_);
}
+ if (!getNameBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 5, name_);
+ }
unknownFields.writeTo(output);
}
@@ -272,6 +332,9 @@ public int getSerializedSize() {
if (!getOperationIdBytes().isEmpty()) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, operationId_);
}
+ if (!getNameBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, name_);
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -294,6 +357,8 @@ public boolean equals(final java.lang.Object obj) {
.equals(other.getZone());
result = result && getOperationId()
.equals(other.getOperationId());
+ result = result && getName()
+ .equals(other.getName());
result = result && unknownFields.equals(other.unknownFields);
return result;
}
@@ -311,6 +376,8 @@ public int hashCode() {
hash = (53 * hash) + getZone().hashCode();
hash = (37 * hash) + OPERATION_ID_FIELD_NUMBER;
hash = (53 * hash) + getOperationId().hashCode();
+ hash = (37 * hash) + NAME_FIELD_NUMBER;
+ hash = (53 * hash) + getName().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -454,6 +521,8 @@ public Builder clear() {
operationId_ = "";
+ name_ = "";
+
return this;
}
@@ -483,6 +552,7 @@ public com.google.container.v1.GetOperationRequest buildPartial() {
result.projectId_ = projectId_;
result.zone_ = zone_;
result.operationId_ = operationId_;
+ result.name_ = name_;
onBuilt();
return result;
}
@@ -543,6 +613,10 @@ public Builder mergeFrom(com.google.container.v1.GetOperationRequest other) {
operationId_ = other.operationId_;
onChanged();
}
+ if (!other.getName().isEmpty()) {
+ name_ = other.name_;
+ onChanged();
+ }
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -575,13 +649,14 @@ public Builder mergeFrom(
private java.lang.Object projectId_ = "";
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -595,13 +670,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof String) {
@@ -616,13 +692,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectId(
+ @java.lang.Deprecated public Builder setProjectId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -634,13 +711,14 @@ public Builder setProjectId(
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder clearProjectId() {
+ @java.lang.Deprecated public Builder clearProjectId() {
projectId_ = getDefaultInstance().getProjectId();
onChanged();
@@ -648,13 +726,14 @@ public Builder clearProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectIdBytes(
+ @java.lang.Deprecated public Builder setProjectIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -669,14 +748,15 @@ public Builder setProjectIdBytes(
private java.lang.Object zone_ = "";
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -690,14 +770,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof String) {
@@ -712,14 +793,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZone(
+ @java.lang.Deprecated public Builder setZone(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -731,14 +813,15 @@ public Builder setZone(
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder clearZone() {
+ @java.lang.Deprecated public Builder clearZone() {
zone_ = getDefaultInstance().getZone();
onChanged();
@@ -746,14 +829,15 @@ public Builder clearZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZoneBytes(
+ @java.lang.Deprecated public Builder setZoneBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -768,12 +852,13 @@ public Builder setZoneBytes(
private java.lang.Object operationId_ = "";
/**
*
- * The server-assigned `name` of the operation.
+ * Deprecated. The server-assigned `name` of the operation.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string operation_id = 3;
+ * string operation_id = 3 [deprecated = true];
*/
- public java.lang.String getOperationId() {
+ @java.lang.Deprecated public java.lang.String getOperationId() {
java.lang.Object ref = operationId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -787,12 +872,13 @@ public java.lang.String getOperationId() {
}
/**
*
- * The server-assigned `name` of the operation.
+ * Deprecated. The server-assigned `name` of the operation.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string operation_id = 3;
+ * string operation_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getOperationIdBytes() {
java.lang.Object ref = operationId_;
if (ref instanceof String) {
@@ -807,12 +893,13 @@ public java.lang.String getOperationId() {
}
/**
*
- * The server-assigned `name` of the operation.
+ * Deprecated. The server-assigned `name` of the operation.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string operation_id = 3;
+ * string operation_id = 3 [deprecated = true];
*/
- public Builder setOperationId(
+ @java.lang.Deprecated public Builder setOperationId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -824,12 +911,13 @@ public Builder setOperationId(
}
/**
*
- * The server-assigned `name` of the operation.
+ * Deprecated. The server-assigned `name` of the operation.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string operation_id = 3;
+ * string operation_id = 3 [deprecated = true];
*/
- public Builder clearOperationId() {
+ @java.lang.Deprecated public Builder clearOperationId() {
operationId_ = getDefaultInstance().getOperationId();
onChanged();
@@ -837,12 +925,13 @@ public Builder clearOperationId() {
}
/**
*
- * The server-assigned `name` of the operation.
+ * Deprecated. The server-assigned `name` of the operation.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string operation_id = 3;
+ * string operation_id = 3 [deprecated = true];
*/
- public Builder setOperationIdBytes(
+ @java.lang.Deprecated public Builder setOperationIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -853,6 +942,100 @@ public Builder setOperationIdBytes(
onChanged();
return this;
}
+
+ private java.lang.Object name_ = "";
+ /**
+ * + * The name (project, location, operation id) of the operation to get. + * Specified in the format 'projects/*/locations/*/operations/*'. + *+ * + *
string name = 5;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ * + * The name (project, location, operation id) of the operation to get. + * Specified in the format 'projects/*/locations/*/operations/*'. + *+ * + *
string name = 5;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ * + * The name (project, location, operation id) of the operation to get. + * Specified in the format 'projects/*/locations/*/operations/*'. + *+ * + *
string name = 5;
+ */
+ public Builder setName(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * + * The name (project, location, operation id) of the operation to get. + * Specified in the format 'projects/*/locations/*/operations/*'. + *+ * + *
string name = 5;
+ */
+ public Builder clearName() {
+
+ name_ = getDefaultInstance().getName();
+ onChanged();
+ return this;
+ }
+ /**
+ * + * The name (project, location, operation id) of the operation to get. + * Specified in the format 'projects/*/locations/*/operations/*'. + *+ * + *
string name = 5;
+ */
+ public Builder setNameBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetOperationRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetOperationRequestOrBuilder.java
index e7acbb2ad6cc..130a36744588 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetOperationRequestOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetOperationRequestOrBuilder.java
@@ -9,61 +9,87 @@ public interface GetOperationRequestOrBuilder extends
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- java.lang.String getProjectId();
+ @java.lang.Deprecated java.lang.String getProjectId();
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getProjectIdBytes();
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- java.lang.String getZone();
+ @java.lang.Deprecated java.lang.String getZone();
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getZoneBytes();
/**
*
- * The server-assigned `name` of the operation.
+ * Deprecated. The server-assigned `name` of the operation.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string operation_id = 3;
+ * string operation_id = 3 [deprecated = true];
*/
- java.lang.String getOperationId();
+ @java.lang.Deprecated java.lang.String getOperationId();
/**
*
- * The server-assigned `name` of the operation.
+ * Deprecated. The server-assigned `name` of the operation.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string operation_id = 3;
+ * string operation_id = 3 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getOperationIdBytes();
+
+ /**
+ * + * The name (project, location, operation id) of the operation to get. + * Specified in the format 'projects/*/locations/*/operations/*'. + *+ * + *
string name = 5;
+ */
+ java.lang.String getName();
+ /**
+ * + * The name (project, location, operation id) of the operation to get. + * Specified in the format 'projects/*/locations/*/operations/*'. + *+ * + *
string name = 5;
+ */
+ com.google.protobuf.ByteString
+ getNameBytes();
}
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetServerConfigRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetServerConfigRequest.java
index 7f6f50880700..dd33c1f8882c 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetServerConfigRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetServerConfigRequest.java
@@ -5,7 +5,7 @@
/**
* - * Gets the current Container Engine service configuration. + * Gets the current Kubernetes Engine service configuration. ** * Protobuf type {@code google.container.v1.GetServerConfigRequest} @@ -22,6 +22,7 @@ private GetServerConfigRequest(com.google.protobuf.GeneratedMessageV3.Builder private GetServerConfigRequest() { projectId_ = ""; zone_ = ""; + name_ = ""; } @java.lang.Override @@ -60,6 +61,12 @@ private GetServerConfigRequest( zone_ = s; break; } + case 34: { + java.lang.String s = input.readStringRequireUtf8(); + + name_ = s; + break; + } default: { if (!parseUnknownFieldProto3( input, unknownFields, extensionRegistry, tag)) { @@ -96,13 +103,14 @@ private GetServerConfigRequest( private volatile java.lang.Object projectId_; /** *
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -116,13 +124,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
@@ -140,13 +149,14 @@ public java.lang.String getProjectId() {
private volatile java.lang.Object zone_;
/**
*
- * The name of the Google Compute Engine [zone](/compute/docs/zones#available)
- * to return operations for.
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -160,13 +170,14 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine [zone](/compute/docs/zones#available)
- * to return operations for.
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
@@ -180,6 +191,50 @@ public java.lang.String getZone() {
}
}
+ public static final int NAME_FIELD_NUMBER = 4;
+ private volatile java.lang.Object name_;
+ /**
+ * + * The name (project and location) of the server config to get + * Specified in the format 'projects/*/locations/*'. + *+ * + *
string name = 4;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ }
+ }
+ /**
+ * + * The name (project and location) of the server config to get + * Specified in the format 'projects/*/locations/*'. + *+ * + *
string name = 4;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -200,6 +255,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
if (!getZoneBytes().isEmpty()) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 2, zone_);
}
+ if (!getNameBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 4, name_);
+ }
unknownFields.writeTo(output);
}
@@ -215,6 +273,9 @@ public int getSerializedSize() {
if (!getZoneBytes().isEmpty()) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, zone_);
}
+ if (!getNameBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, name_);
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -235,6 +296,8 @@ public boolean equals(final java.lang.Object obj) {
.equals(other.getProjectId());
result = result && getZone()
.equals(other.getZone());
+ result = result && getName()
+ .equals(other.getName());
result = result && unknownFields.equals(other.unknownFields);
return result;
}
@@ -250,6 +313,8 @@ public int hashCode() {
hash = (53 * hash) + getProjectId().hashCode();
hash = (37 * hash) + ZONE_FIELD_NUMBER;
hash = (53 * hash) + getZone().hashCode();
+ hash = (37 * hash) + NAME_FIELD_NUMBER;
+ hash = (53 * hash) + getName().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -347,7 +412,7 @@ protected Builder newBuilderForType(
}
/**
*
- * Gets the current Container Engine service configuration.
+ * Gets the current Kubernetes Engine service configuration.
*
*
* Protobuf type {@code google.container.v1.GetServerConfigRequest}
@@ -391,6 +456,8 @@ public Builder clear() {
zone_ = "";
+ name_ = "";
+
return this;
}
@@ -419,6 +486,7 @@ public com.google.container.v1.GetServerConfigRequest buildPartial() {
com.google.container.v1.GetServerConfigRequest result = new com.google.container.v1.GetServerConfigRequest(this);
result.projectId_ = projectId_;
result.zone_ = zone_;
+ result.name_ = name_;
onBuilt();
return result;
}
@@ -475,6 +543,10 @@ public Builder mergeFrom(com.google.container.v1.GetServerConfigRequest other) {
zone_ = other.zone_;
onChanged();
}
+ if (!other.getName().isEmpty()) {
+ name_ = other.name_;
+ onChanged();
+ }
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -507,13 +579,14 @@ public Builder mergeFrom(
private java.lang.Object projectId_ = "";
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -527,13 +600,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof String) {
@@ -548,13 +622,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectId(
+ @java.lang.Deprecated public Builder setProjectId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -566,13 +641,14 @@ public Builder setProjectId(
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder clearProjectId() {
+ @java.lang.Deprecated public Builder clearProjectId() {
projectId_ = getDefaultInstance().getProjectId();
onChanged();
@@ -580,13 +656,14 @@ public Builder clearProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectIdBytes(
+ @java.lang.Deprecated public Builder setProjectIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -601,13 +678,14 @@ public Builder setProjectIdBytes(
private java.lang.Object zone_ = "";
/**
*
- * The name of the Google Compute Engine [zone](/compute/docs/zones#available)
- * to return operations for.
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -621,13 +699,14 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine [zone](/compute/docs/zones#available)
- * to return operations for.
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof String) {
@@ -642,13 +721,14 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine [zone](/compute/docs/zones#available)
- * to return operations for.
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZone(
+ @java.lang.Deprecated public Builder setZone(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -660,13 +740,14 @@ public Builder setZone(
}
/**
*
- * The name of the Google Compute Engine [zone](/compute/docs/zones#available)
- * to return operations for.
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder clearZone() {
+ @java.lang.Deprecated public Builder clearZone() {
zone_ = getDefaultInstance().getZone();
onChanged();
@@ -674,13 +755,14 @@ public Builder clearZone() {
}
/**
*
- * The name of the Google Compute Engine [zone](/compute/docs/zones#available)
- * to return operations for.
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZoneBytes(
+ @java.lang.Deprecated public Builder setZoneBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -691,6 +773,100 @@ public Builder setZoneBytes(
onChanged();
return this;
}
+
+ private java.lang.Object name_ = "";
+ /**
+ * + * The name (project and location) of the server config to get + * Specified in the format 'projects/*/locations/*'. + *+ * + *
string name = 4;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ * + * The name (project and location) of the server config to get + * Specified in the format 'projects/*/locations/*'. + *+ * + *
string name = 4;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ * + * The name (project and location) of the server config to get + * Specified in the format 'projects/*/locations/*'. + *+ * + *
string name = 4;
+ */
+ public Builder setName(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * + * The name (project and location) of the server config to get + * Specified in the format 'projects/*/locations/*'. + *+ * + *
string name = 4;
+ */
+ public Builder clearName() {
+
+ name_ = getDefaultInstance().getName();
+ onChanged();
+ return this;
+ }
+ /**
+ * + * The name (project and location) of the server config to get + * Specified in the format 'projects/*/locations/*'. + *+ * + *
string name = 4;
+ */
+ public Builder setNameBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetServerConfigRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetServerConfigRequestOrBuilder.java
index 86071c569475..81686f271891 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetServerConfigRequestOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetServerConfigRequestOrBuilder.java
@@ -9,41 +9,65 @@ public interface GetServerConfigRequestOrBuilder extends
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- java.lang.String getProjectId();
+ @java.lang.Deprecated java.lang.String getProjectId();
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getProjectIdBytes();
/**
*
- * The name of the Google Compute Engine [zone](/compute/docs/zones#available)
- * to return operations for.
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- java.lang.String getZone();
+ @java.lang.Deprecated java.lang.String getZone();
/**
*
- * The name of the Google Compute Engine [zone](/compute/docs/zones#available)
- * to return operations for.
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getZoneBytes();
+
+ /**
+ * + * The name (project and location) of the server config to get + * Specified in the format 'projects/*/locations/*'. + *+ * + *
string name = 4;
+ */
+ java.lang.String getName();
+ /**
+ * + * The name (project and location) of the server config to get + * Specified in the format 'projects/*/locations/*'. + *+ * + *
string name = 4;
+ */
+ com.google.protobuf.ByteString
+ getNameBytes();
}
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/IPAllocationPolicy.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/IPAllocationPolicy.java
index 8f630a000903..e853fff4d4cb 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/IPAllocationPolicy.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/IPAllocationPolicy.java
@@ -233,9 +233,9 @@ public java.lang.String getSubnetworkName() {
* This field is deprecated, use cluster_ipv4_cidr_block.
*
*
- * string cluster_ipv4_cidr = 4;
+ * string cluster_ipv4_cidr = 4 [deprecated = true];
*/
- public java.lang.String getClusterIpv4Cidr() {
+ @java.lang.Deprecated public java.lang.String getClusterIpv4Cidr() {
java.lang.Object ref = clusterIpv4Cidr_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -252,9 +252,9 @@ public java.lang.String getClusterIpv4Cidr() {
* This field is deprecated, use cluster_ipv4_cidr_block.
*
*
- * string cluster_ipv4_cidr = 4;
+ * string cluster_ipv4_cidr = 4 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIpv4CidrBytes() {
java.lang.Object ref = clusterIpv4Cidr_;
if (ref instanceof java.lang.String) {
@@ -275,9 +275,9 @@ public java.lang.String getClusterIpv4Cidr() {
* This field is deprecated, use node_ipv4_cidr_block.
*
*
- * string node_ipv4_cidr = 5;
+ * string node_ipv4_cidr = 5 [deprecated = true];
*/
- public java.lang.String getNodeIpv4Cidr() {
+ @java.lang.Deprecated public java.lang.String getNodeIpv4Cidr() {
java.lang.Object ref = nodeIpv4Cidr_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -294,9 +294,9 @@ public java.lang.String getNodeIpv4Cidr() {
* This field is deprecated, use node_ipv4_cidr_block.
*
*
- * string node_ipv4_cidr = 5;
+ * string node_ipv4_cidr = 5 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getNodeIpv4CidrBytes() {
java.lang.Object ref = nodeIpv4Cidr_;
if (ref instanceof java.lang.String) {
@@ -317,9 +317,9 @@ public java.lang.String getNodeIpv4Cidr() {
* This field is deprecated, use services_ipv4_cidr_block.
*
*
- * string services_ipv4_cidr = 6;
+ * string services_ipv4_cidr = 6 [deprecated = true];
*/
- public java.lang.String getServicesIpv4Cidr() {
+ @java.lang.Deprecated public java.lang.String getServicesIpv4Cidr() {
java.lang.Object ref = servicesIpv4Cidr_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -336,9 +336,9 @@ public java.lang.String getServicesIpv4Cidr() {
* This field is deprecated, use services_ipv4_cidr_block.
*
*
- * string services_ipv4_cidr = 6;
+ * string services_ipv4_cidr = 6 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getServicesIpv4CidrBytes() {
java.lang.Object ref = servicesIpv4Cidr_;
if (ref instanceof java.lang.String) {
@@ -1303,9 +1303,9 @@ public Builder setSubnetworkNameBytes(
* This field is deprecated, use cluster_ipv4_cidr_block.
*
*
- * string cluster_ipv4_cidr = 4;
+ * string cluster_ipv4_cidr = 4 [deprecated = true];
*/
- public java.lang.String getClusterIpv4Cidr() {
+ @java.lang.Deprecated public java.lang.String getClusterIpv4Cidr() {
java.lang.Object ref = clusterIpv4Cidr_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -1322,9 +1322,9 @@ public java.lang.String getClusterIpv4Cidr() {
* This field is deprecated, use cluster_ipv4_cidr_block.
*
*
- * string cluster_ipv4_cidr = 4;
+ * string cluster_ipv4_cidr = 4 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIpv4CidrBytes() {
java.lang.Object ref = clusterIpv4Cidr_;
if (ref instanceof String) {
@@ -1342,9 +1342,9 @@ public java.lang.String getClusterIpv4Cidr() {
* This field is deprecated, use cluster_ipv4_cidr_block.
*
*
- * string cluster_ipv4_cidr = 4;
+ * string cluster_ipv4_cidr = 4 [deprecated = true];
*/
- public Builder setClusterIpv4Cidr(
+ @java.lang.Deprecated public Builder setClusterIpv4Cidr(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -1359,9 +1359,9 @@ public Builder setClusterIpv4Cidr(
* This field is deprecated, use cluster_ipv4_cidr_block.
*
*
- * string cluster_ipv4_cidr = 4;
+ * string cluster_ipv4_cidr = 4 [deprecated = true];
*/
- public Builder clearClusterIpv4Cidr() {
+ @java.lang.Deprecated public Builder clearClusterIpv4Cidr() {
clusterIpv4Cidr_ = getDefaultInstance().getClusterIpv4Cidr();
onChanged();
@@ -1372,9 +1372,9 @@ public Builder clearClusterIpv4Cidr() {
* This field is deprecated, use cluster_ipv4_cidr_block.
*
*
- * string cluster_ipv4_cidr = 4;
+ * string cluster_ipv4_cidr = 4 [deprecated = true];
*/
- public Builder setClusterIpv4CidrBytes(
+ @java.lang.Deprecated public Builder setClusterIpv4CidrBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -1392,9 +1392,9 @@ public Builder setClusterIpv4CidrBytes(
* This field is deprecated, use node_ipv4_cidr_block.
*
*
- * string node_ipv4_cidr = 5;
+ * string node_ipv4_cidr = 5 [deprecated = true];
*/
- public java.lang.String getNodeIpv4Cidr() {
+ @java.lang.Deprecated public java.lang.String getNodeIpv4Cidr() {
java.lang.Object ref = nodeIpv4Cidr_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -1411,9 +1411,9 @@ public java.lang.String getNodeIpv4Cidr() {
* This field is deprecated, use node_ipv4_cidr_block.
*
*
- * string node_ipv4_cidr = 5;
+ * string node_ipv4_cidr = 5 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getNodeIpv4CidrBytes() {
java.lang.Object ref = nodeIpv4Cidr_;
if (ref instanceof String) {
@@ -1431,9 +1431,9 @@ public java.lang.String getNodeIpv4Cidr() {
* This field is deprecated, use node_ipv4_cidr_block.
*
*
- * string node_ipv4_cidr = 5;
+ * string node_ipv4_cidr = 5 [deprecated = true];
*/
- public Builder setNodeIpv4Cidr(
+ @java.lang.Deprecated public Builder setNodeIpv4Cidr(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -1448,9 +1448,9 @@ public Builder setNodeIpv4Cidr(
* This field is deprecated, use node_ipv4_cidr_block.
*
*
- * string node_ipv4_cidr = 5;
+ * string node_ipv4_cidr = 5 [deprecated = true];
*/
- public Builder clearNodeIpv4Cidr() {
+ @java.lang.Deprecated public Builder clearNodeIpv4Cidr() {
nodeIpv4Cidr_ = getDefaultInstance().getNodeIpv4Cidr();
onChanged();
@@ -1461,9 +1461,9 @@ public Builder clearNodeIpv4Cidr() {
* This field is deprecated, use node_ipv4_cidr_block.
*
*
- * string node_ipv4_cidr = 5;
+ * string node_ipv4_cidr = 5 [deprecated = true];
*/
- public Builder setNodeIpv4CidrBytes(
+ @java.lang.Deprecated public Builder setNodeIpv4CidrBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -1481,9 +1481,9 @@ public Builder setNodeIpv4CidrBytes(
* This field is deprecated, use services_ipv4_cidr_block.
*
*
- * string services_ipv4_cidr = 6;
+ * string services_ipv4_cidr = 6 [deprecated = true];
*/
- public java.lang.String getServicesIpv4Cidr() {
+ @java.lang.Deprecated public java.lang.String getServicesIpv4Cidr() {
java.lang.Object ref = servicesIpv4Cidr_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -1500,9 +1500,9 @@ public java.lang.String getServicesIpv4Cidr() {
* This field is deprecated, use services_ipv4_cidr_block.
*
*
- * string services_ipv4_cidr = 6;
+ * string services_ipv4_cidr = 6 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getServicesIpv4CidrBytes() {
java.lang.Object ref = servicesIpv4Cidr_;
if (ref instanceof String) {
@@ -1520,9 +1520,9 @@ public java.lang.String getServicesIpv4Cidr() {
* This field is deprecated, use services_ipv4_cidr_block.
*
*
- * string services_ipv4_cidr = 6;
+ * string services_ipv4_cidr = 6 [deprecated = true];
*/
- public Builder setServicesIpv4Cidr(
+ @java.lang.Deprecated public Builder setServicesIpv4Cidr(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -1537,9 +1537,9 @@ public Builder setServicesIpv4Cidr(
* This field is deprecated, use services_ipv4_cidr_block.
*
*
- * string services_ipv4_cidr = 6;
+ * string services_ipv4_cidr = 6 [deprecated = true];
*/
- public Builder clearServicesIpv4Cidr() {
+ @java.lang.Deprecated public Builder clearServicesIpv4Cidr() {
servicesIpv4Cidr_ = getDefaultInstance().getServicesIpv4Cidr();
onChanged();
@@ -1550,9 +1550,9 @@ public Builder clearServicesIpv4Cidr() {
* This field is deprecated, use services_ipv4_cidr_block.
*
*
- * string services_ipv4_cidr = 6;
+ * string services_ipv4_cidr = 6 [deprecated = true];
*/
- public Builder setServicesIpv4CidrBytes(
+ @java.lang.Deprecated public Builder setServicesIpv4CidrBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/IPAllocationPolicyOrBuilder.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/IPAllocationPolicyOrBuilder.java
index 0ab8bd051665..79638d008971 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/IPAllocationPolicyOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/IPAllocationPolicyOrBuilder.java
@@ -53,17 +53,17 @@ public interface IPAllocationPolicyOrBuilder extends
* This field is deprecated, use cluster_ipv4_cidr_block.
*
*
- * string cluster_ipv4_cidr = 4;
+ * string cluster_ipv4_cidr = 4 [deprecated = true];
*/
- java.lang.String getClusterIpv4Cidr();
+ @java.lang.Deprecated java.lang.String getClusterIpv4Cidr();
/**
*
* This field is deprecated, use cluster_ipv4_cidr_block.
*
*
- * string cluster_ipv4_cidr = 4;
+ * string cluster_ipv4_cidr = 4 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getClusterIpv4CidrBytes();
/**
@@ -71,17 +71,17 @@ public interface IPAllocationPolicyOrBuilder extends
* This field is deprecated, use node_ipv4_cidr_block.
*
*
- * string node_ipv4_cidr = 5;
+ * string node_ipv4_cidr = 5 [deprecated = true];
*/
- java.lang.String getNodeIpv4Cidr();
+ @java.lang.Deprecated java.lang.String getNodeIpv4Cidr();
/**
*
* This field is deprecated, use node_ipv4_cidr_block.
*
*
- * string node_ipv4_cidr = 5;
+ * string node_ipv4_cidr = 5 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getNodeIpv4CidrBytes();
/**
@@ -89,17 +89,17 @@ public interface IPAllocationPolicyOrBuilder extends
* This field is deprecated, use services_ipv4_cidr_block.
*
*
- * string services_ipv4_cidr = 6;
+ * string services_ipv4_cidr = 6 [deprecated = true];
*/
- java.lang.String getServicesIpv4Cidr();
+ @java.lang.Deprecated java.lang.String getServicesIpv4Cidr();
/**
*
* This field is deprecated, use services_ipv4_cidr_block.
*
*
- * string services_ipv4_cidr = 6;
+ * string services_ipv4_cidr = 6 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getServicesIpv4CidrBytes();
/**
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListClustersRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListClustersRequest.java
index 31b0669c0706..0321fa233702 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListClustersRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListClustersRequest.java
@@ -22,6 +22,7 @@ private ListClustersRequest(com.google.protobuf.GeneratedMessageV3.Builder bu
private ListClustersRequest() {
projectId_ = "";
zone_ = "";
+ parent_ = "";
}
@java.lang.Override
@@ -60,6 +61,12 @@ private ListClustersRequest(
zone_ = s;
break;
}
+ case 34: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ parent_ = s;
+ break;
+ }
default: {
if (!parseUnknownFieldProto3(
input, unknownFields, extensionRegistry, tag)) {
@@ -96,13 +103,14 @@ private ListClustersRequest(
private volatile java.lang.Object projectId_;
/**
*
- * The Google Developers Console [project ID or project
+ * 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 parent field.
*
*
- * string project_id = 1;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -116,13 +124,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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 parent field.
*
*
- * string project_id = 1;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
@@ -140,14 +149,15 @@ public java.lang.String getProjectId() {
private volatile java.lang.Object zone_;
/**
*
- * The name of the Google Compute Engine
+ * Deprecated. 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -161,14 +171,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * Deprecated. 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
@@ -182,6 +193,52 @@ public java.lang.String getZone() {
}
}
+ public static final int PARENT_FIELD_NUMBER = 4;
+ private volatile java.lang.Object parent_;
+ /**
+ * + * 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;
+ */
+ public java.lang.String getParent() {
+ java.lang.Object ref = parent_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ parent_ = s;
+ return s;
+ }
+ }
+ /**
+ * + * 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;
+ */
+ public com.google.protobuf.ByteString
+ getParentBytes() {
+ java.lang.Object ref = parent_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ parent_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -202,6 +259,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
if (!getZoneBytes().isEmpty()) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 2, zone_);
}
+ if (!getParentBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 4, parent_);
+ }
unknownFields.writeTo(output);
}
@@ -217,6 +277,9 @@ public int getSerializedSize() {
if (!getZoneBytes().isEmpty()) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, zone_);
}
+ if (!getParentBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, parent_);
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -237,6 +300,8 @@ public boolean equals(final java.lang.Object obj) {
.equals(other.getProjectId());
result = result && getZone()
.equals(other.getZone());
+ result = result && getParent()
+ .equals(other.getParent());
result = result && unknownFields.equals(other.unknownFields);
return result;
}
@@ -252,6 +317,8 @@ public int hashCode() {
hash = (53 * hash) + getProjectId().hashCode();
hash = (37 * hash) + ZONE_FIELD_NUMBER;
hash = (53 * hash) + getZone().hashCode();
+ hash = (37 * hash) + PARENT_FIELD_NUMBER;
+ hash = (53 * hash) + getParent().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -393,6 +460,8 @@ public Builder clear() {
zone_ = "";
+ parent_ = "";
+
return this;
}
@@ -421,6 +490,7 @@ public com.google.container.v1.ListClustersRequest buildPartial() {
com.google.container.v1.ListClustersRequest result = new com.google.container.v1.ListClustersRequest(this);
result.projectId_ = projectId_;
result.zone_ = zone_;
+ result.parent_ = parent_;
onBuilt();
return result;
}
@@ -477,6 +547,10 @@ public Builder mergeFrom(com.google.container.v1.ListClustersRequest other) {
zone_ = other.zone_;
onChanged();
}
+ if (!other.getParent().isEmpty()) {
+ parent_ = other.parent_;
+ onChanged();
+ }
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -509,13 +583,14 @@ public Builder mergeFrom(
private java.lang.Object projectId_ = "";
/**
*
- * The Google Developers Console [project ID or project
+ * 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 parent field.
*
*
- * string project_id = 1;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -529,13 +604,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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 parent field.
*
*
- * string project_id = 1;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof String) {
@@ -550,13 +626,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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 parent field.
*
*
- * string project_id = 1;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectId(
+ @java.lang.Deprecated public Builder setProjectId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -568,13 +645,14 @@ public Builder setProjectId(
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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 parent field.
*
*
- * string project_id = 1;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder clearProjectId() {
+ @java.lang.Deprecated public Builder clearProjectId() {
projectId_ = getDefaultInstance().getProjectId();
onChanged();
@@ -582,13 +660,14 @@ public Builder clearProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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 parent field.
*
*
- * string project_id = 1;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectIdBytes(
+ @java.lang.Deprecated public Builder setProjectIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -603,14 +682,15 @@ public Builder setProjectIdBytes(
private java.lang.Object zone_ = "";
/**
*
- * The name of the Google Compute Engine
+ * Deprecated. 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -624,14 +704,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * Deprecated. 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof String) {
@@ -646,14 +727,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * Deprecated. 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZone(
+ @java.lang.Deprecated public Builder setZone(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -665,14 +747,15 @@ public Builder setZone(
}
/**
*
- * The name of the Google Compute Engine
+ * Deprecated. 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder clearZone() {
+ @java.lang.Deprecated public Builder clearZone() {
zone_ = getDefaultInstance().getZone();
onChanged();
@@ -680,14 +763,15 @@ public Builder clearZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * Deprecated. 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZoneBytes(
+ @java.lang.Deprecated public Builder setZoneBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -698,6 +782,105 @@ public Builder setZoneBytes(
onChanged();
return this;
}
+
+ private java.lang.Object parent_ = "";
+ /**
+ * + * 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;
+ */
+ public java.lang.String getParent() {
+ java.lang.Object ref = parent_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ parent_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ * + * 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;
+ */
+ public com.google.protobuf.ByteString
+ getParentBytes() {
+ java.lang.Object ref = parent_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ parent_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ * + * 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;
+ */
+ public Builder setParent(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ parent_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * + * 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;
+ */
+ public Builder clearParent() {
+
+ parent_ = getDefaultInstance().getParent();
+ onChanged();
+ return this;
+ }
+ /**
+ * + * 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;
+ */
+ public Builder setParentBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ parent_ = value;
+ onChanged();
+ return this;
+ }
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListClustersRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListClustersRequestOrBuilder.java
index ef9b8fee32f5..b79f22fad6c2 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListClustersRequestOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListClustersRequestOrBuilder.java
@@ -9,43 +9,69 @@ public interface ListClustersRequestOrBuilder extends
/**
*
- * The Google Developers Console [project ID or project
+ * 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 parent field.
*
*
- * string project_id = 1;
+ * string project_id = 1 [deprecated = true];
*/
- java.lang.String getProjectId();
+ @java.lang.Deprecated java.lang.String getProjectId();
/**
*
- * The Google Developers Console [project ID or project
+ * 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 parent field.
*
*
- * string project_id = 1;
+ * string project_id = 1 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getProjectIdBytes();
/**
*
- * The name of the Google Compute Engine
+ * Deprecated. 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;
+ * string zone = 2 [deprecated = true];
*/
- java.lang.String getZone();
+ @java.lang.Deprecated java.lang.String getZone();
/**
*
- * The name of the Google Compute Engine
+ * Deprecated. 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;
+ * string zone = 2 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getZoneBytes();
+
+ /**
+ * + * 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;
+ */
+ java.lang.String getParent();
+ /**
+ * + * 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;
+ */
+ com.google.protobuf.ByteString
+ getParentBytes();
}
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListNodePoolsRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListNodePoolsRequest.java
index c546a9e003e6..477d91149851 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListNodePoolsRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListNodePoolsRequest.java
@@ -23,6 +23,7 @@ private ListNodePoolsRequest() {
projectId_ = "";
zone_ = "";
clusterId_ = "";
+ parent_ = "";
}
@java.lang.Override
@@ -67,6 +68,12 @@ private ListNodePoolsRequest(
clusterId_ = s;
break;
}
+ case 42: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ parent_ = s;
+ break;
+ }
default: {
if (!parseUnknownFieldProto3(
input, unknownFields, extensionRegistry, tag)) {
@@ -103,13 +110,14 @@ private ListNodePoolsRequest(
private volatile java.lang.Object projectId_;
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -123,13 +131,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
@@ -147,14 +156,15 @@ public java.lang.String getProjectId() {
private volatile java.lang.Object zone_;
/**
*
- * The name of the Google Compute Engine
+ * 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 parent field.
*
*
- * string zone = 2;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -168,14 +178,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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 parent field.
*
*
- * string zone = 2;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
@@ -193,12 +204,13 @@ public java.lang.String getZone() {
private volatile java.lang.Object clusterId_;
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the parent field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public java.lang.String getClusterId() {
+ @java.lang.Deprecated public java.lang.String getClusterId() {
java.lang.Object ref = clusterId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -212,12 +224,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the parent field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIdBytes() {
java.lang.Object ref = clusterId_;
if (ref instanceof java.lang.String) {
@@ -231,6 +244,50 @@ public java.lang.String getClusterId() {
}
}
+ public static final int PARENT_FIELD_NUMBER = 5;
+ private volatile java.lang.Object parent_;
+ /**
+ * + * The parent (project, location, cluster id) where the node pools will be + * listed. Specified in the format 'projects/*/locations/*/clusters/*'. + *+ * + *
string parent = 5;
+ */
+ public java.lang.String getParent() {
+ java.lang.Object ref = parent_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ parent_ = s;
+ return s;
+ }
+ }
+ /**
+ * + * The parent (project, location, cluster id) where the node pools will be + * listed. Specified in the format 'projects/*/locations/*/clusters/*'. + *+ * + *
string parent = 5;
+ */
+ public com.google.protobuf.ByteString
+ getParentBytes() {
+ java.lang.Object ref = parent_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ parent_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -254,6 +311,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
if (!getClusterIdBytes().isEmpty()) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 3, clusterId_);
}
+ if (!getParentBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 5, parent_);
+ }
unknownFields.writeTo(output);
}
@@ -272,6 +332,9 @@ public int getSerializedSize() {
if (!getClusterIdBytes().isEmpty()) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, clusterId_);
}
+ if (!getParentBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, parent_);
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -294,6 +357,8 @@ public boolean equals(final java.lang.Object obj) {
.equals(other.getZone());
result = result && getClusterId()
.equals(other.getClusterId());
+ result = result && getParent()
+ .equals(other.getParent());
result = result && unknownFields.equals(other.unknownFields);
return result;
}
@@ -311,6 +376,8 @@ public int hashCode() {
hash = (53 * hash) + getZone().hashCode();
hash = (37 * hash) + CLUSTER_ID_FIELD_NUMBER;
hash = (53 * hash) + getClusterId().hashCode();
+ hash = (37 * hash) + PARENT_FIELD_NUMBER;
+ hash = (53 * hash) + getParent().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -454,6 +521,8 @@ public Builder clear() {
clusterId_ = "";
+ parent_ = "";
+
return this;
}
@@ -483,6 +552,7 @@ public com.google.container.v1.ListNodePoolsRequest buildPartial() {
result.projectId_ = projectId_;
result.zone_ = zone_;
result.clusterId_ = clusterId_;
+ result.parent_ = parent_;
onBuilt();
return result;
}
@@ -543,6 +613,10 @@ public Builder mergeFrom(com.google.container.v1.ListNodePoolsRequest other) {
clusterId_ = other.clusterId_;
onChanged();
}
+ if (!other.getParent().isEmpty()) {
+ parent_ = other.parent_;
+ onChanged();
+ }
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -575,13 +649,14 @@ public Builder mergeFrom(
private java.lang.Object projectId_ = "";
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -595,13 +670,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof String) {
@@ -616,13 +692,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectId(
+ @java.lang.Deprecated public Builder setProjectId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -634,13 +711,14 @@ public Builder setProjectId(
}
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder clearProjectId() {
+ @java.lang.Deprecated public Builder clearProjectId() {
projectId_ = getDefaultInstance().getProjectId();
onChanged();
@@ -648,13 +726,14 @@ public Builder clearProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectIdBytes(
+ @java.lang.Deprecated public Builder setProjectIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -669,14 +748,15 @@ public Builder setProjectIdBytes(
private java.lang.Object zone_ = "";
/**
*
- * The name of the Google Compute Engine
+ * 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 parent field.
*
*
- * string zone = 2;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -690,14 +770,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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 parent field.
*
*
- * string zone = 2;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof String) {
@@ -712,14 +793,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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 parent field.
*
*
- * string zone = 2;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZone(
+ @java.lang.Deprecated public Builder setZone(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -731,14 +813,15 @@ public Builder setZone(
}
/**
*
- * The name of the Google Compute Engine
+ * 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 parent field.
*
*
- * string zone = 2;
+ * string zone = 2 [deprecated = true];
*/
- public Builder clearZone() {
+ @java.lang.Deprecated public Builder clearZone() {
zone_ = getDefaultInstance().getZone();
onChanged();
@@ -746,14 +829,15 @@ public Builder clearZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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 parent field.
*
*
- * string zone = 2;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZoneBytes(
+ @java.lang.Deprecated public Builder setZoneBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -768,12 +852,13 @@ public Builder setZoneBytes(
private java.lang.Object clusterId_ = "";
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the parent field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public java.lang.String getClusterId() {
+ @java.lang.Deprecated public java.lang.String getClusterId() {
java.lang.Object ref = clusterId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -787,12 +872,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the parent field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIdBytes() {
java.lang.Object ref = clusterId_;
if (ref instanceof String) {
@@ -807,12 +893,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the parent field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder setClusterId(
+ @java.lang.Deprecated public Builder setClusterId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -824,12 +911,13 @@ public Builder setClusterId(
}
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the parent field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder clearClusterId() {
+ @java.lang.Deprecated public Builder clearClusterId() {
clusterId_ = getDefaultInstance().getClusterId();
onChanged();
@@ -837,12 +925,13 @@ public Builder clearClusterId() {
}
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the parent field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder setClusterIdBytes(
+ @java.lang.Deprecated public Builder setClusterIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -853,6 +942,100 @@ public Builder setClusterIdBytes(
onChanged();
return this;
}
+
+ private java.lang.Object parent_ = "";
+ /**
+ * + * The parent (project, location, cluster id) where the node pools will be + * listed. Specified in the format 'projects/*/locations/*/clusters/*'. + *+ * + *
string parent = 5;
+ */
+ public java.lang.String getParent() {
+ java.lang.Object ref = parent_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ parent_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ * + * The parent (project, location, cluster id) where the node pools will be + * listed. Specified in the format 'projects/*/locations/*/clusters/*'. + *+ * + *
string parent = 5;
+ */
+ public com.google.protobuf.ByteString
+ getParentBytes() {
+ java.lang.Object ref = parent_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ parent_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ * + * The parent (project, location, cluster id) where the node pools will be + * listed. Specified in the format 'projects/*/locations/*/clusters/*'. + *+ * + *
string parent = 5;
+ */
+ public Builder setParent(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ parent_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * + * The parent (project, location, cluster id) where the node pools will be + * listed. Specified in the format 'projects/*/locations/*/clusters/*'. + *+ * + *
string parent = 5;
+ */
+ public Builder clearParent() {
+
+ parent_ = getDefaultInstance().getParent();
+ onChanged();
+ return this;
+ }
+ /**
+ * + * The parent (project, location, cluster id) where the node pools will be + * listed. Specified in the format 'projects/*/locations/*/clusters/*'. + *+ * + *
string parent = 5;
+ */
+ public Builder setParentBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ parent_ = value;
+ onChanged();
+ return this;
+ }
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListNodePoolsRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListNodePoolsRequestOrBuilder.java
index 698ea8429981..38bcfb9d50f1 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListNodePoolsRequestOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListNodePoolsRequestOrBuilder.java
@@ -9,61 +9,87 @@ public interface ListNodePoolsRequestOrBuilder extends
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- java.lang.String getProjectId();
+ @java.lang.Deprecated java.lang.String getProjectId();
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getProjectIdBytes();
/**
*
- * The name of the Google Compute Engine
+ * 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 parent field.
*
*
- * string zone = 2;
+ * string zone = 2 [deprecated = true];
*/
- java.lang.String getZone();
+ @java.lang.Deprecated java.lang.String getZone();
/**
*
- * The name of the Google Compute Engine
+ * 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 parent field.
*
*
- * string zone = 2;
+ * string zone = 2 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getZoneBytes();
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the parent field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- java.lang.String getClusterId();
+ @java.lang.Deprecated java.lang.String getClusterId();
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the parent field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getClusterIdBytes();
+
+ /**
+ * + * The parent (project, location, cluster id) where the node pools will be + * listed. Specified in the format 'projects/*/locations/*/clusters/*'. + *+ * + *
string parent = 5;
+ */
+ java.lang.String getParent();
+ /**
+ * + * The parent (project, location, cluster id) where the node pools will be + * listed. Specified in the format 'projects/*/locations/*/clusters/*'. + *+ * + *
string parent = 5;
+ */
+ com.google.protobuf.ByteString
+ getParentBytes();
}
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListOperationsRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListOperationsRequest.java
index 01b6db9f0c88..da85b8bb1ff8 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListOperationsRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListOperationsRequest.java
@@ -22,6 +22,7 @@ private ListOperationsRequest(com.google.protobuf.GeneratedMessageV3.Builder
private ListOperationsRequest() {
projectId_ = "";
zone_ = "";
+ parent_ = "";
}
@java.lang.Override
@@ -60,6 +61,12 @@ private ListOperationsRequest(
zone_ = s;
break;
}
+ case 34: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ parent_ = s;
+ break;
+ }
default: {
if (!parseUnknownFieldProto3(
input, unknownFields, extensionRegistry, tag)) {
@@ -96,13 +103,14 @@ private ListOperationsRequest(
private volatile java.lang.Object projectId_;
/**
*
- * The Google Developers Console [project ID or project
+ * 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 parent field.
*
*
- * string project_id = 1;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -116,13 +124,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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 parent field.
*
*
- * string project_id = 1;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
@@ -140,13 +149,14 @@ public java.lang.String getProjectId() {
private volatile java.lang.Object zone_;
/**
*
- * The name of the Google Compute Engine [zone](/compute/docs/zones#available)
- * to return operations for, or `-` for all zones.
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -160,13 +170,14 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine [zone](/compute/docs/zones#available)
- * to return operations for, or `-` for all zones.
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
@@ -180,6 +191,52 @@ public java.lang.String getZone() {
}
}
+ public static final int PARENT_FIELD_NUMBER = 4;
+ private volatile java.lang.Object parent_;
+ /**
+ * + * 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;
+ */
+ public java.lang.String getParent() {
+ java.lang.Object ref = parent_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ parent_ = s;
+ return s;
+ }
+ }
+ /**
+ * + * 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;
+ */
+ public com.google.protobuf.ByteString
+ getParentBytes() {
+ java.lang.Object ref = parent_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ parent_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -200,6 +257,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
if (!getZoneBytes().isEmpty()) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 2, zone_);
}
+ if (!getParentBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 4, parent_);
+ }
unknownFields.writeTo(output);
}
@@ -215,6 +275,9 @@ public int getSerializedSize() {
if (!getZoneBytes().isEmpty()) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, zone_);
}
+ if (!getParentBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, parent_);
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -235,6 +298,8 @@ public boolean equals(final java.lang.Object obj) {
.equals(other.getProjectId());
result = result && getZone()
.equals(other.getZone());
+ result = result && getParent()
+ .equals(other.getParent());
result = result && unknownFields.equals(other.unknownFields);
return result;
}
@@ -250,6 +315,8 @@ public int hashCode() {
hash = (53 * hash) + getProjectId().hashCode();
hash = (37 * hash) + ZONE_FIELD_NUMBER;
hash = (53 * hash) + getZone().hashCode();
+ hash = (37 * hash) + PARENT_FIELD_NUMBER;
+ hash = (53 * hash) + getParent().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -391,6 +458,8 @@ public Builder clear() {
zone_ = "";
+ parent_ = "";
+
return this;
}
@@ -419,6 +488,7 @@ public com.google.container.v1.ListOperationsRequest buildPartial() {
com.google.container.v1.ListOperationsRequest result = new com.google.container.v1.ListOperationsRequest(this);
result.projectId_ = projectId_;
result.zone_ = zone_;
+ result.parent_ = parent_;
onBuilt();
return result;
}
@@ -475,6 +545,10 @@ public Builder mergeFrom(com.google.container.v1.ListOperationsRequest other) {
zone_ = other.zone_;
onChanged();
}
+ if (!other.getParent().isEmpty()) {
+ parent_ = other.parent_;
+ onChanged();
+ }
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -507,13 +581,14 @@ public Builder mergeFrom(
private java.lang.Object projectId_ = "";
/**
*
- * The Google Developers Console [project ID or project
+ * 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 parent field.
*
*
- * string project_id = 1;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -527,13 +602,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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 parent field.
*
*
- * string project_id = 1;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof String) {
@@ -548,13 +624,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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 parent field.
*
*
- * string project_id = 1;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectId(
+ @java.lang.Deprecated public Builder setProjectId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -566,13 +643,14 @@ public Builder setProjectId(
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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 parent field.
*
*
- * string project_id = 1;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder clearProjectId() {
+ @java.lang.Deprecated public Builder clearProjectId() {
projectId_ = getDefaultInstance().getProjectId();
onChanged();
@@ -580,13 +658,14 @@ public Builder clearProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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 parent field.
*
*
- * string project_id = 1;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectIdBytes(
+ @java.lang.Deprecated public Builder setProjectIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -601,13 +680,14 @@ public Builder setProjectIdBytes(
private java.lang.Object zone_ = "";
/**
*
- * The name of the Google Compute Engine [zone](/compute/docs/zones#available)
- * to return operations for, or `-` for all zones.
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -621,13 +701,14 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine [zone](/compute/docs/zones#available)
- * to return operations for, or `-` for all zones.
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof String) {
@@ -642,13 +723,14 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine [zone](/compute/docs/zones#available)
- * to return operations for, or `-` for all zones.
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZone(
+ @java.lang.Deprecated public Builder setZone(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -660,13 +742,14 @@ public Builder setZone(
}
/**
*
- * The name of the Google Compute Engine [zone](/compute/docs/zones#available)
- * to return operations for, or `-` for all zones.
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder clearZone() {
+ @java.lang.Deprecated public Builder clearZone() {
zone_ = getDefaultInstance().getZone();
onChanged();
@@ -674,13 +757,14 @@ public Builder clearZone() {
}
/**
*
- * The name of the Google Compute Engine [zone](/compute/docs/zones#available)
- * to return operations for, or `-` for all zones.
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZoneBytes(
+ @java.lang.Deprecated public Builder setZoneBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -691,6 +775,105 @@ public Builder setZoneBytes(
onChanged();
return this;
}
+
+ private java.lang.Object parent_ = "";
+ /**
+ * + * 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;
+ */
+ public java.lang.String getParent() {
+ java.lang.Object ref = parent_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ parent_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ * + * 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;
+ */
+ public com.google.protobuf.ByteString
+ getParentBytes() {
+ java.lang.Object ref = parent_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ parent_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ * + * 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;
+ */
+ public Builder setParent(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ parent_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * + * 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;
+ */
+ public Builder clearParent() {
+
+ parent_ = getDefaultInstance().getParent();
+ onChanged();
+ return this;
+ }
+ /**
+ * + * 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;
+ */
+ public Builder setParentBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ parent_ = value;
+ onChanged();
+ return this;
+ }
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListOperationsRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListOperationsRequestOrBuilder.java
index df16b58515cc..a1aad82da489 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListOperationsRequestOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListOperationsRequestOrBuilder.java
@@ -9,41 +9,67 @@ public interface ListOperationsRequestOrBuilder extends
/**
*
- * The Google Developers Console [project ID or project
+ * 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 parent field.
*
*
- * string project_id = 1;
+ * string project_id = 1 [deprecated = true];
*/
- java.lang.String getProjectId();
+ @java.lang.Deprecated java.lang.String getProjectId();
/**
*
- * The Google Developers Console [project ID or project
+ * 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 parent field.
*
*
- * string project_id = 1;
+ * string project_id = 1 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getProjectIdBytes();
/**
*
- * The name of the Google Compute Engine [zone](/compute/docs/zones#available)
- * to return operations for, or `-` for all zones.
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- java.lang.String getZone();
+ @java.lang.Deprecated java.lang.String getZone();
/**
*
- * The name of the Google Compute Engine [zone](/compute/docs/zones#available)
- * to return operations for, or `-` for all zones.
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getZoneBytes();
+
+ /**
+ * + * 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;
+ */
+ java.lang.String getParent();
+ /**
+ * + * 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;
+ */
+ com.google.protobuf.ByteString
+ getParentBytes();
}
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/MasterAuth.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/MasterAuth.java
index 8c93bc434d92..2478421ca4e6 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/MasterAuth.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/MasterAuth.java
@@ -226,8 +226,9 @@ public java.lang.String getPassword() {
private com.google.container.v1.ClientCertificateConfig clientCertificateConfig_;
/**
*
- * Configuration for client certificate authentication on the cluster. If no
- * configuration is specified, a client certificate is issued.
+ * Configuration for client certificate authentication on the cluster. For
+ * clusters before v1.12, if no configuration is specified, a client
+ * certificate is issued.
*
*
* .google.container.v1.ClientCertificateConfig client_certificate_config = 3;
@@ -237,8 +238,9 @@ public boolean hasClientCertificateConfig() {
}
/**
*
- * Configuration for client certificate authentication on the cluster. If no
- * configuration is specified, a client certificate is issued.
+ * Configuration for client certificate authentication on the cluster. For
+ * clusters before v1.12, if no configuration is specified, a client
+ * certificate is issued.
*
*
* .google.container.v1.ClientCertificateConfig client_certificate_config = 3;
@@ -248,8 +250,9 @@ public com.google.container.v1.ClientCertificateConfig getClientCertificateConfi
}
/**
*
- * Configuration for client certificate authentication on the cluster. If no
- * configuration is specified, a client certificate is issued.
+ * Configuration for client certificate authentication on the cluster. For
+ * clusters before v1.12, if no configuration is specified, a client
+ * certificate is issued.
*
*
* .google.container.v1.ClientCertificateConfig client_certificate_config = 3;
@@ -1005,8 +1008,9 @@ public Builder setPasswordBytes(
com.google.container.v1.ClientCertificateConfig, com.google.container.v1.ClientCertificateConfig.Builder, com.google.container.v1.ClientCertificateConfigOrBuilder> clientCertificateConfigBuilder_;
/**
*
- * Configuration for client certificate authentication on the cluster. If no
- * configuration is specified, a client certificate is issued.
+ * Configuration for client certificate authentication on the cluster. For
+ * clusters before v1.12, if no configuration is specified, a client
+ * certificate is issued.
*
*
* .google.container.v1.ClientCertificateConfig client_certificate_config = 3;
@@ -1016,8 +1020,9 @@ public boolean hasClientCertificateConfig() {
}
/**
*
- * Configuration for client certificate authentication on the cluster. If no
- * configuration is specified, a client certificate is issued.
+ * Configuration for client certificate authentication on the cluster. For
+ * clusters before v1.12, if no configuration is specified, a client
+ * certificate is issued.
*
*
* .google.container.v1.ClientCertificateConfig client_certificate_config = 3;
@@ -1031,8 +1036,9 @@ public com.google.container.v1.ClientCertificateConfig getClientCertificateConfi
}
/**
*
- * Configuration for client certificate authentication on the cluster. If no
- * configuration is specified, a client certificate is issued.
+ * Configuration for client certificate authentication on the cluster. For
+ * clusters before v1.12, if no configuration is specified, a client
+ * certificate is issued.
*
*
* .google.container.v1.ClientCertificateConfig client_certificate_config = 3;
@@ -1052,8 +1058,9 @@ public Builder setClientCertificateConfig(com.google.container.v1.ClientCertific
}
/**
*
- * Configuration for client certificate authentication on the cluster. If no
- * configuration is specified, a client certificate is issued.
+ * Configuration for client certificate authentication on the cluster. For
+ * clusters before v1.12, if no configuration is specified, a client
+ * certificate is issued.
*
*
* .google.container.v1.ClientCertificateConfig client_certificate_config = 3;
@@ -1071,8 +1078,9 @@ public Builder setClientCertificateConfig(
}
/**
*
- * Configuration for client certificate authentication on the cluster. If no
- * configuration is specified, a client certificate is issued.
+ * Configuration for client certificate authentication on the cluster. For
+ * clusters before v1.12, if no configuration is specified, a client
+ * certificate is issued.
*
*
* .google.container.v1.ClientCertificateConfig client_certificate_config = 3;
@@ -1094,8 +1102,9 @@ public Builder mergeClientCertificateConfig(com.google.container.v1.ClientCertif
}
/**
*
- * Configuration for client certificate authentication on the cluster. If no
- * configuration is specified, a client certificate is issued.
+ * Configuration for client certificate authentication on the cluster. For
+ * clusters before v1.12, if no configuration is specified, a client
+ * certificate is issued.
*
*
* .google.container.v1.ClientCertificateConfig client_certificate_config = 3;
@@ -1113,8 +1122,9 @@ public Builder clearClientCertificateConfig() {
}
/**
*
- * Configuration for client certificate authentication on the cluster. If no
- * configuration is specified, a client certificate is issued.
+ * Configuration for client certificate authentication on the cluster. For
+ * clusters before v1.12, if no configuration is specified, a client
+ * certificate is issued.
*
*
* .google.container.v1.ClientCertificateConfig client_certificate_config = 3;
@@ -1126,8 +1136,9 @@ public com.google.container.v1.ClientCertificateConfig.Builder getClientCertific
}
/**
*
- * Configuration for client certificate authentication on the cluster. If no
- * configuration is specified, a client certificate is issued.
+ * Configuration for client certificate authentication on the cluster. For
+ * clusters before v1.12, if no configuration is specified, a client
+ * certificate is issued.
*
*
* .google.container.v1.ClientCertificateConfig client_certificate_config = 3;
@@ -1142,8 +1153,9 @@ public com.google.container.v1.ClientCertificateConfigOrBuilder getClientCertifi
}
/**
*
- * Configuration for client certificate authentication on the cluster. If no
- * configuration is specified, a client certificate is issued.
+ * Configuration for client certificate authentication on the cluster. For
+ * clusters before v1.12, if no configuration is specified, a client
+ * certificate is issued.
*
*
* .google.container.v1.ClientCertificateConfig client_certificate_config = 3;
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/MasterAuthOrBuilder.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/MasterAuthOrBuilder.java
index 3d6590e199a9..8281e6e207c8 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/MasterAuthOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/MasterAuthOrBuilder.java
@@ -55,8 +55,9 @@ public interface MasterAuthOrBuilder extends
/**
*
- * Configuration for client certificate authentication on the cluster. If no
- * configuration is specified, a client certificate is issued.
+ * Configuration for client certificate authentication on the cluster. For
+ * clusters before v1.12, if no configuration is specified, a client
+ * certificate is issued.
*
*
* .google.container.v1.ClientCertificateConfig client_certificate_config = 3;
@@ -64,8 +65,9 @@ public interface MasterAuthOrBuilder extends
boolean hasClientCertificateConfig();
/**
*
- * Configuration for client certificate authentication on the cluster. If no
- * configuration is specified, a client certificate is issued.
+ * Configuration for client certificate authentication on the cluster. For
+ * clusters before v1.12, if no configuration is specified, a client
+ * certificate is issued.
*
*
* .google.container.v1.ClientCertificateConfig client_certificate_config = 3;
@@ -73,8 +75,9 @@ public interface MasterAuthOrBuilder extends
com.google.container.v1.ClientCertificateConfig getClientCertificateConfig();
/**
*
- * Configuration for client certificate authentication on the cluster. If no
- * configuration is specified, a client certificate is issued.
+ * Configuration for client certificate authentication on the cluster. For
+ * clusters before v1.12, if no configuration is specified, a client
+ * certificate is issued.
*
*
* .google.container.v1.ClientCertificateConfig client_certificate_config = 3;
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/MasterAuthorizedNetworksConfig.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/MasterAuthorizedNetworksConfig.java
index 0e4e5e766948..ce40139b9811 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/MasterAuthorizedNetworksConfig.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/MasterAuthorizedNetworksConfig.java
@@ -5,7 +5,6 @@
/**
*
- * 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,
@@ -1114,7 +1113,6 @@ protected Builder newBuilderForType(
}
/**
*
- * 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,
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NetworkConfig.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NetworkConfig.java
new file mode 100644
index 000000000000..b81fe66110b7
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NetworkConfig.java
@@ -0,0 +1,767 @@
+// Generated by the protocol buffer compiler. DO NOT EDIT!
+// source: google/container/v1/cluster_service.proto
+
+package com.google.container.v1;
+
+/**
+ *
+ * NetworkConfig reports the relative names of network & subnetwork.
+ *
+ *
+ * Protobuf type {@code google.container.v1.NetworkConfig}
+ */
+public final class NetworkConfig extends
+ com.google.protobuf.GeneratedMessageV3 implements
+ // @@protoc_insertion_point(message_implements:google.container.v1.NetworkConfig)
+ NetworkConfigOrBuilder {
+private static final long serialVersionUID = 0L;
+ // Use NetworkConfig.newBuilder() to construct.
+ private NetworkConfig(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+ super(builder);
+ }
+ private NetworkConfig() {
+ network_ = "";
+ subnetwork_ = "";
+ }
+
+ @java.lang.Override
+ public final com.google.protobuf.UnknownFieldSet
+ getUnknownFields() {
+ return this.unknownFields;
+ }
+ private NetworkConfig(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ this();
+ if (extensionRegistry == null) {
+ throw new java.lang.NullPointerException();
+ }
+ int mutable_bitField0_ = 0;
+ com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+ com.google.protobuf.UnknownFieldSet.newBuilder();
+ try {
+ boolean done = false;
+ while (!done) {
+ int tag = input.readTag();
+ switch (tag) {
+ case 0:
+ done = true;
+ break;
+ case 10: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ network_ = s;
+ break;
+ }
+ case 18: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ subnetwork_ = s;
+ break;
+ }
+ default: {
+ if (!parseUnknownFieldProto3(
+ input, unknownFields, extensionRegistry, tag)) {
+ done = true;
+ }
+ break;
+ }
+ }
+ }
+ } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ throw e.setUnfinishedMessage(this);
+ } catch (java.io.IOException e) {
+ throw new com.google.protobuf.InvalidProtocolBufferException(
+ e).setUnfinishedMessage(this);
+ } finally {
+ this.unknownFields = unknownFields.build();
+ makeExtensionsImmutable();
+ }
+ }
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_NetworkConfig_descriptor;
+ }
+
+ @java.lang.Override
+ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_NetworkConfig_fieldAccessorTable
+ .ensureFieldAccessorsInitialized(
+ com.google.container.v1.NetworkConfig.class, com.google.container.v1.NetworkConfig.Builder.class);
+ }
+
+ public static final int NETWORK_FIELD_NUMBER = 1;
+ private volatile java.lang.Object network_;
+ /**
+ *
+ * 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;
+ */
+ public java.lang.String getNetwork() {
+ java.lang.Object ref = network_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ network_ = s;
+ return s;
+ }
+ }
+ /**
+ *
+ * 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;
+ */
+ public com.google.protobuf.ByteString
+ getNetworkBytes() {
+ java.lang.Object ref = network_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ network_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
+ public static final int SUBNETWORK_FIELD_NUMBER = 2;
+ private volatile java.lang.Object subnetwork_;
+ /**
+ *
+ * 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;
+ */
+ public java.lang.String getSubnetwork() {
+ java.lang.Object ref = subnetwork_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ subnetwork_ = s;
+ return s;
+ }
+ }
+ /**
+ *
+ * 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;
+ */
+ public com.google.protobuf.ByteString
+ getSubnetworkBytes() {
+ java.lang.Object ref = subnetwork_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ subnetwork_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
+ private byte memoizedIsInitialized = -1;
+ @java.lang.Override
+ public final boolean isInitialized() {
+ byte isInitialized = memoizedIsInitialized;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
+
+ memoizedIsInitialized = 1;
+ return true;
+ }
+
+ @java.lang.Override
+ public void writeTo(com.google.protobuf.CodedOutputStream output)
+ throws java.io.IOException {
+ if (!getNetworkBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 1, network_);
+ }
+ if (!getSubnetworkBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 2, subnetwork_);
+ }
+ unknownFields.writeTo(output);
+ }
+
+ @java.lang.Override
+ public int getSerializedSize() {
+ int size = memoizedSize;
+ if (size != -1) return size;
+
+ size = 0;
+ if (!getNetworkBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, network_);
+ }
+ if (!getSubnetworkBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, subnetwork_);
+ }
+ size += unknownFields.getSerializedSize();
+ memoizedSize = size;
+ return size;
+ }
+
+ @java.lang.Override
+ public boolean equals(final java.lang.Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof com.google.container.v1.NetworkConfig)) {
+ return super.equals(obj);
+ }
+ com.google.container.v1.NetworkConfig other = (com.google.container.v1.NetworkConfig) obj;
+
+ boolean result = true;
+ result = result && getNetwork()
+ .equals(other.getNetwork());
+ result = result && getSubnetwork()
+ .equals(other.getSubnetwork());
+ result = result && unknownFields.equals(other.unknownFields);
+ return result;
+ }
+
+ @java.lang.Override
+ public int hashCode() {
+ if (memoizedHashCode != 0) {
+ return memoizedHashCode;
+ }
+ int hash = 41;
+ hash = (19 * hash) + getDescriptor().hashCode();
+ hash = (37 * hash) + NETWORK_FIELD_NUMBER;
+ hash = (53 * hash) + getNetwork().hashCode();
+ hash = (37 * hash) + SUBNETWORK_FIELD_NUMBER;
+ hash = (53 * hash) + getSubnetwork().hashCode();
+ hash = (29 * hash) + unknownFields.hashCode();
+ memoizedHashCode = hash;
+ return hash;
+ }
+
+ public static com.google.container.v1.NetworkConfig parseFrom(
+ java.nio.ByteBuffer data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static com.google.container.v1.NetworkConfig parseFrom(
+ java.nio.ByteBuffer data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static com.google.container.v1.NetworkConfig parseFrom(
+ com.google.protobuf.ByteString data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static com.google.container.v1.NetworkConfig parseFrom(
+ com.google.protobuf.ByteString data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static com.google.container.v1.NetworkConfig parseFrom(byte[] data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static com.google.container.v1.NetworkConfig parseFrom(
+ byte[] data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static com.google.container.v1.NetworkConfig parseFrom(java.io.InputStream input)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseWithIOException(PARSER, input);
+ }
+ public static com.google.container.v1.NetworkConfig parseFrom(
+ java.io.InputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseWithIOException(PARSER, input, extensionRegistry);
+ }
+ public static com.google.container.v1.NetworkConfig parseDelimitedFrom(java.io.InputStream input)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseDelimitedWithIOException(PARSER, input);
+ }
+ public static com.google.container.v1.NetworkConfig parseDelimitedFrom(
+ java.io.InputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+ }
+ public static com.google.container.v1.NetworkConfig parseFrom(
+ com.google.protobuf.CodedInputStream input)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseWithIOException(PARSER, input);
+ }
+ public static com.google.container.v1.NetworkConfig parseFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseWithIOException(PARSER, input, extensionRegistry);
+ }
+
+ @java.lang.Override
+ public Builder newBuilderForType() { return newBuilder(); }
+ public static Builder newBuilder() {
+ return DEFAULT_INSTANCE.toBuilder();
+ }
+ public static Builder newBuilder(com.google.container.v1.NetworkConfig prototype) {
+ return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+ }
+ @java.lang.Override
+ public Builder toBuilder() {
+ return this == DEFAULT_INSTANCE
+ ? new Builder() : new Builder().mergeFrom(this);
+ }
+
+ @java.lang.Override
+ protected Builder newBuilderForType(
+ com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+ Builder builder = new Builder(parent);
+ return builder;
+ }
+ /**
+ *
+ * NetworkConfig reports the relative names of network & subnetwork.
+ *
+ *
+ * Protobuf type {@code google.container.v1.NetworkConfig}
+ */
+ public static final class Builder extends
+ com.google.protobuf.GeneratedMessageV3.Builder implements
+ // @@protoc_insertion_point(builder_implements:google.container.v1.NetworkConfig)
+ com.google.container.v1.NetworkConfigOrBuilder {
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_NetworkConfig_descriptor;
+ }
+
+ @java.lang.Override
+ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_NetworkConfig_fieldAccessorTable
+ .ensureFieldAccessorsInitialized(
+ com.google.container.v1.NetworkConfig.class, com.google.container.v1.NetworkConfig.Builder.class);
+ }
+
+ // Construct using com.google.container.v1.NetworkConfig.newBuilder()
+ private Builder() {
+ maybeForceBuilderInitialization();
+ }
+
+ private Builder(
+ com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+ super(parent);
+ maybeForceBuilderInitialization();
+ }
+ private void maybeForceBuilderInitialization() {
+ if (com.google.protobuf.GeneratedMessageV3
+ .alwaysUseFieldBuilders) {
+ }
+ }
+ @java.lang.Override
+ public Builder clear() {
+ super.clear();
+ network_ = "";
+
+ subnetwork_ = "";
+
+ return this;
+ }
+
+ @java.lang.Override
+ public com.google.protobuf.Descriptors.Descriptor
+ getDescriptorForType() {
+ return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_NetworkConfig_descriptor;
+ }
+
+ @java.lang.Override
+ public com.google.container.v1.NetworkConfig getDefaultInstanceForType() {
+ return com.google.container.v1.NetworkConfig.getDefaultInstance();
+ }
+
+ @java.lang.Override
+ public com.google.container.v1.NetworkConfig build() {
+ com.google.container.v1.NetworkConfig result = buildPartial();
+ if (!result.isInitialized()) {
+ throw newUninitializedMessageException(result);
+ }
+ return result;
+ }
+
+ @java.lang.Override
+ public com.google.container.v1.NetworkConfig buildPartial() {
+ com.google.container.v1.NetworkConfig result = new com.google.container.v1.NetworkConfig(this);
+ result.network_ = network_;
+ result.subnetwork_ = subnetwork_;
+ onBuilt();
+ return result;
+ }
+
+ @java.lang.Override
+ public Builder clone() {
+ return (Builder) super.clone();
+ }
+ @java.lang.Override
+ public Builder setField(
+ com.google.protobuf.Descriptors.FieldDescriptor field,
+ java.lang.Object value) {
+ return (Builder) super.setField(field, value);
+ }
+ @java.lang.Override
+ public Builder clearField(
+ com.google.protobuf.Descriptors.FieldDescriptor field) {
+ return (Builder) super.clearField(field);
+ }
+ @java.lang.Override
+ public Builder clearOneof(
+ com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+ return (Builder) super.clearOneof(oneof);
+ }
+ @java.lang.Override
+ public Builder setRepeatedField(
+ com.google.protobuf.Descriptors.FieldDescriptor field,
+ int index, java.lang.Object value) {
+ return (Builder) super.setRepeatedField(field, index, value);
+ }
+ @java.lang.Override
+ public Builder addRepeatedField(
+ com.google.protobuf.Descriptors.FieldDescriptor field,
+ java.lang.Object value) {
+ return (Builder) super.addRepeatedField(field, value);
+ }
+ @java.lang.Override
+ public Builder mergeFrom(com.google.protobuf.Message other) {
+ if (other instanceof com.google.container.v1.NetworkConfig) {
+ return mergeFrom((com.google.container.v1.NetworkConfig)other);
+ } else {
+ super.mergeFrom(other);
+ return this;
+ }
+ }
+
+ public Builder mergeFrom(com.google.container.v1.NetworkConfig other) {
+ if (other == com.google.container.v1.NetworkConfig.getDefaultInstance()) return this;
+ if (!other.getNetwork().isEmpty()) {
+ network_ = other.network_;
+ onChanged();
+ }
+ if (!other.getSubnetwork().isEmpty()) {
+ subnetwork_ = other.subnetwork_;
+ onChanged();
+ }
+ this.mergeUnknownFields(other.unknownFields);
+ onChanged();
+ return this;
+ }
+
+ @java.lang.Override
+ public final boolean isInitialized() {
+ return true;
+ }
+
+ @java.lang.Override
+ public Builder mergeFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ com.google.container.v1.NetworkConfig parsedMessage = null;
+ try {
+ parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+ } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ parsedMessage = (com.google.container.v1.NetworkConfig) e.getUnfinishedMessage();
+ throw e.unwrapIOException();
+ } finally {
+ if (parsedMessage != null) {
+ mergeFrom(parsedMessage);
+ }
+ }
+ return this;
+ }
+
+ private java.lang.Object network_ = "";
+ /**
+ *
+ * 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;
+ */
+ public java.lang.String getNetwork() {
+ java.lang.Object ref = network_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ network_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ *
+ * 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;
+ */
+ public com.google.protobuf.ByteString
+ getNetworkBytes() {
+ java.lang.Object ref = network_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ network_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ *
+ * 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;
+ */
+ public Builder setNetwork(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ network_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * 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;
+ */
+ public Builder clearNetwork() {
+
+ network_ = getDefaultInstance().getNetwork();
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * 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;
+ */
+ public Builder setNetworkBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ network_ = value;
+ onChanged();
+ return this;
+ }
+
+ private java.lang.Object subnetwork_ = "";
+ /**
+ *
+ * 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;
+ */
+ public java.lang.String getSubnetwork() {
+ java.lang.Object ref = subnetwork_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ subnetwork_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ *
+ * 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;
+ */
+ public com.google.protobuf.ByteString
+ getSubnetworkBytes() {
+ java.lang.Object ref = subnetwork_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ subnetwork_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ *
+ * 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;
+ */
+ public Builder setSubnetwork(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ subnetwork_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * 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;
+ */
+ public Builder clearSubnetwork() {
+
+ subnetwork_ = getDefaultInstance().getSubnetwork();
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * 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;
+ */
+ public Builder setSubnetworkBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ subnetwork_ = value;
+ onChanged();
+ return this;
+ }
+ @java.lang.Override
+ public final Builder setUnknownFields(
+ final com.google.protobuf.UnknownFieldSet unknownFields) {
+ return super.setUnknownFieldsProto3(unknownFields);
+ }
+
+ @java.lang.Override
+ public final Builder mergeUnknownFields(
+ final com.google.protobuf.UnknownFieldSet unknownFields) {
+ return super.mergeUnknownFields(unknownFields);
+ }
+
+
+ // @@protoc_insertion_point(builder_scope:google.container.v1.NetworkConfig)
+ }
+
+ // @@protoc_insertion_point(class_scope:google.container.v1.NetworkConfig)
+ private static final com.google.container.v1.NetworkConfig DEFAULT_INSTANCE;
+ static {
+ DEFAULT_INSTANCE = new com.google.container.v1.NetworkConfig();
+ }
+
+ public static com.google.container.v1.NetworkConfig getDefaultInstance() {
+ return DEFAULT_INSTANCE;
+ }
+
+ private static final com.google.protobuf.Parser
+ PARSER = new com.google.protobuf.AbstractParser() {
+ @java.lang.Override
+ public NetworkConfig parsePartialFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return new NetworkConfig(input, extensionRegistry);
+ }
+ };
+
+ public static com.google.protobuf.Parser parser() {
+ return PARSER;
+ }
+
+ @java.lang.Override
+ public com.google.protobuf.Parser getParserForType() {
+ return PARSER;
+ }
+
+ @java.lang.Override
+ public com.google.container.v1.NetworkConfig getDefaultInstanceForType() {
+ return DEFAULT_INSTANCE;
+ }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NetworkConfigOrBuilder.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NetworkConfigOrBuilder.java
new file mode 100644
index 000000000000..eaa5c4bb21f5
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NetworkConfigOrBuilder.java
@@ -0,0 +1,55 @@
+// Generated by the protocol buffer compiler. DO NOT EDIT!
+// source: google/container/v1/cluster_service.proto
+
+package com.google.container.v1;
+
+public interface NetworkConfigOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:google.container.v1.NetworkConfig)
+ com.google.protobuf.MessageOrBuilder {
+
+ /**
+ *
+ * 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;
+ */
+ java.lang.String getNetwork();
+ /**
+ *
+ * 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;
+ */
+ com.google.protobuf.ByteString
+ getNetworkBytes();
+
+ /**
+ *
+ * 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;
+ */
+ java.lang.String getSubnetwork();
+ /**
+ *
+ * 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;
+ */
+ com.google.protobuf.ByteString
+ getSubnetworkBytes();
+}
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NodeConfig.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NodeConfig.java
index 3e8181ca2ed4..441c05b4c473 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NodeConfig.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NodeConfig.java
@@ -29,6 +29,7 @@ private NodeConfig() {
tags_ = com.google.protobuf.LazyStringArrayList.EMPTY;
preemptible_ = false;
accelerators_ = java.util.Collections.emptyList();
+ diskType_ = "";
minCpuPlatform_ = "";
}
@@ -142,6 +143,12 @@ private NodeConfig(
input.readMessage(com.google.container.v1.AcceleratorConfig.parser(), extensionRegistry));
break;
}
+ case 98: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ diskType_ = s;
+ break;
+ }
case 106: {
java.lang.String s = input.readStringRequireUtf8();
@@ -430,8 +437,18 @@ public int getMetadataCount() {
* 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 four reserved keys:
- * "instance-template", "kube-env", "startup-script", and "user-data"
+ * 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"
* 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
* that each value's size must be less than or equal to 32 KB.
@@ -459,8 +476,18 @@ public java.util.Map getMetadata() {
* 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 four reserved keys:
- * "instance-template", "kube-env", "startup-script", and "user-data"
+ * 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"
* 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
* that each value's size must be less than or equal to 32 KB.
@@ -479,8 +506,18 @@ public java.util.Map getMetadataMap() {
* 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 four reserved keys:
- * "instance-template", "kube-env", "startup-script", and "user-data"
+ * 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"
* 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
* that each value's size must be less than or equal to 32 KB.
@@ -504,8 +541,18 @@ public java.lang.String getMetadataOrDefault(
* 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 four reserved keys:
- * "instance-template", "kube-env", "startup-script", and "user-data"
+ * 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"
* 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
* that each value's size must be less than or equal to 32 KB.
@@ -844,6 +891,50 @@ public com.google.container.v1.AcceleratorConfigOrBuilder getAcceleratorsOrBuild
return accelerators_.get(index);
}
+ public static final int DISK_TYPE_FIELD_NUMBER = 12;
+ private volatile java.lang.Object diskType_;
+ /**
+ *
+ * Type of the disk attached to each node (e.g. 'pd-standard' or 'pd-ssd')
+ * If unspecified, the default disk type is 'pd-standard'
+ *
+ *
+ * string disk_type = 12;
+ */
+ public java.lang.String getDiskType() {
+ java.lang.Object ref = diskType_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ diskType_ = s;
+ return s;
+ }
+ }
+ /**
+ *
+ * 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;
+ */
+ public com.google.protobuf.ByteString
+ getDiskTypeBytes() {
+ java.lang.Object ref = diskType_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ diskType_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
public static final int MIN_CPU_PLATFORM_FIELD_NUMBER = 13;
private volatile java.lang.Object minCpuPlatform_;
/**
@@ -853,7 +944,8 @@ public com.google.container.v1.AcceleratorConfigOrBuilder getAcceleratorsOrBuild
* friendly names of CPU platforms, such as
* <code>minCpuPlatform: "Intel Haswell"</code> or
* <code>minCpuPlatform: "Intel Sandy Bridge"</code>. 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;
@@ -877,7 +969,8 @@ public java.lang.String getMinCpuPlatform() {
* friendly names of CPU platforms, such as
* <code>minCpuPlatform: "Intel Haswell"</code> or
* <code>minCpuPlatform: "Intel Sandy Bridge"</code>. 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;
@@ -949,6 +1042,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
for (int i = 0; i < accelerators_.size(); i++) {
output.writeMessage(11, accelerators_.get(i));
}
+ if (!getDiskTypeBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 12, diskType_);
+ }
if (!getMinCpuPlatformBytes().isEmpty()) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 13, minCpuPlatform_);
}
@@ -1022,6 +1118,9 @@ public int getSerializedSize() {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(11, accelerators_.get(i));
}
+ if (!getDiskTypeBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(12, diskType_);
+ }
if (!getMinCpuPlatformBytes().isEmpty()) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(13, minCpuPlatform_);
}
@@ -1063,6 +1162,8 @@ public boolean equals(final java.lang.Object obj) {
== other.getPreemptible());
result = result && getAcceleratorsList()
.equals(other.getAcceleratorsList());
+ result = result && getDiskType()
+ .equals(other.getDiskType());
result = result && getMinCpuPlatform()
.equals(other.getMinCpuPlatform());
result = result && unknownFields.equals(other.unknownFields);
@@ -1109,6 +1210,8 @@ public int hashCode() {
hash = (37 * hash) + ACCELERATORS_FIELD_NUMBER;
hash = (53 * hash) + getAcceleratorsList().hashCode();
}
+ hash = (37 * hash) + DISK_TYPE_FIELD_NUMBER;
+ hash = (53 * hash) + getDiskType().hashCode();
hash = (37 * hash) + MIN_CPU_PLATFORM_FIELD_NUMBER;
hash = (53 * hash) + getMinCpuPlatform().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
@@ -1299,6 +1402,8 @@ public Builder clear() {
} else {
acceleratorsBuilder_.clear();
}
+ diskType_ = "";
+
minCpuPlatform_ = "";
return this;
@@ -1358,6 +1463,7 @@ public com.google.container.v1.NodeConfig buildPartial() {
} else {
result.accelerators_ = acceleratorsBuilder_.build();
}
+ result.diskType_ = diskType_;
result.minCpuPlatform_ = minCpuPlatform_;
result.bitField0_ = to_bitField0_;
onBuilt();
@@ -1479,6 +1585,10 @@ public Builder mergeFrom(com.google.container.v1.NodeConfig other) {
}
}
}
+ if (!other.getDiskType().isEmpty()) {
+ diskType_ = other.diskType_;
+ onChanged();
+ }
if (!other.getMinCpuPlatform().isEmpty()) {
minCpuPlatform_ = other.minCpuPlatform_;
onChanged();
@@ -2012,8 +2122,18 @@ public int getMetadataCount() {
* 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 four reserved keys:
- * "instance-template", "kube-env", "startup-script", and "user-data"
+ * 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"
* 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
* that each value's size must be less than or equal to 32 KB.
@@ -2041,8 +2161,18 @@ public java.util.Map+ * 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;
+ */
+ public java.lang.String getDiskType() {
+ java.lang.Object ref = diskType_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ diskType_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ * + * 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;
+ */
+ public com.google.protobuf.ByteString
+ getDiskTypeBytes() {
+ java.lang.Object ref = diskType_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ diskType_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ * + * 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;
+ */
+ public Builder setDiskType(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ diskType_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * + * 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;
+ */
+ public Builder clearDiskType() {
+
+ diskType_ = getDefaultInstance().getDiskType();
+ onChanged();
+ return this;
+ }
+ /**
+ * + * 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;
+ */
+ public Builder setDiskTypeBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ diskType_ = value;
+ onChanged();
+ return this;
+ }
+
private java.lang.Object minCpuPlatform_ = "";
/**
*
@@ -3095,7 +3369,8 @@ public com.google.container.v1.AcceleratorConfig.Builder addAcceleratorsBuilder(
* friendly names of CPU platforms, such as
* <code>minCpuPlatform: "Intel Haswell"</code> or
* <code>minCpuPlatform: "Intel Sandy Bridge"</code>. 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;
@@ -3119,7 +3394,8 @@ public java.lang.String getMinCpuPlatform() {
* friendly names of CPU platforms, such as
* <code>minCpuPlatform: "Intel Haswell"</code> or
* <code>minCpuPlatform: "Intel Sandy Bridge"</code>. 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;
@@ -3144,7 +3420,8 @@ public java.lang.String getMinCpuPlatform() {
* friendly names of CPU platforms, such as
* <code>minCpuPlatform: "Intel Haswell"</code> or
* <code>minCpuPlatform: "Intel Sandy Bridge"</code>. 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;
@@ -3166,7 +3443,8 @@ public Builder setMinCpuPlatform(
* friendly names of CPU platforms, such as
* <code>minCpuPlatform: "Intel Haswell"</code> or
* <code>minCpuPlatform: "Intel Sandy Bridge"</code>. 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;
@@ -3184,7 +3462,8 @@ public Builder clearMinCpuPlatform() {
* friendly names of CPU platforms, such as
* <code>minCpuPlatform: "Intel Haswell"</code> or
* <code>minCpuPlatform: "Intel Sandy Bridge"</code>. 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;
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NodeConfigOrBuilder.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NodeConfigOrBuilder.java
index 5e1812fa3873..9db91db89567 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NodeConfigOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NodeConfigOrBuilder.java
@@ -145,8 +145,18 @@ public interface NodeConfigOrBuilder extends
* 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 four reserved keys:
- * "instance-template", "kube-env", "startup-script", and "user-data"
+ * 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"
* 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
* that each value's size must be less than or equal to 32 KB.
@@ -162,8 +172,18 @@ public interface NodeConfigOrBuilder extends
* 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 four reserved keys:
- * "instance-template", "kube-env", "startup-script", and "user-data"
+ * 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"
* 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
* that each value's size must be less than or equal to 32 KB.
@@ -186,8 +206,18 @@ boolean containsMetadata(
* 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 four reserved keys:
- * "instance-template", "kube-env", "startup-script", and "user-data"
+ * 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"
* 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
* that each value's size must be less than or equal to 32 KB.
@@ -204,8 +234,18 @@ boolean containsMetadata(
* 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 four reserved keys:
- * "instance-template", "kube-env", "startup-script", and "user-data"
+ * 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"
* 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
* that each value's size must be less than or equal to 32 KB.
@@ -224,8 +264,18 @@ java.lang.String getMetadataOrDefault(
* 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 four reserved keys:
- * "instance-template", "kube-env", "startup-script", and "user-data"
+ * 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"
* 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
* that each value's size must be less than or equal to 32 KB.
@@ -472,6 +522,26 @@ java.lang.String getLabelsOrThrow(
com.google.container.v1.AcceleratorConfigOrBuilder getAcceleratorsOrBuilder(
int index);
+ /**
+ * + * 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;
+ */
+ java.lang.String getDiskType();
+ /**
+ * + * 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;
+ */
+ com.google.protobuf.ByteString
+ getDiskTypeBytes();
+
/**
*
* Minimum CPU platform to be used by this instance. The instance may be
@@ -479,7 +549,8 @@ com.google.container.v1.AcceleratorConfigOrBuilder getAcceleratorsOrBuilder(
* friendly names of CPU platforms, such as
* <code>minCpuPlatform: "Intel Haswell"</code> or
* <code>minCpuPlatform: "Intel Sandy Bridge"</code>. 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;
@@ -492,7 +563,8 @@ com.google.container.v1.AcceleratorConfigOrBuilder getAcceleratorsOrBuilder(
* friendly names of CPU platforms, such as
* <code>minCpuPlatform: "Intel Haswell"</code> or
* <code>minCpuPlatform: "Intel Sandy Bridge"</code>. 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;
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/Operation.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/Operation.java
index d267d02673e9..605726f2e647 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/Operation.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/Operation.java
@@ -29,6 +29,7 @@ private Operation() {
statusMessage_ = "";
selfLink_ = "";
targetLink_ = "";
+ location_ = "";
startTime_ = "";
endTime_ = "";
}
@@ -105,6 +106,12 @@ private Operation(
detail_ = s;
break;
}
+ case 74: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ location_ = s;
+ break;
+ }
case 82: {
java.lang.String s = input.readStringRequireUtf8();
@@ -740,11 +747,12 @@ public java.lang.String getName() {
* 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -761,11 +769,12 @@ public java.lang.String getZone() {
* 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
@@ -997,6 +1006,54 @@ public java.lang.String getTargetLink() {
}
}
+ public static final int LOCATION_FIELD_NUMBER = 9;
+ private volatile java.lang.Object location_;
+ /**
+ * + * [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;
+ */
+ public java.lang.String getLocation() {
+ java.lang.Object ref = location_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ location_ = s;
+ return s;
+ }
+ }
+ /**
+ * + * [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;
+ */
+ public com.google.protobuf.ByteString
+ getLocationBytes() {
+ java.lang.Object ref = location_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ location_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
public static final int START_TIME_FIELD_NUMBER = 10;
private volatile java.lang.Object startTime_;
/**
@@ -1123,6 +1180,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
if (!getDetailBytes().isEmpty()) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 8, detail_);
}
+ if (!getLocationBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 9, location_);
+ }
if (!getStartTimeBytes().isEmpty()) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 10, startTime_);
}
@@ -1164,6 +1224,9 @@ public int getSerializedSize() {
if (!getDetailBytes().isEmpty()) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, detail_);
}
+ if (!getLocationBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, location_);
+ }
if (!getStartTimeBytes().isEmpty()) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(10, startTime_);
}
@@ -1200,6 +1263,8 @@ public boolean equals(final java.lang.Object obj) {
.equals(other.getSelfLink());
result = result && getTargetLink()
.equals(other.getTargetLink());
+ result = result && getLocation()
+ .equals(other.getLocation());
result = result && getStartTime()
.equals(other.getStartTime());
result = result && getEndTime()
@@ -1231,6 +1296,8 @@ public int hashCode() {
hash = (53 * hash) + getSelfLink().hashCode();
hash = (37 * hash) + TARGET_LINK_FIELD_NUMBER;
hash = (53 * hash) + getTargetLink().hashCode();
+ hash = (37 * hash) + LOCATION_FIELD_NUMBER;
+ hash = (53 * hash) + getLocation().hashCode();
hash = (37 * hash) + START_TIME_FIELD_NUMBER;
hash = (53 * hash) + getStartTime().hashCode();
hash = (37 * hash) + END_TIME_FIELD_NUMBER;
@@ -1389,6 +1456,8 @@ public Builder clear() {
targetLink_ = "";
+ location_ = "";
+
startTime_ = "";
endTime_ = "";
@@ -1427,6 +1496,7 @@ public com.google.container.v1.Operation buildPartial() {
result.statusMessage_ = statusMessage_;
result.selfLink_ = selfLink_;
result.targetLink_ = targetLink_;
+ result.location_ = location_;
result.startTime_ = startTime_;
result.endTime_ = endTime_;
onBuilt();
@@ -1507,6 +1577,10 @@ public Builder mergeFrom(com.google.container.v1.Operation other) {
targetLink_ = other.targetLink_;
onChanged();
}
+ if (!other.getLocation().isEmpty()) {
+ location_ = other.location_;
+ onChanged();
+ }
if (!other.getStartTime().isEmpty()) {
startTime_ = other.startTime_;
onChanged();
@@ -1639,11 +1713,12 @@ public Builder setNameBytes(
* 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -1660,11 +1735,12 @@ public java.lang.String getZone() {
* 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof String) {
@@ -1682,11 +1758,12 @@ public java.lang.String getZone() {
* 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZone(
+ @java.lang.Deprecated public Builder setZone(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -1701,11 +1778,12 @@ public Builder setZone(
* 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder clearZone() {
+ @java.lang.Deprecated public Builder clearZone() {
zone_ = getDefaultInstance().getZone();
onChanged();
@@ -1716,11 +1794,12 @@ public Builder clearZone() {
* 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZoneBytes(
+ @java.lang.Deprecated public Builder setZoneBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -2218,6 +2297,110 @@ public Builder setTargetLinkBytes(
return this;
}
+ private java.lang.Object location_ = "";
+ /**
+ * + * [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;
+ */
+ public java.lang.String getLocation() {
+ java.lang.Object ref = location_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ location_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ * + * [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;
+ */
+ public com.google.protobuf.ByteString
+ getLocationBytes() {
+ java.lang.Object ref = location_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ location_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ * + * [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;
+ */
+ public Builder setLocation(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ location_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * + * [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;
+ */
+ public Builder clearLocation() {
+
+ location_ = getDefaultInstance().getLocation();
+ onChanged();
+ return this;
+ }
+ /**
+ * + * [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;
+ */
+ public Builder setLocationBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ location_ = value;
+ onChanged();
+ return this;
+ }
+
private java.lang.Object startTime_ = "";
/**
*
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/OperationOrBuilder.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/OperationOrBuilder.java
index 9248d133b8eb..1ccaf5aa59ba 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/OperationOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/OperationOrBuilder.java
@@ -30,21 +30,23 @@ public interface OperationOrBuilder extends
* 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;
+ * string zone = 2 [deprecated = true];
*/
- java.lang.String getZone();
+ @java.lang.Deprecated java.lang.String getZone();
/**
*
* 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;
+ * string zone = 2 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getZoneBytes();
/**
@@ -153,6 +155,30 @@ public interface OperationOrBuilder extends
com.google.protobuf.ByteString
getTargetLinkBytes();
+ /**
+ * + * [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;
+ */
+ java.lang.String getLocation();
+ /**
+ * + * [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;
+ */
+ com.google.protobuf.ByteString
+ getLocationBytes();
+
/**
*
* [Output only] The time the operation started, in
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/PrivateClusterConfig.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/PrivateClusterConfig.java
new file mode 100644
index 000000000000..9c02f30f2444
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/PrivateClusterConfig.java
@@ -0,0 +1,1066 @@
+// Generated by the protocol buffer compiler. DO NOT EDIT!
+// source: google/container/v1/cluster_service.proto
+
+package com.google.container.v1;
+
+/**
+ *
+ * Configuration options for private clusters.
+ *
+ *
+ * Protobuf type {@code google.container.v1.PrivateClusterConfig}
+ */
+public final class PrivateClusterConfig extends
+ com.google.protobuf.GeneratedMessageV3 implements
+ // @@protoc_insertion_point(message_implements:google.container.v1.PrivateClusterConfig)
+ PrivateClusterConfigOrBuilder {
+private static final long serialVersionUID = 0L;
+ // Use PrivateClusterConfig.newBuilder() to construct.
+ private PrivateClusterConfig(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+ super(builder);
+ }
+ private PrivateClusterConfig() {
+ enablePrivateNodes_ = false;
+ enablePrivateEndpoint_ = false;
+ masterIpv4CidrBlock_ = "";
+ privateEndpoint_ = "";
+ publicEndpoint_ = "";
+ }
+
+ @java.lang.Override
+ public final com.google.protobuf.UnknownFieldSet
+ getUnknownFields() {
+ return this.unknownFields;
+ }
+ private PrivateClusterConfig(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ this();
+ if (extensionRegistry == null) {
+ throw new java.lang.NullPointerException();
+ }
+ int mutable_bitField0_ = 0;
+ com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+ com.google.protobuf.UnknownFieldSet.newBuilder();
+ try {
+ boolean done = false;
+ while (!done) {
+ int tag = input.readTag();
+ switch (tag) {
+ case 0:
+ done = true;
+ break;
+ case 8: {
+
+ enablePrivateNodes_ = input.readBool();
+ break;
+ }
+ case 16: {
+
+ enablePrivateEndpoint_ = input.readBool();
+ break;
+ }
+ case 26: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ masterIpv4CidrBlock_ = s;
+ break;
+ }
+ case 34: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ privateEndpoint_ = s;
+ break;
+ }
+ case 42: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ publicEndpoint_ = s;
+ break;
+ }
+ default: {
+ if (!parseUnknownFieldProto3(
+ input, unknownFields, extensionRegistry, tag)) {
+ done = true;
+ }
+ break;
+ }
+ }
+ }
+ } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ throw e.setUnfinishedMessage(this);
+ } catch (java.io.IOException e) {
+ throw new com.google.protobuf.InvalidProtocolBufferException(
+ e).setUnfinishedMessage(this);
+ } finally {
+ this.unknownFields = unknownFields.build();
+ makeExtensionsImmutable();
+ }
+ }
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_PrivateClusterConfig_descriptor;
+ }
+
+ @java.lang.Override
+ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_PrivateClusterConfig_fieldAccessorTable
+ .ensureFieldAccessorsInitialized(
+ com.google.container.v1.PrivateClusterConfig.class, com.google.container.v1.PrivateClusterConfig.Builder.class);
+ }
+
+ public static final int ENABLE_PRIVATE_NODES_FIELD_NUMBER = 1;
+ private boolean enablePrivateNodes_;
+ /**
+ *
+ * Whether nodes have internal IP addresses only. If enabled, all nodes are
+ * given only RFC 1918 private addresses and communicate with the master via
+ * private networking.
+ *
+ *
+ * bool enable_private_nodes = 1;
+ */
+ public boolean getEnablePrivateNodes() {
+ return enablePrivateNodes_;
+ }
+
+ public static final int ENABLE_PRIVATE_ENDPOINT_FIELD_NUMBER = 2;
+ private boolean enablePrivateEndpoint_;
+ /**
+ *
+ * Whether the master's internal IP address is used as the cluster endpoint.
+ *
+ *
+ * bool enable_private_endpoint = 2;
+ */
+ public boolean getEnablePrivateEndpoint() {
+ return enablePrivateEndpoint_;
+ }
+
+ public static final int MASTER_IPV4_CIDR_BLOCK_FIELD_NUMBER = 3;
+ private volatile java.lang.Object masterIpv4CidrBlock_;
+ /**
+ *
+ * The IP range in CIDR notation to use for the hosted master network. This
+ * range will be used for assigning internal IP addresses to the master or
+ * set of masters, as well as the ILB VIP. This range must not overlap with
+ * any other ranges in use within the cluster's network.
+ *
+ *
+ * string master_ipv4_cidr_block = 3;
+ */
+ public java.lang.String getMasterIpv4CidrBlock() {
+ java.lang.Object ref = masterIpv4CidrBlock_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ masterIpv4CidrBlock_ = s;
+ return s;
+ }
+ }
+ /**
+ *
+ * The IP range in CIDR notation to use for the hosted master network. This
+ * range will be used for assigning internal IP addresses to the master or
+ * set of masters, as well as the ILB VIP. This range must not overlap with
+ * any other ranges in use within the cluster's network.
+ *
+ *
+ * string master_ipv4_cidr_block = 3;
+ */
+ public com.google.protobuf.ByteString
+ getMasterIpv4CidrBlockBytes() {
+ java.lang.Object ref = masterIpv4CidrBlock_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ masterIpv4CidrBlock_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
+ public static final int PRIVATE_ENDPOINT_FIELD_NUMBER = 4;
+ private volatile java.lang.Object privateEndpoint_;
+ /**
+ *
+ * Output only. The internal IP address of this cluster's master endpoint.
+ *
+ *
+ * string private_endpoint = 4;
+ */
+ public java.lang.String getPrivateEndpoint() {
+ java.lang.Object ref = privateEndpoint_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ privateEndpoint_ = s;
+ return s;
+ }
+ }
+ /**
+ *
+ * Output only. The internal IP address of this cluster's master endpoint.
+ *
+ *
+ * string private_endpoint = 4;
+ */
+ public com.google.protobuf.ByteString
+ getPrivateEndpointBytes() {
+ java.lang.Object ref = privateEndpoint_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ privateEndpoint_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
+ public static final int PUBLIC_ENDPOINT_FIELD_NUMBER = 5;
+ private volatile java.lang.Object publicEndpoint_;
+ /**
+ *
+ * Output only. The external IP address of this cluster's master endpoint.
+ *
+ *
+ * string public_endpoint = 5;
+ */
+ public java.lang.String getPublicEndpoint() {
+ java.lang.Object ref = publicEndpoint_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ publicEndpoint_ = s;
+ return s;
+ }
+ }
+ /**
+ *
+ * Output only. The external IP address of this cluster's master endpoint.
+ *
+ *
+ * string public_endpoint = 5;
+ */
+ public com.google.protobuf.ByteString
+ getPublicEndpointBytes() {
+ java.lang.Object ref = publicEndpoint_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ publicEndpoint_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
+ private byte memoizedIsInitialized = -1;
+ @java.lang.Override
+ public final boolean isInitialized() {
+ byte isInitialized = memoizedIsInitialized;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
+
+ memoizedIsInitialized = 1;
+ return true;
+ }
+
+ @java.lang.Override
+ public void writeTo(com.google.protobuf.CodedOutputStream output)
+ throws java.io.IOException {
+ if (enablePrivateNodes_ != false) {
+ output.writeBool(1, enablePrivateNodes_);
+ }
+ if (enablePrivateEndpoint_ != false) {
+ output.writeBool(2, enablePrivateEndpoint_);
+ }
+ if (!getMasterIpv4CidrBlockBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 3, masterIpv4CidrBlock_);
+ }
+ if (!getPrivateEndpointBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 4, privateEndpoint_);
+ }
+ if (!getPublicEndpointBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 5, publicEndpoint_);
+ }
+ unknownFields.writeTo(output);
+ }
+
+ @java.lang.Override
+ public int getSerializedSize() {
+ int size = memoizedSize;
+ if (size != -1) return size;
+
+ size = 0;
+ if (enablePrivateNodes_ != false) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeBoolSize(1, enablePrivateNodes_);
+ }
+ if (enablePrivateEndpoint_ != false) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeBoolSize(2, enablePrivateEndpoint_);
+ }
+ if (!getMasterIpv4CidrBlockBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, masterIpv4CidrBlock_);
+ }
+ if (!getPrivateEndpointBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, privateEndpoint_);
+ }
+ if (!getPublicEndpointBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, publicEndpoint_);
+ }
+ size += unknownFields.getSerializedSize();
+ memoizedSize = size;
+ return size;
+ }
+
+ @java.lang.Override
+ public boolean equals(final java.lang.Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof com.google.container.v1.PrivateClusterConfig)) {
+ return super.equals(obj);
+ }
+ com.google.container.v1.PrivateClusterConfig other = (com.google.container.v1.PrivateClusterConfig) obj;
+
+ boolean result = true;
+ result = result && (getEnablePrivateNodes()
+ == other.getEnablePrivateNodes());
+ result = result && (getEnablePrivateEndpoint()
+ == other.getEnablePrivateEndpoint());
+ result = result && getMasterIpv4CidrBlock()
+ .equals(other.getMasterIpv4CidrBlock());
+ result = result && getPrivateEndpoint()
+ .equals(other.getPrivateEndpoint());
+ result = result && getPublicEndpoint()
+ .equals(other.getPublicEndpoint());
+ result = result && unknownFields.equals(other.unknownFields);
+ return result;
+ }
+
+ @java.lang.Override
+ public int hashCode() {
+ if (memoizedHashCode != 0) {
+ return memoizedHashCode;
+ }
+ int hash = 41;
+ hash = (19 * hash) + getDescriptor().hashCode();
+ hash = (37 * hash) + ENABLE_PRIVATE_NODES_FIELD_NUMBER;
+ hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+ getEnablePrivateNodes());
+ hash = (37 * hash) + ENABLE_PRIVATE_ENDPOINT_FIELD_NUMBER;
+ hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+ getEnablePrivateEndpoint());
+ hash = (37 * hash) + MASTER_IPV4_CIDR_BLOCK_FIELD_NUMBER;
+ hash = (53 * hash) + getMasterIpv4CidrBlock().hashCode();
+ hash = (37 * hash) + PRIVATE_ENDPOINT_FIELD_NUMBER;
+ hash = (53 * hash) + getPrivateEndpoint().hashCode();
+ hash = (37 * hash) + PUBLIC_ENDPOINT_FIELD_NUMBER;
+ hash = (53 * hash) + getPublicEndpoint().hashCode();
+ hash = (29 * hash) + unknownFields.hashCode();
+ memoizedHashCode = hash;
+ return hash;
+ }
+
+ public static com.google.container.v1.PrivateClusterConfig parseFrom(
+ java.nio.ByteBuffer data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static com.google.container.v1.PrivateClusterConfig parseFrom(
+ java.nio.ByteBuffer data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static com.google.container.v1.PrivateClusterConfig parseFrom(
+ com.google.protobuf.ByteString data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static com.google.container.v1.PrivateClusterConfig parseFrom(
+ com.google.protobuf.ByteString data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static com.google.container.v1.PrivateClusterConfig parseFrom(byte[] data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static com.google.container.v1.PrivateClusterConfig parseFrom(
+ byte[] data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static com.google.container.v1.PrivateClusterConfig parseFrom(java.io.InputStream input)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseWithIOException(PARSER, input);
+ }
+ public static com.google.container.v1.PrivateClusterConfig parseFrom(
+ java.io.InputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseWithIOException(PARSER, input, extensionRegistry);
+ }
+ public static com.google.container.v1.PrivateClusterConfig parseDelimitedFrom(java.io.InputStream input)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseDelimitedWithIOException(PARSER, input);
+ }
+ public static com.google.container.v1.PrivateClusterConfig parseDelimitedFrom(
+ java.io.InputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+ }
+ public static com.google.container.v1.PrivateClusterConfig parseFrom(
+ com.google.protobuf.CodedInputStream input)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseWithIOException(PARSER, input);
+ }
+ public static com.google.container.v1.PrivateClusterConfig parseFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseWithIOException(PARSER, input, extensionRegistry);
+ }
+
+ @java.lang.Override
+ public Builder newBuilderForType() { return newBuilder(); }
+ public static Builder newBuilder() {
+ return DEFAULT_INSTANCE.toBuilder();
+ }
+ public static Builder newBuilder(com.google.container.v1.PrivateClusterConfig prototype) {
+ return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+ }
+ @java.lang.Override
+ public Builder toBuilder() {
+ return this == DEFAULT_INSTANCE
+ ? new Builder() : new Builder().mergeFrom(this);
+ }
+
+ @java.lang.Override
+ protected Builder newBuilderForType(
+ com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+ Builder builder = new Builder(parent);
+ return builder;
+ }
+ /**
+ *
+ * Configuration options for private clusters.
+ *
+ *
+ * Protobuf type {@code google.container.v1.PrivateClusterConfig}
+ */
+ public static final class Builder extends
+ com.google.protobuf.GeneratedMessageV3.Builder implements
+ // @@protoc_insertion_point(builder_implements:google.container.v1.PrivateClusterConfig)
+ com.google.container.v1.PrivateClusterConfigOrBuilder {
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_PrivateClusterConfig_descriptor;
+ }
+
+ @java.lang.Override
+ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_PrivateClusterConfig_fieldAccessorTable
+ .ensureFieldAccessorsInitialized(
+ com.google.container.v1.PrivateClusterConfig.class, com.google.container.v1.PrivateClusterConfig.Builder.class);
+ }
+
+ // Construct using com.google.container.v1.PrivateClusterConfig.newBuilder()
+ private Builder() {
+ maybeForceBuilderInitialization();
+ }
+
+ private Builder(
+ com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+ super(parent);
+ maybeForceBuilderInitialization();
+ }
+ private void maybeForceBuilderInitialization() {
+ if (com.google.protobuf.GeneratedMessageV3
+ .alwaysUseFieldBuilders) {
+ }
+ }
+ @java.lang.Override
+ public Builder clear() {
+ super.clear();
+ enablePrivateNodes_ = false;
+
+ enablePrivateEndpoint_ = false;
+
+ masterIpv4CidrBlock_ = "";
+
+ privateEndpoint_ = "";
+
+ publicEndpoint_ = "";
+
+ return this;
+ }
+
+ @java.lang.Override
+ public com.google.protobuf.Descriptors.Descriptor
+ getDescriptorForType() {
+ return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_PrivateClusterConfig_descriptor;
+ }
+
+ @java.lang.Override
+ public com.google.container.v1.PrivateClusterConfig getDefaultInstanceForType() {
+ return com.google.container.v1.PrivateClusterConfig.getDefaultInstance();
+ }
+
+ @java.lang.Override
+ public com.google.container.v1.PrivateClusterConfig build() {
+ com.google.container.v1.PrivateClusterConfig result = buildPartial();
+ if (!result.isInitialized()) {
+ throw newUninitializedMessageException(result);
+ }
+ return result;
+ }
+
+ @java.lang.Override
+ public com.google.container.v1.PrivateClusterConfig buildPartial() {
+ com.google.container.v1.PrivateClusterConfig result = new com.google.container.v1.PrivateClusterConfig(this);
+ result.enablePrivateNodes_ = enablePrivateNodes_;
+ result.enablePrivateEndpoint_ = enablePrivateEndpoint_;
+ result.masterIpv4CidrBlock_ = masterIpv4CidrBlock_;
+ result.privateEndpoint_ = privateEndpoint_;
+ result.publicEndpoint_ = publicEndpoint_;
+ onBuilt();
+ return result;
+ }
+
+ @java.lang.Override
+ public Builder clone() {
+ return (Builder) super.clone();
+ }
+ @java.lang.Override
+ public Builder setField(
+ com.google.protobuf.Descriptors.FieldDescriptor field,
+ java.lang.Object value) {
+ return (Builder) super.setField(field, value);
+ }
+ @java.lang.Override
+ public Builder clearField(
+ com.google.protobuf.Descriptors.FieldDescriptor field) {
+ return (Builder) super.clearField(field);
+ }
+ @java.lang.Override
+ public Builder clearOneof(
+ com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+ return (Builder) super.clearOneof(oneof);
+ }
+ @java.lang.Override
+ public Builder setRepeatedField(
+ com.google.protobuf.Descriptors.FieldDescriptor field,
+ int index, java.lang.Object value) {
+ return (Builder) super.setRepeatedField(field, index, value);
+ }
+ @java.lang.Override
+ public Builder addRepeatedField(
+ com.google.protobuf.Descriptors.FieldDescriptor field,
+ java.lang.Object value) {
+ return (Builder) super.addRepeatedField(field, value);
+ }
+ @java.lang.Override
+ public Builder mergeFrom(com.google.protobuf.Message other) {
+ if (other instanceof com.google.container.v1.PrivateClusterConfig) {
+ return mergeFrom((com.google.container.v1.PrivateClusterConfig)other);
+ } else {
+ super.mergeFrom(other);
+ return this;
+ }
+ }
+
+ public Builder mergeFrom(com.google.container.v1.PrivateClusterConfig other) {
+ if (other == com.google.container.v1.PrivateClusterConfig.getDefaultInstance()) return this;
+ if (other.getEnablePrivateNodes() != false) {
+ setEnablePrivateNodes(other.getEnablePrivateNodes());
+ }
+ if (other.getEnablePrivateEndpoint() != false) {
+ setEnablePrivateEndpoint(other.getEnablePrivateEndpoint());
+ }
+ if (!other.getMasterIpv4CidrBlock().isEmpty()) {
+ masterIpv4CidrBlock_ = other.masterIpv4CidrBlock_;
+ onChanged();
+ }
+ if (!other.getPrivateEndpoint().isEmpty()) {
+ privateEndpoint_ = other.privateEndpoint_;
+ onChanged();
+ }
+ if (!other.getPublicEndpoint().isEmpty()) {
+ publicEndpoint_ = other.publicEndpoint_;
+ onChanged();
+ }
+ this.mergeUnknownFields(other.unknownFields);
+ onChanged();
+ return this;
+ }
+
+ @java.lang.Override
+ public final boolean isInitialized() {
+ return true;
+ }
+
+ @java.lang.Override
+ public Builder mergeFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ com.google.container.v1.PrivateClusterConfig parsedMessage = null;
+ try {
+ parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+ } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ parsedMessage = (com.google.container.v1.PrivateClusterConfig) e.getUnfinishedMessage();
+ throw e.unwrapIOException();
+ } finally {
+ if (parsedMessage != null) {
+ mergeFrom(parsedMessage);
+ }
+ }
+ return this;
+ }
+
+ private boolean enablePrivateNodes_ ;
+ /**
+ *
+ * Whether nodes have internal IP addresses only. If enabled, all nodes are
+ * given only RFC 1918 private addresses and communicate with the master via
+ * private networking.
+ *
+ *
+ * bool enable_private_nodes = 1;
+ */
+ public boolean getEnablePrivateNodes() {
+ return enablePrivateNodes_;
+ }
+ /**
+ *
+ * Whether nodes have internal IP addresses only. If enabled, all nodes are
+ * given only RFC 1918 private addresses and communicate with the master via
+ * private networking.
+ *
+ *
+ * bool enable_private_nodes = 1;
+ */
+ public Builder setEnablePrivateNodes(boolean value) {
+
+ enablePrivateNodes_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * Whether nodes have internal IP addresses only. If enabled, all nodes are
+ * given only RFC 1918 private addresses and communicate with the master via
+ * private networking.
+ *
+ *
+ * bool enable_private_nodes = 1;
+ */
+ public Builder clearEnablePrivateNodes() {
+
+ enablePrivateNodes_ = false;
+ onChanged();
+ return this;
+ }
+
+ private boolean enablePrivateEndpoint_ ;
+ /**
+ *
+ * Whether the master's internal IP address is used as the cluster endpoint.
+ *
+ *
+ * bool enable_private_endpoint = 2;
+ */
+ public boolean getEnablePrivateEndpoint() {
+ return enablePrivateEndpoint_;
+ }
+ /**
+ *
+ * Whether the master's internal IP address is used as the cluster endpoint.
+ *
+ *
+ * bool enable_private_endpoint = 2;
+ */
+ public Builder setEnablePrivateEndpoint(boolean value) {
+
+ enablePrivateEndpoint_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * Whether the master's internal IP address is used as the cluster endpoint.
+ *
+ *
+ * bool enable_private_endpoint = 2;
+ */
+ public Builder clearEnablePrivateEndpoint() {
+
+ enablePrivateEndpoint_ = false;
+ onChanged();
+ return this;
+ }
+
+ private java.lang.Object masterIpv4CidrBlock_ = "";
+ /**
+ *
+ * The IP range in CIDR notation to use for the hosted master network. This
+ * range will be used for assigning internal IP addresses to the master or
+ * set of masters, as well as the ILB VIP. This range must not overlap with
+ * any other ranges in use within the cluster's network.
+ *
+ *
+ * string master_ipv4_cidr_block = 3;
+ */
+ public java.lang.String getMasterIpv4CidrBlock() {
+ java.lang.Object ref = masterIpv4CidrBlock_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ masterIpv4CidrBlock_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ *
+ * The IP range in CIDR notation to use for the hosted master network. This
+ * range will be used for assigning internal IP addresses to the master or
+ * set of masters, as well as the ILB VIP. This range must not overlap with
+ * any other ranges in use within the cluster's network.
+ *
+ *
+ * string master_ipv4_cidr_block = 3;
+ */
+ public com.google.protobuf.ByteString
+ getMasterIpv4CidrBlockBytes() {
+ java.lang.Object ref = masterIpv4CidrBlock_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ masterIpv4CidrBlock_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ *
+ * The IP range in CIDR notation to use for the hosted master network. This
+ * range will be used for assigning internal IP addresses to the master or
+ * set of masters, as well as the ILB VIP. This range must not overlap with
+ * any other ranges in use within the cluster's network.
+ *
+ *
+ * string master_ipv4_cidr_block = 3;
+ */
+ public Builder setMasterIpv4CidrBlock(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ masterIpv4CidrBlock_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * The IP range in CIDR notation to use for the hosted master network. This
+ * range will be used for assigning internal IP addresses to the master or
+ * set of masters, as well as the ILB VIP. This range must not overlap with
+ * any other ranges in use within the cluster's network.
+ *
+ *
+ * string master_ipv4_cidr_block = 3;
+ */
+ public Builder clearMasterIpv4CidrBlock() {
+
+ masterIpv4CidrBlock_ = getDefaultInstance().getMasterIpv4CidrBlock();
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * The IP range in CIDR notation to use for the hosted master network. This
+ * range will be used for assigning internal IP addresses to the master or
+ * set of masters, as well as the ILB VIP. This range must not overlap with
+ * any other ranges in use within the cluster's network.
+ *
+ *
+ * string master_ipv4_cidr_block = 3;
+ */
+ public Builder setMasterIpv4CidrBlockBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ masterIpv4CidrBlock_ = value;
+ onChanged();
+ return this;
+ }
+
+ private java.lang.Object privateEndpoint_ = "";
+ /**
+ *
+ * Output only. The internal IP address of this cluster's master endpoint.
+ *
+ *
+ * string private_endpoint = 4;
+ */
+ public java.lang.String getPrivateEndpoint() {
+ java.lang.Object ref = privateEndpoint_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ privateEndpoint_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ *
+ * Output only. The internal IP address of this cluster's master endpoint.
+ *
+ *
+ * string private_endpoint = 4;
+ */
+ public com.google.protobuf.ByteString
+ getPrivateEndpointBytes() {
+ java.lang.Object ref = privateEndpoint_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ privateEndpoint_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ *
+ * Output only. The internal IP address of this cluster's master endpoint.
+ *
+ *
+ * string private_endpoint = 4;
+ */
+ public Builder setPrivateEndpoint(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ privateEndpoint_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * Output only. The internal IP address of this cluster's master endpoint.
+ *
+ *
+ * string private_endpoint = 4;
+ */
+ public Builder clearPrivateEndpoint() {
+
+ privateEndpoint_ = getDefaultInstance().getPrivateEndpoint();
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * Output only. The internal IP address of this cluster's master endpoint.
+ *
+ *
+ * string private_endpoint = 4;
+ */
+ public Builder setPrivateEndpointBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ privateEndpoint_ = value;
+ onChanged();
+ return this;
+ }
+
+ private java.lang.Object publicEndpoint_ = "";
+ /**
+ *
+ * Output only. The external IP address of this cluster's master endpoint.
+ *
+ *
+ * string public_endpoint = 5;
+ */
+ public java.lang.String getPublicEndpoint() {
+ java.lang.Object ref = publicEndpoint_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ publicEndpoint_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ *
+ * Output only. The external IP address of this cluster's master endpoint.
+ *
+ *
+ * string public_endpoint = 5;
+ */
+ public com.google.protobuf.ByteString
+ getPublicEndpointBytes() {
+ java.lang.Object ref = publicEndpoint_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ publicEndpoint_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ *
+ * Output only. The external IP address of this cluster's master endpoint.
+ *
+ *
+ * string public_endpoint = 5;
+ */
+ public Builder setPublicEndpoint(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ publicEndpoint_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * Output only. The external IP address of this cluster's master endpoint.
+ *
+ *
+ * string public_endpoint = 5;
+ */
+ public Builder clearPublicEndpoint() {
+
+ publicEndpoint_ = getDefaultInstance().getPublicEndpoint();
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * Output only. The external IP address of this cluster's master endpoint.
+ *
+ *
+ * string public_endpoint = 5;
+ */
+ public Builder setPublicEndpointBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ publicEndpoint_ = value;
+ onChanged();
+ return this;
+ }
+ @java.lang.Override
+ public final Builder setUnknownFields(
+ final com.google.protobuf.UnknownFieldSet unknownFields) {
+ return super.setUnknownFieldsProto3(unknownFields);
+ }
+
+ @java.lang.Override
+ public final Builder mergeUnknownFields(
+ final com.google.protobuf.UnknownFieldSet unknownFields) {
+ return super.mergeUnknownFields(unknownFields);
+ }
+
+
+ // @@protoc_insertion_point(builder_scope:google.container.v1.PrivateClusterConfig)
+ }
+
+ // @@protoc_insertion_point(class_scope:google.container.v1.PrivateClusterConfig)
+ private static final com.google.container.v1.PrivateClusterConfig DEFAULT_INSTANCE;
+ static {
+ DEFAULT_INSTANCE = new com.google.container.v1.PrivateClusterConfig();
+ }
+
+ public static com.google.container.v1.PrivateClusterConfig getDefaultInstance() {
+ return DEFAULT_INSTANCE;
+ }
+
+ private static final com.google.protobuf.Parser
+ PARSER = new com.google.protobuf.AbstractParser() {
+ @java.lang.Override
+ public PrivateClusterConfig parsePartialFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return new PrivateClusterConfig(input, extensionRegistry);
+ }
+ };
+
+ public static com.google.protobuf.Parser parser() {
+ return PARSER;
+ }
+
+ @java.lang.Override
+ public com.google.protobuf.Parser getParserForType() {
+ return PARSER;
+ }
+
+ @java.lang.Override
+ public com.google.container.v1.PrivateClusterConfig getDefaultInstanceForType() {
+ return DEFAULT_INSTANCE;
+ }
+
+}
+
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/PrivateClusterConfigOrBuilder.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/PrivateClusterConfigOrBuilder.java
new file mode 100644
index 000000000000..47e99ccc1540
--- /dev/null
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/PrivateClusterConfigOrBuilder.java
@@ -0,0 +1,89 @@
+// Generated by the protocol buffer compiler. DO NOT EDIT!
+// source: google/container/v1/cluster_service.proto
+
+package com.google.container.v1;
+
+public interface PrivateClusterConfigOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:google.container.v1.PrivateClusterConfig)
+ com.google.protobuf.MessageOrBuilder {
+
+ /**
+ *
+ * Whether nodes have internal IP addresses only. If enabled, all nodes are
+ * given only RFC 1918 private addresses and communicate with the master via
+ * private networking.
+ *
+ *
+ * bool enable_private_nodes = 1;
+ */
+ boolean getEnablePrivateNodes();
+
+ /**
+ *
+ * Whether the master's internal IP address is used as the cluster endpoint.
+ *
+ *
+ * bool enable_private_endpoint = 2;
+ */
+ boolean getEnablePrivateEndpoint();
+
+ /**
+ *
+ * The IP range in CIDR notation to use for the hosted master network. This
+ * range will be used for assigning internal IP addresses to the master or
+ * set of masters, as well as the ILB VIP. This range must not overlap with
+ * any other ranges in use within the cluster's network.
+ *
+ *
+ * string master_ipv4_cidr_block = 3;
+ */
+ java.lang.String getMasterIpv4CidrBlock();
+ /**
+ *
+ * The IP range in CIDR notation to use for the hosted master network. This
+ * range will be used for assigning internal IP addresses to the master or
+ * set of masters, as well as the ILB VIP. This range must not overlap with
+ * any other ranges in use within the cluster's network.
+ *
+ *
+ * string master_ipv4_cidr_block = 3;
+ */
+ com.google.protobuf.ByteString
+ getMasterIpv4CidrBlockBytes();
+
+ /**
+ *
+ * Output only. The internal IP address of this cluster's master endpoint.
+ *
+ *
+ * string private_endpoint = 4;
+ */
+ java.lang.String getPrivateEndpoint();
+ /**
+ *
+ * Output only. The internal IP address of this cluster's master endpoint.
+ *
+ *
+ * string private_endpoint = 4;
+ */
+ com.google.protobuf.ByteString
+ getPrivateEndpointBytes();
+
+ /**
+ *
+ * Output only. The external IP address of this cluster's master endpoint.
+ *
+ *
+ * string public_endpoint = 5;
+ */
+ java.lang.String getPublicEndpoint();
+ /**
+ *
+ * Output only. The external IP address of this cluster's master endpoint.
+ *
+ *
+ * string public_endpoint = 5;
+ */
+ com.google.protobuf.ByteString
+ getPublicEndpointBytes();
+}
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/RollbackNodePoolUpgradeRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/RollbackNodePoolUpgradeRequest.java
index 7777458999a0..43be86b84476 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/RollbackNodePoolUpgradeRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/RollbackNodePoolUpgradeRequest.java
@@ -26,6 +26,7 @@ private RollbackNodePoolUpgradeRequest() {
zone_ = "";
clusterId_ = "";
nodePoolId_ = "";
+ name_ = "";
}
@java.lang.Override
@@ -76,6 +77,12 @@ private RollbackNodePoolUpgradeRequest(
nodePoolId_ = s;
break;
}
+ case 50: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ name_ = s;
+ break;
+ }
default: {
if (!parseUnknownFieldProto3(
input, unknownFields, extensionRegistry, tag)) {
@@ -112,13 +119,14 @@ private RollbackNodePoolUpgradeRequest(
private volatile java.lang.Object projectId_;
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -132,13 +140,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
@@ -156,14 +165,15 @@ public java.lang.String getProjectId() {
private volatile java.lang.Object zone_;
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -177,14 +187,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
@@ -202,12 +213,13 @@ public java.lang.String getZone() {
private volatile java.lang.Object clusterId_;
/**
*
- * The name of the cluster to rollback.
+ * Deprecated. The name of the cluster to rollback.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public java.lang.String getClusterId() {
+ @java.lang.Deprecated public java.lang.String getClusterId() {
java.lang.Object ref = clusterId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -221,12 +233,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster to rollback.
+ * Deprecated. The name of the cluster to rollback.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIdBytes() {
java.lang.Object ref = clusterId_;
if (ref instanceof java.lang.String) {
@@ -244,12 +257,13 @@ public java.lang.String getClusterId() {
private volatile java.lang.Object nodePoolId_;
/**
*
- * The name of the node pool to rollback.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public java.lang.String getNodePoolId() {
+ @java.lang.Deprecated public java.lang.String getNodePoolId() {
java.lang.Object ref = nodePoolId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -263,12 +277,13 @@ public java.lang.String getNodePoolId() {
}
/**
*
- * The name of the node pool to rollback.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getNodePoolIdBytes() {
java.lang.Object ref = nodePoolId_;
if (ref instanceof java.lang.String) {
@@ -282,6 +297,52 @@ public java.lang.String getNodePoolId() {
}
}
+ public static final int NAME_FIELD_NUMBER = 6;
+ private volatile java.lang.Object name_;
+ /**
+ *
+ * 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;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ }
+ }
+ /**
+ *
+ * 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;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -308,6 +369,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
if (!getNodePoolIdBytes().isEmpty()) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 4, nodePoolId_);
}
+ if (!getNameBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 6, name_);
+ }
unknownFields.writeTo(output);
}
@@ -329,6 +393,9 @@ public int getSerializedSize() {
if (!getNodePoolIdBytes().isEmpty()) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, nodePoolId_);
}
+ if (!getNameBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, name_);
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -353,6 +420,8 @@ public boolean equals(final java.lang.Object obj) {
.equals(other.getClusterId());
result = result && getNodePoolId()
.equals(other.getNodePoolId());
+ result = result && getName()
+ .equals(other.getName());
result = result && unknownFields.equals(other.unknownFields);
return result;
}
@@ -372,6 +441,8 @@ public int hashCode() {
hash = (53 * hash) + getClusterId().hashCode();
hash = (37 * hash) + NODE_POOL_ID_FIELD_NUMBER;
hash = (53 * hash) + getNodePoolId().hashCode();
+ hash = (37 * hash) + NAME_FIELD_NUMBER;
+ hash = (53 * hash) + getName().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -519,6 +590,8 @@ public Builder clear() {
nodePoolId_ = "";
+ name_ = "";
+
return this;
}
@@ -549,6 +622,7 @@ public com.google.container.v1.RollbackNodePoolUpgradeRequest buildPartial() {
result.zone_ = zone_;
result.clusterId_ = clusterId_;
result.nodePoolId_ = nodePoolId_;
+ result.name_ = name_;
onBuilt();
return result;
}
@@ -613,6 +687,10 @@ public Builder mergeFrom(com.google.container.v1.RollbackNodePoolUpgradeRequest
nodePoolId_ = other.nodePoolId_;
onChanged();
}
+ if (!other.getName().isEmpty()) {
+ name_ = other.name_;
+ onChanged();
+ }
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -645,13 +723,14 @@ public Builder mergeFrom(
private java.lang.Object projectId_ = "";
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -665,13 +744,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof String) {
@@ -686,13 +766,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectId(
+ @java.lang.Deprecated public Builder setProjectId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -704,13 +785,14 @@ public Builder setProjectId(
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder clearProjectId() {
+ @java.lang.Deprecated public Builder clearProjectId() {
projectId_ = getDefaultInstance().getProjectId();
onChanged();
@@ -718,13 +800,14 @@ public Builder clearProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectIdBytes(
+ @java.lang.Deprecated public Builder setProjectIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -739,14 +822,15 @@ public Builder setProjectIdBytes(
private java.lang.Object zone_ = "";
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -760,14 +844,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof String) {
@@ -782,14 +867,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZone(
+ @java.lang.Deprecated public Builder setZone(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -801,14 +887,15 @@ public Builder setZone(
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder clearZone() {
+ @java.lang.Deprecated public Builder clearZone() {
zone_ = getDefaultInstance().getZone();
onChanged();
@@ -816,14 +903,15 @@ public Builder clearZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZoneBytes(
+ @java.lang.Deprecated public Builder setZoneBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -838,12 +926,13 @@ public Builder setZoneBytes(
private java.lang.Object clusterId_ = "";
/**
*
- * The name of the cluster to rollback.
+ * Deprecated. The name of the cluster to rollback.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public java.lang.String getClusterId() {
+ @java.lang.Deprecated public java.lang.String getClusterId() {
java.lang.Object ref = clusterId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -857,12 +946,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster to rollback.
+ * Deprecated. The name of the cluster to rollback.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIdBytes() {
java.lang.Object ref = clusterId_;
if (ref instanceof String) {
@@ -877,12 +967,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster to rollback.
+ * Deprecated. The name of the cluster to rollback.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder setClusterId(
+ @java.lang.Deprecated public Builder setClusterId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -894,12 +985,13 @@ public Builder setClusterId(
}
/**
*
- * The name of the cluster to rollback.
+ * Deprecated. The name of the cluster to rollback.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder clearClusterId() {
+ @java.lang.Deprecated public Builder clearClusterId() {
clusterId_ = getDefaultInstance().getClusterId();
onChanged();
@@ -907,12 +999,13 @@ public Builder clearClusterId() {
}
/**
*
- * The name of the cluster to rollback.
+ * Deprecated. The name of the cluster to rollback.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder setClusterIdBytes(
+ @java.lang.Deprecated public Builder setClusterIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -927,12 +1020,13 @@ public Builder setClusterIdBytes(
private java.lang.Object nodePoolId_ = "";
/**
*
- * The name of the node pool to rollback.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public java.lang.String getNodePoolId() {
+ @java.lang.Deprecated public java.lang.String getNodePoolId() {
java.lang.Object ref = nodePoolId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -946,12 +1040,13 @@ public java.lang.String getNodePoolId() {
}
/**
*
- * The name of the node pool to rollback.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getNodePoolIdBytes() {
java.lang.Object ref = nodePoolId_;
if (ref instanceof String) {
@@ -966,12 +1061,13 @@ public java.lang.String getNodePoolId() {
}
/**
*
- * The name of the node pool to rollback.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public Builder setNodePoolId(
+ @java.lang.Deprecated public Builder setNodePoolId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -983,12 +1079,13 @@ public Builder setNodePoolId(
}
/**
*
- * The name of the node pool to rollback.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public Builder clearNodePoolId() {
+ @java.lang.Deprecated public Builder clearNodePoolId() {
nodePoolId_ = getDefaultInstance().getNodePoolId();
onChanged();
@@ -996,12 +1093,13 @@ public Builder clearNodePoolId() {
}
/**
*
- * The name of the node pool to rollback.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public Builder setNodePoolIdBytes(
+ @java.lang.Deprecated public Builder setNodePoolIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -1012,6 +1110,105 @@ public Builder setNodePoolIdBytes(
onChanged();
return this;
}
+
+ private java.lang.Object name_ = "";
+ /**
+ *
+ * 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;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ *
+ * 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;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ *
+ * 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;
+ */
+ public Builder setName(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * 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;
+ */
+ public Builder clearName() {
+
+ name_ = getDefaultInstance().getName();
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * 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;
+ */
+ public Builder setNameBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/RollbackNodePoolUpgradeRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/RollbackNodePoolUpgradeRequestOrBuilder.java
index 02343da75af2..ec2e63cb0dbd 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/RollbackNodePoolUpgradeRequestOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/RollbackNodePoolUpgradeRequestOrBuilder.java
@@ -9,79 +9,109 @@ public interface RollbackNodePoolUpgradeRequestOrBuilder extends
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- java.lang.String getProjectId();
+ @java.lang.Deprecated java.lang.String getProjectId();
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getProjectIdBytes();
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- java.lang.String getZone();
+ @java.lang.Deprecated java.lang.String getZone();
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getZoneBytes();
/**
*
- * The name of the cluster to rollback.
+ * Deprecated. The name of the cluster to rollback.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- java.lang.String getClusterId();
+ @java.lang.Deprecated java.lang.String getClusterId();
/**
*
- * The name of the cluster to rollback.
+ * Deprecated. The name of the cluster to rollback.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getClusterIdBytes();
/**
*
- * The name of the node pool to rollback.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- java.lang.String getNodePoolId();
+ @java.lang.Deprecated java.lang.String getNodePoolId();
/**
*
- * The name of the node pool to rollback.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getNodePoolIdBytes();
+
+ /**
+ *
+ * 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;
+ */
+ java.lang.String getName();
+ /**
+ *
+ * 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;
+ */
+ com.google.protobuf.ByteString
+ getNameBytes();
}
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ServerConfig.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ServerConfig.java
index 5ec8e647e790..e1677a1d7f86 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ServerConfig.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ServerConfig.java
@@ -5,7 +5,7 @@
/**
*
- * Container Engine service configuration.
+ * Kubernetes Engine service configuration.
*
*
* Protobuf type {@code google.container.v1.ServerConfig}
@@ -569,7 +569,7 @@ protected Builder newBuilderForType(
}
/**
*
- * Container Engine service configuration.
+ * Kubernetes Engine service configuration.
*
*
* Protobuf type {@code google.container.v1.ServerConfig}
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetAddonsConfigRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetAddonsConfigRequest.java
index 0de7532c2965..70be765d8e9f 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetAddonsConfigRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetAddonsConfigRequest.java
@@ -23,6 +23,7 @@ private SetAddonsConfigRequest() {
projectId_ = "";
zone_ = "";
clusterId_ = "";
+ name_ = "";
}
@java.lang.Override
@@ -80,6 +81,12 @@ private SetAddonsConfigRequest(
break;
}
+ case 50: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ name_ = s;
+ break;
+ }
default: {
if (!parseUnknownFieldProto3(
input, unknownFields, extensionRegistry, tag)) {
@@ -116,13 +123,14 @@ private SetAddonsConfigRequest(
private volatile java.lang.Object projectId_;
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -136,13 +144,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
@@ -160,14 +169,15 @@ public java.lang.String getProjectId() {
private volatile java.lang.Object zone_;
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -181,14 +191,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
@@ -206,12 +217,13 @@ public java.lang.String getZone() {
private volatile java.lang.Object clusterId_;
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public java.lang.String getClusterId() {
+ @java.lang.Deprecated public java.lang.String getClusterId() {
java.lang.Object ref = clusterId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -225,12 +237,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIdBytes() {
java.lang.Object ref = clusterId_;
if (ref instanceof java.lang.String) {
@@ -280,6 +293,50 @@ public com.google.container.v1.AddonsConfigOrBuilder getAddonsConfigOrBuilder()
return getAddonsConfig();
}
+ public static final int NAME_FIELD_NUMBER = 6;
+ private volatile java.lang.Object name_;
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to set addons.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ }
+ }
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to set addons.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -306,6 +363,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
if (addonsConfig_ != null) {
output.writeMessage(4, getAddonsConfig());
}
+ if (!getNameBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 6, name_);
+ }
unknownFields.writeTo(output);
}
@@ -328,6 +388,9 @@ public int getSerializedSize() {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(4, getAddonsConfig());
}
+ if (!getNameBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, name_);
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -355,6 +418,8 @@ public boolean equals(final java.lang.Object obj) {
result = result && getAddonsConfig()
.equals(other.getAddonsConfig());
}
+ result = result && getName()
+ .equals(other.getName());
result = result && unknownFields.equals(other.unknownFields);
return result;
}
@@ -376,6 +441,8 @@ public int hashCode() {
hash = (37 * hash) + ADDONS_CONFIG_FIELD_NUMBER;
hash = (53 * hash) + getAddonsConfig().hashCode();
}
+ hash = (37 * hash) + NAME_FIELD_NUMBER;
+ hash = (53 * hash) + getName().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -525,6 +592,8 @@ public Builder clear() {
addonsConfig_ = null;
addonsConfigBuilder_ = null;
}
+ name_ = "";
+
return this;
}
@@ -559,6 +628,7 @@ public com.google.container.v1.SetAddonsConfigRequest buildPartial() {
} else {
result.addonsConfig_ = addonsConfigBuilder_.build();
}
+ result.name_ = name_;
onBuilt();
return result;
}
@@ -622,6 +692,10 @@ public Builder mergeFrom(com.google.container.v1.SetAddonsConfigRequest other) {
if (other.hasAddonsConfig()) {
mergeAddonsConfig(other.getAddonsConfig());
}
+ if (!other.getName().isEmpty()) {
+ name_ = other.name_;
+ onChanged();
+ }
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -654,13 +728,14 @@ public Builder mergeFrom(
private java.lang.Object projectId_ = "";
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -674,13 +749,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof String) {
@@ -695,13 +771,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectId(
+ @java.lang.Deprecated public Builder setProjectId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -713,13 +790,14 @@ public Builder setProjectId(
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder clearProjectId() {
+ @java.lang.Deprecated public Builder clearProjectId() {
projectId_ = getDefaultInstance().getProjectId();
onChanged();
@@ -727,13 +805,14 @@ public Builder clearProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectIdBytes(
+ @java.lang.Deprecated public Builder setProjectIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -748,14 +827,15 @@ public Builder setProjectIdBytes(
private java.lang.Object zone_ = "";
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -769,14 +849,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof String) {
@@ -791,14 +872,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZone(
+ @java.lang.Deprecated public Builder setZone(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -810,14 +892,15 @@ public Builder setZone(
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder clearZone() {
+ @java.lang.Deprecated public Builder clearZone() {
zone_ = getDefaultInstance().getZone();
onChanged();
@@ -825,14 +908,15 @@ public Builder clearZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZoneBytes(
+ @java.lang.Deprecated public Builder setZoneBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -847,12 +931,13 @@ public Builder setZoneBytes(
private java.lang.Object clusterId_ = "";
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public java.lang.String getClusterId() {
+ @java.lang.Deprecated public java.lang.String getClusterId() {
java.lang.Object ref = clusterId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -866,12 +951,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIdBytes() {
java.lang.Object ref = clusterId_;
if (ref instanceof String) {
@@ -886,12 +972,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder setClusterId(
+ @java.lang.Deprecated public Builder setClusterId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -903,12 +990,13 @@ public Builder setClusterId(
}
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder clearClusterId() {
+ @java.lang.Deprecated public Builder clearClusterId() {
clusterId_ = getDefaultInstance().getClusterId();
onChanged();
@@ -916,12 +1004,13 @@ public Builder clearClusterId() {
}
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder setClusterIdBytes(
+ @java.lang.Deprecated public Builder setClusterIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -1094,6 +1183,100 @@ public com.google.container.v1.AddonsConfigOrBuilder getAddonsConfigOrBuilder()
}
return addonsConfigBuilder_;
}
+
+ private java.lang.Object name_ = "";
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to set addons.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to set addons.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to set addons.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ public Builder setName(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to set addons.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ public Builder clearName() {
+
+ name_ = getDefaultInstance().getName();
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to set addons.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ public Builder setNameBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetAddonsConfigRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetAddonsConfigRequestOrBuilder.java
index 0f9ee60cd278..fa2effff1d8c 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetAddonsConfigRequestOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetAddonsConfigRequestOrBuilder.java
@@ -9,62 +9,68 @@ public interface SetAddonsConfigRequestOrBuilder extends
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- java.lang.String getProjectId();
+ @java.lang.Deprecated java.lang.String getProjectId();
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getProjectIdBytes();
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- java.lang.String getZone();
+ @java.lang.Deprecated java.lang.String getZone();
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getZoneBytes();
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- java.lang.String getClusterId();
+ @java.lang.Deprecated java.lang.String getClusterId();
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getClusterIdBytes();
/**
@@ -94,4 +100,24 @@ public interface SetAddonsConfigRequestOrBuilder extends
* .google.container.v1.AddonsConfig addons_config = 4;
*/
com.google.container.v1.AddonsConfigOrBuilder getAddonsConfigOrBuilder();
+
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to set addons.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ java.lang.String getName();
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to set addons.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ com.google.protobuf.ByteString
+ getNameBytes();
}
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLabelsRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLabelsRequest.java
index f72557a9ff59..6f3c0e06848a 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLabelsRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLabelsRequest.java
@@ -26,6 +26,7 @@ private SetLabelsRequest() {
zone_ = "";
clusterId_ = "";
labelFingerprint_ = "";
+ name_ = "";
}
@java.lang.Override
@@ -89,6 +90,12 @@ private SetLabelsRequest(
labelFingerprint_ = s;
break;
}
+ case 58: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ name_ = s;
+ break;
+ }
default: {
if (!parseUnknownFieldProto3(
input, unknownFields, extensionRegistry, tag)) {
@@ -138,13 +145,14 @@ protected com.google.protobuf.MapField internalGetMapField(
private volatile java.lang.Object projectId_;
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -158,13 +166,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
@@ -182,14 +191,15 @@ public java.lang.String getProjectId() {
private volatile java.lang.Object zone_;
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -203,14 +213,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
@@ -228,12 +239,13 @@ public java.lang.String getZone() {
private volatile java.lang.Object clusterId_;
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public java.lang.String getClusterId() {
+ @java.lang.Deprecated public java.lang.String getClusterId() {
java.lang.Object ref = clusterId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -247,12 +259,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIdBytes() {
java.lang.Object ref = clusterId_;
if (ref instanceof java.lang.String) {
@@ -364,7 +377,7 @@ public java.lang.String getResourceLabelsOrThrow(
*
* The fingerprint of the previous set of labels for this resource,
* used to detect conflicts. The fingerprint is initially generated by
- * Container Engine and changes after every request to modify or update
+ * Kubernetes 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 <code>get()</code> request to the
* resource to get the latest fingerprint.
@@ -388,7 +401,7 @@ public java.lang.String getLabelFingerprint() {
*
* The fingerprint of the previous set of labels for this resource,
* used to detect conflicts. The fingerprint is initially generated by
- * Container Engine and changes after every request to modify or update
+ * Kubernetes 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 <code>get()</code> request to the
* resource to get the latest fingerprint.
@@ -410,6 +423,50 @@ public java.lang.String getLabelFingerprint() {
}
}
+ public static final int NAME_FIELD_NUMBER = 7;
+ private volatile java.lang.Object name_;
+ /**
+ *
+ * The name (project, location, cluster id) of the cluster to set labels.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 7;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ }
+ }
+ /**
+ *
+ * The name (project, location, cluster id) of the cluster to set labels.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 7;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -442,6 +499,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
if (!getLabelFingerprintBytes().isEmpty()) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 5, labelFingerprint_);
}
+ if (!getNameBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 7, name_);
+ }
unknownFields.writeTo(output);
}
@@ -473,6 +533,9 @@ public int getSerializedSize() {
if (!getLabelFingerprintBytes().isEmpty()) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, labelFingerprint_);
}
+ if (!getNameBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, name_);
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -499,6 +562,8 @@ public boolean equals(final java.lang.Object obj) {
other.internalGetResourceLabels());
result = result && getLabelFingerprint()
.equals(other.getLabelFingerprint());
+ result = result && getName()
+ .equals(other.getName());
result = result && unknownFields.equals(other.unknownFields);
return result;
}
@@ -522,6 +587,8 @@ public int hashCode() {
}
hash = (37 * hash) + LABEL_FINGERPRINT_FIELD_NUMBER;
hash = (53 * hash) + getLabelFingerprint().hashCode();
+ hash = (37 * hash) + NAME_FIELD_NUMBER;
+ hash = (53 * hash) + getName().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -692,6 +759,8 @@ public Builder clear() {
internalGetMutableResourceLabels().clear();
labelFingerprint_ = "";
+ name_ = "";
+
return this;
}
@@ -726,6 +795,7 @@ public com.google.container.v1.SetLabelsRequest buildPartial() {
result.resourceLabels_ = internalGetResourceLabels();
result.resourceLabels_.makeImmutable();
result.labelFingerprint_ = labelFingerprint_;
+ result.name_ = name_;
result.bitField0_ = to_bitField0_;
onBuilt();
return result;
@@ -793,6 +863,10 @@ public Builder mergeFrom(com.google.container.v1.SetLabelsRequest other) {
labelFingerprint_ = other.labelFingerprint_;
onChanged();
}
+ if (!other.getName().isEmpty()) {
+ name_ = other.name_;
+ onChanged();
+ }
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -826,13 +900,14 @@ public Builder mergeFrom(
private java.lang.Object projectId_ = "";
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -846,13 +921,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof String) {
@@ -867,13 +943,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectId(
+ @java.lang.Deprecated public Builder setProjectId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -885,13 +962,14 @@ public Builder setProjectId(
}
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder clearProjectId() {
+ @java.lang.Deprecated public Builder clearProjectId() {
projectId_ = getDefaultInstance().getProjectId();
onChanged();
@@ -899,13 +977,14 @@ public Builder clearProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectIdBytes(
+ @java.lang.Deprecated public Builder setProjectIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -920,14 +999,15 @@ public Builder setProjectIdBytes(
private java.lang.Object zone_ = "";
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -941,14 +1021,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof String) {
@@ -963,14 +1044,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZone(
+ @java.lang.Deprecated public Builder setZone(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -982,14 +1064,15 @@ public Builder setZone(
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder clearZone() {
+ @java.lang.Deprecated public Builder clearZone() {
zone_ = getDefaultInstance().getZone();
onChanged();
@@ -997,14 +1080,15 @@ public Builder clearZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZoneBytes(
+ @java.lang.Deprecated public Builder setZoneBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -1019,12 +1103,13 @@ public Builder setZoneBytes(
private java.lang.Object clusterId_ = "";
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public java.lang.String getClusterId() {
+ @java.lang.Deprecated public java.lang.String getClusterId() {
java.lang.Object ref = clusterId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -1038,12 +1123,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIdBytes() {
java.lang.Object ref = clusterId_;
if (ref instanceof String) {
@@ -1058,12 +1144,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder setClusterId(
+ @java.lang.Deprecated public Builder setClusterId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -1075,12 +1162,13 @@ public Builder setClusterId(
}
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder clearClusterId() {
+ @java.lang.Deprecated public Builder clearClusterId() {
clusterId_ = getDefaultInstance().getClusterId();
onChanged();
@@ -1088,12 +1176,13 @@ public Builder clearClusterId() {
}
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder setClusterIdBytes(
+ @java.lang.Deprecated public Builder setClusterIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -1261,7 +1350,7 @@ public Builder putAllResourceLabels(
*
* The fingerprint of the previous set of labels for this resource,
* used to detect conflicts. The fingerprint is initially generated by
- * Container Engine and changes after every request to modify or update
+ * Kubernetes 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 <code>get()</code> request to the
* resource to get the latest fingerprint.
@@ -1285,7 +1374,7 @@ public java.lang.String getLabelFingerprint() {
*
* The fingerprint of the previous set of labels for this resource,
* used to detect conflicts. The fingerprint is initially generated by
- * Container Engine and changes after every request to modify or update
+ * Kubernetes 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 <code>get()</code> request to the
* resource to get the latest fingerprint.
@@ -1310,7 +1399,7 @@ public java.lang.String getLabelFingerprint() {
*
* The fingerprint of the previous set of labels for this resource,
* used to detect conflicts. The fingerprint is initially generated by
- * Container Engine and changes after every request to modify or update
+ * Kubernetes 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 <code>get()</code> request to the
* resource to get the latest fingerprint.
@@ -1332,7 +1421,7 @@ public Builder setLabelFingerprint(
*
* The fingerprint of the previous set of labels for this resource,
* used to detect conflicts. The fingerprint is initially generated by
- * Container Engine and changes after every request to modify or update
+ * Kubernetes 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 <code>get()</code> request to the
* resource to get the latest fingerprint.
@@ -1350,7 +1439,7 @@ public Builder clearLabelFingerprint() {
*
* The fingerprint of the previous set of labels for this resource,
* used to detect conflicts. The fingerprint is initially generated by
- * Container Engine and changes after every request to modify or update
+ * Kubernetes 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 <code>get()</code> request to the
* resource to get the latest fingerprint.
@@ -1369,6 +1458,100 @@ public Builder setLabelFingerprintBytes(
onChanged();
return this;
}
+
+ private java.lang.Object name_ = "";
+ /**
+ *
+ * The name (project, location, cluster id) of the cluster to set labels.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 7;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ *
+ * The name (project, location, cluster id) of the cluster to set labels.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 7;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ *
+ * The name (project, location, cluster id) of the cluster to set labels.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 7;
+ */
+ public Builder setName(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * The name (project, location, cluster id) of the cluster to set labels.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 7;
+ */
+ public Builder clearName() {
+
+ name_ = getDefaultInstance().getName();
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * The name (project, location, cluster id) of the cluster to set labels.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 7;
+ */
+ public Builder setNameBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLabelsRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLabelsRequestOrBuilder.java
index 2cdc1b0b7b81..84dd57de7eff 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLabelsRequestOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLabelsRequestOrBuilder.java
@@ -9,62 +9,68 @@ public interface SetLabelsRequestOrBuilder extends
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- java.lang.String getProjectId();
+ @java.lang.Deprecated java.lang.String getProjectId();
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getProjectIdBytes();
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- java.lang.String getZone();
+ @java.lang.Deprecated java.lang.String getZone();
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getZoneBytes();
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- java.lang.String getClusterId();
+ @java.lang.Deprecated java.lang.String getClusterId();
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getClusterIdBytes();
/**
@@ -125,7 +131,7 @@ java.lang.String getResourceLabelsOrThrow(
*
* The fingerprint of the previous set of labels for this resource,
* used to detect conflicts. The fingerprint is initially generated by
- * Container Engine and changes after every request to modify or update
+ * Kubernetes 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 <code>get()</code> request to the
* resource to get the latest fingerprint.
@@ -138,7 +144,7 @@ java.lang.String getResourceLabelsOrThrow(
*
* The fingerprint of the previous set of labels for this resource,
* used to detect conflicts. The fingerprint is initially generated by
- * Container Engine and changes after every request to modify or update
+ * Kubernetes 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 <code>get()</code> request to the
* resource to get the latest fingerprint.
@@ -148,4 +154,24 @@ java.lang.String getResourceLabelsOrThrow(
*/
com.google.protobuf.ByteString
getLabelFingerprintBytes();
+
+ /**
+ *
+ * The name (project, location, cluster id) of the cluster to set labels.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 7;
+ */
+ java.lang.String getName();
+ /**
+ *
+ * The name (project, location, cluster id) of the cluster to set labels.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 7;
+ */
+ com.google.protobuf.ByteString
+ getNameBytes();
}
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLegacyAbacRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLegacyAbacRequest.java
index 05cf0e132e48..2dd4e6ea699b 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLegacyAbacRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLegacyAbacRequest.java
@@ -25,6 +25,7 @@ private SetLegacyAbacRequest() {
zone_ = "";
clusterId_ = "";
enabled_ = false;
+ name_ = "";
}
@java.lang.Override
@@ -74,6 +75,12 @@ private SetLegacyAbacRequest(
enabled_ = input.readBool();
break;
}
+ case 50: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ name_ = s;
+ break;
+ }
default: {
if (!parseUnknownFieldProto3(
input, unknownFields, extensionRegistry, tag)) {
@@ -110,13 +117,14 @@ private SetLegacyAbacRequest(
private volatile java.lang.Object projectId_;
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -130,13 +138,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
@@ -154,14 +163,15 @@ public java.lang.String getProjectId() {
private volatile java.lang.Object zone_;
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -175,14 +185,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
@@ -200,12 +211,13 @@ public java.lang.String getZone() {
private volatile java.lang.Object clusterId_;
/**
*
- * The name of the cluster to update.
+ * Deprecated. The name of the cluster to update.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public java.lang.String getClusterId() {
+ @java.lang.Deprecated public java.lang.String getClusterId() {
java.lang.Object ref = clusterId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -219,12 +231,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster to update.
+ * Deprecated. The name of the cluster to update.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIdBytes() {
java.lang.Object ref = clusterId_;
if (ref instanceof java.lang.String) {
@@ -251,6 +264,50 @@ public boolean getEnabled() {
return enabled_;
}
+ public static final int NAME_FIELD_NUMBER = 6;
+ private volatile java.lang.Object name_;
+ /**
+ *
+ * The name (project, location, cluster id) of the cluster to set legacy abac.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ }
+ }
+ /**
+ *
+ * The name (project, location, cluster id) of the cluster to set legacy abac.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -277,6 +334,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
if (enabled_ != false) {
output.writeBool(4, enabled_);
}
+ if (!getNameBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 6, name_);
+ }
unknownFields.writeTo(output);
}
@@ -299,6 +359,9 @@ public int getSerializedSize() {
size += com.google.protobuf.CodedOutputStream
.computeBoolSize(4, enabled_);
}
+ if (!getNameBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, name_);
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -323,6 +386,8 @@ public boolean equals(final java.lang.Object obj) {
.equals(other.getClusterId());
result = result && (getEnabled()
== other.getEnabled());
+ result = result && getName()
+ .equals(other.getName());
result = result && unknownFields.equals(other.unknownFields);
return result;
}
@@ -343,6 +408,8 @@ public int hashCode() {
hash = (37 * hash) + ENABLED_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
getEnabled());
+ hash = (37 * hash) + NAME_FIELD_NUMBER;
+ hash = (53 * hash) + getName().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -489,6 +556,8 @@ public Builder clear() {
enabled_ = false;
+ name_ = "";
+
return this;
}
@@ -519,6 +588,7 @@ public com.google.container.v1.SetLegacyAbacRequest buildPartial() {
result.zone_ = zone_;
result.clusterId_ = clusterId_;
result.enabled_ = enabled_;
+ result.name_ = name_;
onBuilt();
return result;
}
@@ -582,6 +652,10 @@ public Builder mergeFrom(com.google.container.v1.SetLegacyAbacRequest other) {
if (other.getEnabled() != false) {
setEnabled(other.getEnabled());
}
+ if (!other.getName().isEmpty()) {
+ name_ = other.name_;
+ onChanged();
+ }
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -614,13 +688,14 @@ public Builder mergeFrom(
private java.lang.Object projectId_ = "";
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -634,13 +709,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof String) {
@@ -655,13 +731,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectId(
+ @java.lang.Deprecated public Builder setProjectId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -673,13 +750,14 @@ public Builder setProjectId(
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder clearProjectId() {
+ @java.lang.Deprecated public Builder clearProjectId() {
projectId_ = getDefaultInstance().getProjectId();
onChanged();
@@ -687,13 +765,14 @@ public Builder clearProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectIdBytes(
+ @java.lang.Deprecated public Builder setProjectIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -708,14 +787,15 @@ public Builder setProjectIdBytes(
private java.lang.Object zone_ = "";
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -729,14 +809,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof String) {
@@ -751,14 +832,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZone(
+ @java.lang.Deprecated public Builder setZone(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -770,14 +852,15 @@ public Builder setZone(
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder clearZone() {
+ @java.lang.Deprecated public Builder clearZone() {
zone_ = getDefaultInstance().getZone();
onChanged();
@@ -785,14 +868,15 @@ public Builder clearZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZoneBytes(
+ @java.lang.Deprecated public Builder setZoneBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -807,12 +891,13 @@ public Builder setZoneBytes(
private java.lang.Object clusterId_ = "";
/**
*
- * The name of the cluster to update.
+ * Deprecated. The name of the cluster to update.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public java.lang.String getClusterId() {
+ @java.lang.Deprecated public java.lang.String getClusterId() {
java.lang.Object ref = clusterId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -826,12 +911,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster to update.
+ * Deprecated. The name of the cluster to update.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIdBytes() {
java.lang.Object ref = clusterId_;
if (ref instanceof String) {
@@ -846,12 +932,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster to update.
+ * Deprecated. The name of the cluster to update.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder setClusterId(
+ @java.lang.Deprecated public Builder setClusterId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -863,12 +950,13 @@ public Builder setClusterId(
}
/**
*
- * The name of the cluster to update.
+ * Deprecated. The name of the cluster to update.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder clearClusterId() {
+ @java.lang.Deprecated public Builder clearClusterId() {
clusterId_ = getDefaultInstance().getClusterId();
onChanged();
@@ -876,12 +964,13 @@ public Builder clearClusterId() {
}
/**
*
- * The name of the cluster to update.
+ * Deprecated. The name of the cluster to update.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder setClusterIdBytes(
+ @java.lang.Deprecated public Builder setClusterIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -930,6 +1019,100 @@ public Builder clearEnabled() {
onChanged();
return this;
}
+
+ private java.lang.Object name_ = "";
+ /**
+ *
+ * The name (project, location, cluster id) of the cluster to set legacy abac.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ *
+ * The name (project, location, cluster id) of the cluster to set legacy abac.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ *
+ * The name (project, location, cluster id) of the cluster to set legacy abac.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ public Builder setName(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * The name (project, location, cluster id) of the cluster to set legacy abac.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ public Builder clearName() {
+
+ name_ = getDefaultInstance().getName();
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * The name (project, location, cluster id) of the cluster to set legacy abac.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ public Builder setNameBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLegacyAbacRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLegacyAbacRequestOrBuilder.java
index 1e1c883ee247..1652c6560080 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLegacyAbacRequestOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLegacyAbacRequestOrBuilder.java
@@ -9,62 +9,68 @@ public interface SetLegacyAbacRequestOrBuilder extends
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- java.lang.String getProjectId();
+ @java.lang.Deprecated java.lang.String getProjectId();
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getProjectIdBytes();
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- java.lang.String getZone();
+ @java.lang.Deprecated java.lang.String getZone();
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getZoneBytes();
/**
*
- * The name of the cluster to update.
+ * Deprecated. The name of the cluster to update.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- java.lang.String getClusterId();
+ @java.lang.Deprecated java.lang.String getClusterId();
/**
*
- * The name of the cluster to update.
+ * Deprecated. The name of the cluster to update.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getClusterIdBytes();
/**
@@ -75,4 +81,24 @@ public interface SetLegacyAbacRequestOrBuilder extends
* bool enabled = 4;
*/
boolean getEnabled();
+
+ /**
+ *
+ * The name (project, location, cluster id) of the cluster to set legacy abac.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ java.lang.String getName();
+ /**
+ *
+ * The name (project, location, cluster id) of the cluster to set legacy abac.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ com.google.protobuf.ByteString
+ getNameBytes();
}
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLocationsRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLocationsRequest.java
index a45e1d33bfc3..c1fa2f415274 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLocationsRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLocationsRequest.java
@@ -24,6 +24,7 @@ private SetLocationsRequest() {
zone_ = "";
clusterId_ = "";
locations_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+ name_ = "";
}
@java.lang.Override
@@ -77,6 +78,12 @@ private SetLocationsRequest(
locations_.add(s);
break;
}
+ case 50: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ name_ = s;
+ break;
+ }
default: {
if (!parseUnknownFieldProto3(
input, unknownFields, extensionRegistry, tag)) {
@@ -117,13 +124,14 @@ private SetLocationsRequest(
private volatile java.lang.Object projectId_;
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -137,13 +145,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
@@ -161,14 +170,15 @@ public java.lang.String getProjectId() {
private volatile java.lang.Object zone_;
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -182,14 +192,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
@@ -207,12 +218,13 @@ public java.lang.String getZone() {
private volatile java.lang.Object clusterId_;
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public java.lang.String getClusterId() {
+ @java.lang.Deprecated public java.lang.String getClusterId() {
java.lang.Object ref = clusterId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -226,12 +238,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIdBytes() {
java.lang.Object ref = clusterId_;
if (ref instanceof java.lang.String) {
@@ -310,6 +323,50 @@ public java.lang.String getLocations(int index) {
return locations_.getByteString(index);
}
+ public static final int NAME_FIELD_NUMBER = 6;
+ private volatile java.lang.Object name_;
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to set locations.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ }
+ }
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to set locations.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -336,6 +393,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
for (int i = 0; i < locations_.size(); i++) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 4, locations_.getRaw(i));
}
+ if (!getNameBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 6, name_);
+ }
unknownFields.writeTo(output);
}
@@ -362,6 +422,9 @@ public int getSerializedSize() {
size += dataSize;
size += 1 * getLocationsList().size();
}
+ if (!getNameBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, name_);
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -386,6 +449,8 @@ public boolean equals(final java.lang.Object obj) {
.equals(other.getClusterId());
result = result && getLocationsList()
.equals(other.getLocationsList());
+ result = result && getName()
+ .equals(other.getName());
result = result && unknownFields.equals(other.unknownFields);
return result;
}
@@ -407,6 +472,8 @@ public int hashCode() {
hash = (37 * hash) + LOCATIONS_FIELD_NUMBER;
hash = (53 * hash) + getLocationsList().hashCode();
}
+ hash = (37 * hash) + NAME_FIELD_NUMBER;
+ hash = (53 * hash) + getName().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -552,6 +619,8 @@ public Builder clear() {
locations_ = com.google.protobuf.LazyStringArrayList.EMPTY;
bitField0_ = (bitField0_ & ~0x00000008);
+ name_ = "";
+
return this;
}
@@ -588,6 +657,7 @@ public com.google.container.v1.SetLocationsRequest buildPartial() {
bitField0_ = (bitField0_ & ~0x00000008);
}
result.locations_ = locations_;
+ result.name_ = name_;
result.bitField0_ = to_bitField0_;
onBuilt();
return result;
@@ -659,6 +729,10 @@ public Builder mergeFrom(com.google.container.v1.SetLocationsRequest other) {
}
onChanged();
}
+ if (!other.getName().isEmpty()) {
+ name_ = other.name_;
+ onChanged();
+ }
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -692,13 +766,14 @@ public Builder mergeFrom(
private java.lang.Object projectId_ = "";
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -712,13 +787,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof String) {
@@ -733,13 +809,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectId(
+ @java.lang.Deprecated public Builder setProjectId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -751,13 +828,14 @@ public Builder setProjectId(
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder clearProjectId() {
+ @java.lang.Deprecated public Builder clearProjectId() {
projectId_ = getDefaultInstance().getProjectId();
onChanged();
@@ -765,13 +843,14 @@ public Builder clearProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectIdBytes(
+ @java.lang.Deprecated public Builder setProjectIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -786,14 +865,15 @@ public Builder setProjectIdBytes(
private java.lang.Object zone_ = "";
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -807,14 +887,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof String) {
@@ -829,14 +910,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZone(
+ @java.lang.Deprecated public Builder setZone(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -848,14 +930,15 @@ public Builder setZone(
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder clearZone() {
+ @java.lang.Deprecated public Builder clearZone() {
zone_ = getDefaultInstance().getZone();
onChanged();
@@ -863,14 +946,15 @@ public Builder clearZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZoneBytes(
+ @java.lang.Deprecated public Builder setZoneBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -885,12 +969,13 @@ public Builder setZoneBytes(
private java.lang.Object clusterId_ = "";
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public java.lang.String getClusterId() {
+ @java.lang.Deprecated public java.lang.String getClusterId() {
java.lang.Object ref = clusterId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -904,12 +989,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIdBytes() {
java.lang.Object ref = clusterId_;
if (ref instanceof String) {
@@ -924,12 +1010,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder setClusterId(
+ @java.lang.Deprecated public Builder setClusterId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -941,12 +1028,13 @@ public Builder setClusterId(
}
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder clearClusterId() {
+ @java.lang.Deprecated public Builder clearClusterId() {
clusterId_ = getDefaultInstance().getClusterId();
onChanged();
@@ -954,12 +1042,13 @@ public Builder clearClusterId() {
}
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder setClusterIdBytes(
+ @java.lang.Deprecated public Builder setClusterIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -1145,6 +1234,100 @@ public Builder addLocationsBytes(
onChanged();
return this;
}
+
+ private java.lang.Object name_ = "";
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to set locations.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to set locations.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to set locations.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ public Builder setName(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to set locations.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ public Builder clearName() {
+
+ name_ = getDefaultInstance().getName();
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to set locations.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ public Builder setNameBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLocationsRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLocationsRequestOrBuilder.java
index 401391a640c8..f31c6a6de1f0 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLocationsRequestOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLocationsRequestOrBuilder.java
@@ -9,62 +9,68 @@ public interface SetLocationsRequestOrBuilder extends
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- java.lang.String getProjectId();
+ @java.lang.Deprecated java.lang.String getProjectId();
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getProjectIdBytes();
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- java.lang.String getZone();
+ @java.lang.Deprecated java.lang.String getZone();
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getZoneBytes();
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- java.lang.String getClusterId();
+ @java.lang.Deprecated java.lang.String getClusterId();
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getClusterIdBytes();
/**
@@ -121,4 +127,24 @@ public interface SetLocationsRequestOrBuilder extends
*/
com.google.protobuf.ByteString
getLocationsBytes(int index);
+
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to set locations.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ java.lang.String getName();
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to set locations.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ com.google.protobuf.ByteString
+ getNameBytes();
}
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLoggingServiceRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLoggingServiceRequest.java
index 8569f1f1fd34..1aac19d267a6 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLoggingServiceRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLoggingServiceRequest.java
@@ -24,6 +24,7 @@ private SetLoggingServiceRequest() {
zone_ = "";
clusterId_ = "";
loggingService_ = "";
+ name_ = "";
}
@java.lang.Override
@@ -74,6 +75,12 @@ private SetLoggingServiceRequest(
loggingService_ = s;
break;
}
+ case 42: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ name_ = s;
+ break;
+ }
default: {
if (!parseUnknownFieldProto3(
input, unknownFields, extensionRegistry, tag)) {
@@ -110,13 +117,14 @@ private SetLoggingServiceRequest(
private volatile java.lang.Object projectId_;
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -130,13 +138,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
@@ -154,9 +163,10 @@ public java.lang.String getProjectId() {
private volatile java.lang.Object zone_;
/**
*
- * The name of the Google Compute Engine
+ * 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;
@@ -175,9 +185,10 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
@@ -200,12 +211,13 @@ public java.lang.String getZone() {
private volatile java.lang.Object clusterId_;
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public java.lang.String getClusterId() {
+ @java.lang.Deprecated public java.lang.String getClusterId() {
java.lang.Object ref = clusterId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -219,12 +231,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIdBytes() {
java.lang.Object ref = clusterId_;
if (ref instanceof java.lang.String) {
@@ -286,6 +299,50 @@ public java.lang.String getLoggingService() {
}
}
+ public static final int NAME_FIELD_NUMBER = 5;
+ private volatile java.lang.Object name_;
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to set logging.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 5;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ }
+ }
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to set logging.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 5;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -312,6 +369,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
if (!getLoggingServiceBytes().isEmpty()) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 4, loggingService_);
}
+ if (!getNameBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 5, name_);
+ }
unknownFields.writeTo(output);
}
@@ -333,6 +393,9 @@ public int getSerializedSize() {
if (!getLoggingServiceBytes().isEmpty()) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, loggingService_);
}
+ if (!getNameBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, name_);
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -357,6 +420,8 @@ public boolean equals(final java.lang.Object obj) {
.equals(other.getClusterId());
result = result && getLoggingService()
.equals(other.getLoggingService());
+ result = result && getName()
+ .equals(other.getName());
result = result && unknownFields.equals(other.unknownFields);
return result;
}
@@ -376,6 +441,8 @@ public int hashCode() {
hash = (53 * hash) + getClusterId().hashCode();
hash = (37 * hash) + LOGGING_SERVICE_FIELD_NUMBER;
hash = (53 * hash) + getLoggingService().hashCode();
+ hash = (37 * hash) + NAME_FIELD_NUMBER;
+ hash = (53 * hash) + getName().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -521,6 +588,8 @@ public Builder clear() {
loggingService_ = "";
+ name_ = "";
+
return this;
}
@@ -551,6 +620,7 @@ public com.google.container.v1.SetLoggingServiceRequest buildPartial() {
result.zone_ = zone_;
result.clusterId_ = clusterId_;
result.loggingService_ = loggingService_;
+ result.name_ = name_;
onBuilt();
return result;
}
@@ -615,6 +685,10 @@ public Builder mergeFrom(com.google.container.v1.SetLoggingServiceRequest other)
loggingService_ = other.loggingService_;
onChanged();
}
+ if (!other.getName().isEmpty()) {
+ name_ = other.name_;
+ onChanged();
+ }
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -647,13 +721,14 @@ public Builder mergeFrom(
private java.lang.Object projectId_ = "";
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -667,13 +742,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof String) {
@@ -688,13 +764,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectId(
+ @java.lang.Deprecated public Builder setProjectId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -706,13 +783,14 @@ public Builder setProjectId(
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder clearProjectId() {
+ @java.lang.Deprecated public Builder clearProjectId() {
projectId_ = getDefaultInstance().getProjectId();
onChanged();
@@ -720,13 +798,14 @@ public Builder clearProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectIdBytes(
+ @java.lang.Deprecated public Builder setProjectIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -741,9 +820,10 @@ public Builder setProjectIdBytes(
private java.lang.Object zone_ = "";
/**
*
- * The name of the Google Compute Engine
+ * 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;
@@ -762,9 +842,10 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
@@ -784,9 +865,10 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
@@ -803,9 +885,10 @@ public Builder setZone(
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
@@ -818,9 +901,10 @@ public Builder clearZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
@@ -840,12 +924,13 @@ public Builder setZoneBytes(
private java.lang.Object clusterId_ = "";
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public java.lang.String getClusterId() {
+ @java.lang.Deprecated public java.lang.String getClusterId() {
java.lang.Object ref = clusterId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -859,12 +944,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIdBytes() {
java.lang.Object ref = clusterId_;
if (ref instanceof String) {
@@ -879,12 +965,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder setClusterId(
+ @java.lang.Deprecated public Builder setClusterId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -896,12 +983,13 @@ public Builder setClusterId(
}
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder clearClusterId() {
+ @java.lang.Deprecated public Builder clearClusterId() {
clusterId_ = getDefaultInstance().getClusterId();
onChanged();
@@ -909,12 +997,13 @@ public Builder clearClusterId() {
}
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder setClusterIdBytes(
+ @java.lang.Deprecated public Builder setClusterIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -1029,6 +1118,100 @@ public Builder setLoggingServiceBytes(
onChanged();
return this;
}
+
+ private java.lang.Object name_ = "";
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to set logging.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 5;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to set logging.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 5;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to set logging.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 5;
+ */
+ public Builder setName(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to set logging.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 5;
+ */
+ public Builder clearName() {
+
+ name_ = getDefaultInstance().getName();
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to set logging.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 5;
+ */
+ public Builder setNameBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLoggingServiceRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLoggingServiceRequestOrBuilder.java
index 7646fab1941b..e34d26718fb4 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLoggingServiceRequestOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLoggingServiceRequestOrBuilder.java
@@ -9,29 +9,32 @@ public interface SetLoggingServiceRequestOrBuilder extends
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- java.lang.String getProjectId();
+ @java.lang.Deprecated java.lang.String getProjectId();
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getProjectIdBytes();
/**
*
- * The name of the Google Compute Engine
+ * 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;
@@ -39,9 +42,10 @@ public interface SetLoggingServiceRequestOrBuilder extends
java.lang.String getZone();
/**
*
- * The name of the Google Compute Engine
+ * 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;
@@ -51,20 +55,22 @@ public interface SetLoggingServiceRequestOrBuilder extends
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- java.lang.String getClusterId();
+ @java.lang.Deprecated java.lang.String getClusterId();
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getClusterIdBytes();
/**
@@ -90,4 +96,24 @@ public interface SetLoggingServiceRequestOrBuilder extends
*/
com.google.protobuf.ByteString
getLoggingServiceBytes();
+
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to set logging.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 5;
+ */
+ java.lang.String getName();
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to set logging.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 5;
+ */
+ com.google.protobuf.ByteString
+ getNameBytes();
}
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMaintenancePolicyRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMaintenancePolicyRequest.java
index 0b11e22931ec..821396d560c0 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMaintenancePolicyRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMaintenancePolicyRequest.java
@@ -23,6 +23,7 @@ private SetMaintenancePolicyRequest() {
projectId_ = "";
zone_ = "";
clusterId_ = "";
+ name_ = "";
}
@java.lang.Override
@@ -80,6 +81,12 @@ private SetMaintenancePolicyRequest(
break;
}
+ case 42: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ name_ = s;
+ break;
+ }
default: {
if (!parseUnknownFieldProto3(
input, unknownFields, extensionRegistry, tag)) {
@@ -280,6 +287,52 @@ public com.google.container.v1.MaintenancePolicyOrBuilder getMaintenancePolicyOr
return getMaintenancePolicy();
}
+ public static final int NAME_FIELD_NUMBER = 5;
+ private volatile java.lang.Object name_;
+ /**
+ *
+ * The name (project, location, cluster id) of the cluster to set maintenance
+ * policy.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 5;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ }
+ }
+ /**
+ *
+ * The name (project, location, cluster id) of the cluster to set maintenance
+ * policy.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 5;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -306,6 +359,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
if (maintenancePolicy_ != null) {
output.writeMessage(4, getMaintenancePolicy());
}
+ if (!getNameBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 5, name_);
+ }
unknownFields.writeTo(output);
}
@@ -328,6 +384,9 @@ public int getSerializedSize() {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(4, getMaintenancePolicy());
}
+ if (!getNameBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, name_);
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -355,6 +414,8 @@ public boolean equals(final java.lang.Object obj) {
result = result && getMaintenancePolicy()
.equals(other.getMaintenancePolicy());
}
+ result = result && getName()
+ .equals(other.getName());
result = result && unknownFields.equals(other.unknownFields);
return result;
}
@@ -376,6 +437,8 @@ public int hashCode() {
hash = (37 * hash) + MAINTENANCE_POLICY_FIELD_NUMBER;
hash = (53 * hash) + getMaintenancePolicy().hashCode();
}
+ hash = (37 * hash) + NAME_FIELD_NUMBER;
+ hash = (53 * hash) + getName().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -525,6 +588,8 @@ public Builder clear() {
maintenancePolicy_ = null;
maintenancePolicyBuilder_ = null;
}
+ name_ = "";
+
return this;
}
@@ -559,6 +624,7 @@ public com.google.container.v1.SetMaintenancePolicyRequest buildPartial() {
} else {
result.maintenancePolicy_ = maintenancePolicyBuilder_.build();
}
+ result.name_ = name_;
onBuilt();
return result;
}
@@ -622,6 +688,10 @@ public Builder mergeFrom(com.google.container.v1.SetMaintenancePolicyRequest oth
if (other.hasMaintenancePolicy()) {
mergeMaintenancePolicy(other.getMaintenancePolicy());
}
+ if (!other.getName().isEmpty()) {
+ name_ = other.name_;
+ onChanged();
+ }
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -1094,6 +1164,105 @@ public com.google.container.v1.MaintenancePolicyOrBuilder getMaintenancePolicyOr
}
return maintenancePolicyBuilder_;
}
+
+ private java.lang.Object name_ = "";
+ /**
+ *
+ * The name (project, location, cluster id) of the cluster to set maintenance
+ * policy.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 5;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ *
+ * The name (project, location, cluster id) of the cluster to set maintenance
+ * policy.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 5;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ *
+ * The name (project, location, cluster id) of the cluster to set maintenance
+ * policy.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 5;
+ */
+ public Builder setName(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * The name (project, location, cluster id) of the cluster to set maintenance
+ * policy.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 5;
+ */
+ public Builder clearName() {
+
+ name_ = getDefaultInstance().getName();
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * The name (project, location, cluster id) of the cluster to set maintenance
+ * policy.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 5;
+ */
+ public Builder setNameBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMaintenancePolicyRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMaintenancePolicyRequestOrBuilder.java
index 427782924cc4..5169b5d65350 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMaintenancePolicyRequestOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMaintenancePolicyRequestOrBuilder.java
@@ -94,4 +94,26 @@ public interface SetMaintenancePolicyRequestOrBuilder extends
* .google.container.v1.MaintenancePolicy maintenance_policy = 4;
*/
com.google.container.v1.MaintenancePolicyOrBuilder getMaintenancePolicyOrBuilder();
+
+ /**
+ *
+ * The name (project, location, cluster id) of the cluster to set maintenance
+ * policy.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 5;
+ */
+ java.lang.String getName();
+ /**
+ *
+ * The name (project, location, cluster id) of the cluster to set maintenance
+ * policy.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 5;
+ */
+ com.google.protobuf.ByteString
+ getNameBytes();
}
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMasterAuthRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMasterAuthRequest.java
index 5f84567f4c05..3506c82d5d9b 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMasterAuthRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMasterAuthRequest.java
@@ -24,6 +24,7 @@ private SetMasterAuthRequest() {
zone_ = "";
clusterId_ = "";
action_ = 0;
+ name_ = "";
}
@java.lang.Override
@@ -87,6 +88,12 @@ private SetMasterAuthRequest(
break;
}
+ case 58: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ name_ = s;
+ break;
+ }
default: {
if (!parseUnknownFieldProto3(
input, unknownFields, extensionRegistry, tag)) {
@@ -281,13 +288,14 @@ private Action(int value) {
private volatile java.lang.Object projectId_;
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -301,13 +309,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
@@ -325,14 +334,15 @@ public java.lang.String getProjectId() {
private volatile java.lang.Object zone_;
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -346,14 +356,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
@@ -371,12 +382,13 @@ public java.lang.String getZone() {
private volatile java.lang.Object clusterId_;
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public java.lang.String getClusterId() {
+ @java.lang.Deprecated public java.lang.String getClusterId() {
java.lang.Object ref = clusterId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -390,12 +402,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIdBytes() {
java.lang.Object ref = clusterId_;
if (ref instanceof java.lang.String) {
@@ -467,6 +480,50 @@ public com.google.container.v1.MasterAuthOrBuilder getUpdateOrBuilder() {
return getUpdate();
}
+ public static final int NAME_FIELD_NUMBER = 7;
+ private volatile java.lang.Object name_;
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to set auth.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 7;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ }
+ }
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to set auth.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 7;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -496,6 +553,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
if (update_ != null) {
output.writeMessage(5, getUpdate());
}
+ if (!getNameBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 7, name_);
+ }
unknownFields.writeTo(output);
}
@@ -522,6 +582,9 @@ public int getSerializedSize() {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(5, getUpdate());
}
+ if (!getNameBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, name_);
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -550,6 +613,8 @@ public boolean equals(final java.lang.Object obj) {
result = result && getUpdate()
.equals(other.getUpdate());
}
+ result = result && getName()
+ .equals(other.getName());
result = result && unknownFields.equals(other.unknownFields);
return result;
}
@@ -573,6 +638,8 @@ public int hashCode() {
hash = (37 * hash) + UPDATE_FIELD_NUMBER;
hash = (53 * hash) + getUpdate().hashCode();
}
+ hash = (37 * hash) + NAME_FIELD_NUMBER;
+ hash = (53 * hash) + getName().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -724,6 +791,8 @@ public Builder clear() {
update_ = null;
updateBuilder_ = null;
}
+ name_ = "";
+
return this;
}
@@ -759,6 +828,7 @@ public com.google.container.v1.SetMasterAuthRequest buildPartial() {
} else {
result.update_ = updateBuilder_.build();
}
+ result.name_ = name_;
onBuilt();
return result;
}
@@ -825,6 +895,10 @@ public Builder mergeFrom(com.google.container.v1.SetMasterAuthRequest other) {
if (other.hasUpdate()) {
mergeUpdate(other.getUpdate());
}
+ if (!other.getName().isEmpty()) {
+ name_ = other.name_;
+ onChanged();
+ }
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -857,13 +931,14 @@ public Builder mergeFrom(
private java.lang.Object projectId_ = "";
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -877,13 +952,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof String) {
@@ -898,13 +974,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectId(
+ @java.lang.Deprecated public Builder setProjectId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -916,13 +993,14 @@ public Builder setProjectId(
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder clearProjectId() {
+ @java.lang.Deprecated public Builder clearProjectId() {
projectId_ = getDefaultInstance().getProjectId();
onChanged();
@@ -930,13 +1008,14 @@ public Builder clearProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectIdBytes(
+ @java.lang.Deprecated public Builder setProjectIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -951,14 +1030,15 @@ public Builder setProjectIdBytes(
private java.lang.Object zone_ = "";
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -972,14 +1052,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof String) {
@@ -994,14 +1075,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZone(
+ @java.lang.Deprecated public Builder setZone(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -1013,14 +1095,15 @@ public Builder setZone(
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder clearZone() {
+ @java.lang.Deprecated public Builder clearZone() {
zone_ = getDefaultInstance().getZone();
onChanged();
@@ -1028,14 +1111,15 @@ public Builder clearZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZoneBytes(
+ @java.lang.Deprecated public Builder setZoneBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -1050,12 +1134,13 @@ public Builder setZoneBytes(
private java.lang.Object clusterId_ = "";
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public java.lang.String getClusterId() {
+ @java.lang.Deprecated public java.lang.String getClusterId() {
java.lang.Object ref = clusterId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -1069,12 +1154,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIdBytes() {
java.lang.Object ref = clusterId_;
if (ref instanceof String) {
@@ -1089,12 +1175,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder setClusterId(
+ @java.lang.Deprecated public Builder setClusterId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -1106,12 +1193,13 @@ public Builder setClusterId(
}
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder clearClusterId() {
+ @java.lang.Deprecated public Builder clearClusterId() {
clusterId_ = getDefaultInstance().getClusterId();
onChanged();
@@ -1119,12 +1207,13 @@ public Builder clearClusterId() {
}
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder setClusterIdBytes(
+ @java.lang.Deprecated public Builder setClusterIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -1353,6 +1442,100 @@ public com.google.container.v1.MasterAuthOrBuilder getUpdateOrBuilder() {
}
return updateBuilder_;
}
+
+ private java.lang.Object name_ = "";
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to set auth.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 7;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to set auth.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 7;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to set auth.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 7;
+ */
+ public Builder setName(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to set auth.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 7;
+ */
+ public Builder clearName() {
+
+ name_ = getDefaultInstance().getName();
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to set auth.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 7;
+ */
+ public Builder setNameBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMasterAuthRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMasterAuthRequestOrBuilder.java
index 70dc0799621a..ecdf875f1e49 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMasterAuthRequestOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMasterAuthRequestOrBuilder.java
@@ -9,62 +9,68 @@ public interface SetMasterAuthRequestOrBuilder extends
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- java.lang.String getProjectId();
+ @java.lang.Deprecated java.lang.String getProjectId();
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getProjectIdBytes();
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- java.lang.String getZone();
+ @java.lang.Deprecated java.lang.String getZone();
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getZoneBytes();
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- java.lang.String getClusterId();
+ @java.lang.Deprecated java.lang.String getClusterId();
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getClusterIdBytes();
/**
@@ -108,4 +114,24 @@ public interface SetMasterAuthRequestOrBuilder extends
* .google.container.v1.MasterAuth update = 5;
*/
com.google.container.v1.MasterAuthOrBuilder getUpdateOrBuilder();
+
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to set auth.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 7;
+ */
+ java.lang.String getName();
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to set auth.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 7;
+ */
+ com.google.protobuf.ByteString
+ getNameBytes();
}
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMonitoringServiceRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMonitoringServiceRequest.java
index cfac98d537ff..1caaa41d14d2 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMonitoringServiceRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMonitoringServiceRequest.java
@@ -24,6 +24,7 @@ private SetMonitoringServiceRequest() {
zone_ = "";
clusterId_ = "";
monitoringService_ = "";
+ name_ = "";
}
@java.lang.Override
@@ -74,6 +75,12 @@ private SetMonitoringServiceRequest(
monitoringService_ = s;
break;
}
+ case 50: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ name_ = s;
+ break;
+ }
default: {
if (!parseUnknownFieldProto3(
input, unknownFields, extensionRegistry, tag)) {
@@ -110,13 +117,14 @@ private SetMonitoringServiceRequest(
private volatile java.lang.Object projectId_;
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -130,13 +138,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
@@ -154,14 +163,15 @@ public java.lang.String getProjectId() {
private volatile java.lang.Object zone_;
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -175,14 +185,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
@@ -200,12 +211,13 @@ public java.lang.String getZone() {
private volatile java.lang.Object clusterId_;
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public java.lang.String getClusterId() {
+ @java.lang.Deprecated public java.lang.String getClusterId() {
java.lang.Object ref = clusterId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -219,12 +231,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIdBytes() {
java.lang.Object ref = clusterId_;
if (ref instanceof java.lang.String) {
@@ -286,6 +299,50 @@ public java.lang.String getMonitoringService() {
}
}
+ public static final int NAME_FIELD_NUMBER = 6;
+ private volatile java.lang.Object name_;
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to set monitoring.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ }
+ }
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to set monitoring.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -312,6 +369,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
if (!getMonitoringServiceBytes().isEmpty()) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 4, monitoringService_);
}
+ if (!getNameBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 6, name_);
+ }
unknownFields.writeTo(output);
}
@@ -333,6 +393,9 @@ public int getSerializedSize() {
if (!getMonitoringServiceBytes().isEmpty()) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, monitoringService_);
}
+ if (!getNameBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, name_);
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -357,6 +420,8 @@ public boolean equals(final java.lang.Object obj) {
.equals(other.getClusterId());
result = result && getMonitoringService()
.equals(other.getMonitoringService());
+ result = result && getName()
+ .equals(other.getName());
result = result && unknownFields.equals(other.unknownFields);
return result;
}
@@ -376,6 +441,8 @@ public int hashCode() {
hash = (53 * hash) + getClusterId().hashCode();
hash = (37 * hash) + MONITORING_SERVICE_FIELD_NUMBER;
hash = (53 * hash) + getMonitoringService().hashCode();
+ hash = (37 * hash) + NAME_FIELD_NUMBER;
+ hash = (53 * hash) + getName().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -521,6 +588,8 @@ public Builder clear() {
monitoringService_ = "";
+ name_ = "";
+
return this;
}
@@ -551,6 +620,7 @@ public com.google.container.v1.SetMonitoringServiceRequest buildPartial() {
result.zone_ = zone_;
result.clusterId_ = clusterId_;
result.monitoringService_ = monitoringService_;
+ result.name_ = name_;
onBuilt();
return result;
}
@@ -615,6 +685,10 @@ public Builder mergeFrom(com.google.container.v1.SetMonitoringServiceRequest oth
monitoringService_ = other.monitoringService_;
onChanged();
}
+ if (!other.getName().isEmpty()) {
+ name_ = other.name_;
+ onChanged();
+ }
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -647,13 +721,14 @@ public Builder mergeFrom(
private java.lang.Object projectId_ = "";
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -667,13 +742,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof String) {
@@ -688,13 +764,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectId(
+ @java.lang.Deprecated public Builder setProjectId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -706,13 +783,14 @@ public Builder setProjectId(
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder clearProjectId() {
+ @java.lang.Deprecated public Builder clearProjectId() {
projectId_ = getDefaultInstance().getProjectId();
onChanged();
@@ -720,13 +798,14 @@ public Builder clearProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectIdBytes(
+ @java.lang.Deprecated public Builder setProjectIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -741,14 +820,15 @@ public Builder setProjectIdBytes(
private java.lang.Object zone_ = "";
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -762,14 +842,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof String) {
@@ -784,14 +865,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZone(
+ @java.lang.Deprecated public Builder setZone(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -803,14 +885,15 @@ public Builder setZone(
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder clearZone() {
+ @java.lang.Deprecated public Builder clearZone() {
zone_ = getDefaultInstance().getZone();
onChanged();
@@ -818,14 +901,15 @@ public Builder clearZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZoneBytes(
+ @java.lang.Deprecated public Builder setZoneBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -840,12 +924,13 @@ public Builder setZoneBytes(
private java.lang.Object clusterId_ = "";
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public java.lang.String getClusterId() {
+ @java.lang.Deprecated public java.lang.String getClusterId() {
java.lang.Object ref = clusterId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -859,12 +944,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIdBytes() {
java.lang.Object ref = clusterId_;
if (ref instanceof String) {
@@ -879,12 +965,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder setClusterId(
+ @java.lang.Deprecated public Builder setClusterId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -896,12 +983,13 @@ public Builder setClusterId(
}
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder clearClusterId() {
+ @java.lang.Deprecated public Builder clearClusterId() {
clusterId_ = getDefaultInstance().getClusterId();
onChanged();
@@ -909,12 +997,13 @@ public Builder clearClusterId() {
}
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder setClusterIdBytes(
+ @java.lang.Deprecated public Builder setClusterIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -1029,6 +1118,100 @@ public Builder setMonitoringServiceBytes(
onChanged();
return this;
}
+
+ private java.lang.Object name_ = "";
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to set monitoring.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to set monitoring.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to set monitoring.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ public Builder setName(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to set monitoring.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ public Builder clearName() {
+
+ name_ = getDefaultInstance().getName();
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to set monitoring.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ public Builder setNameBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMonitoringServiceRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMonitoringServiceRequestOrBuilder.java
index d5a242ad2608..d052237851cd 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMonitoringServiceRequestOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMonitoringServiceRequestOrBuilder.java
@@ -9,62 +9,68 @@ public interface SetMonitoringServiceRequestOrBuilder extends
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- java.lang.String getProjectId();
+ @java.lang.Deprecated java.lang.String getProjectId();
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getProjectIdBytes();
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- java.lang.String getZone();
+ @java.lang.Deprecated java.lang.String getZone();
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getZoneBytes();
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- java.lang.String getClusterId();
+ @java.lang.Deprecated java.lang.String getClusterId();
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getClusterIdBytes();
/**
@@ -90,4 +96,24 @@ public interface SetMonitoringServiceRequestOrBuilder extends
*/
com.google.protobuf.ByteString
getMonitoringServiceBytes();
+
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to set monitoring.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ java.lang.String getName();
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to set monitoring.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ com.google.protobuf.ByteString
+ getNameBytes();
}
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNetworkPolicyRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNetworkPolicyRequest.java
index 708036010cc6..d7dc408300fa 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNetworkPolicyRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNetworkPolicyRequest.java
@@ -23,6 +23,7 @@ private SetNetworkPolicyRequest() {
projectId_ = "";
zone_ = "";
clusterId_ = "";
+ name_ = "";
}
@java.lang.Override
@@ -80,6 +81,12 @@ private SetNetworkPolicyRequest(
break;
}
+ case 50: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ name_ = s;
+ break;
+ }
default: {
if (!parseUnknownFieldProto3(
input, unknownFields, extensionRegistry, tag)) {
@@ -116,13 +123,14 @@ private SetNetworkPolicyRequest(
private volatile java.lang.Object projectId_;
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -136,13 +144,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
@@ -160,14 +169,15 @@ public java.lang.String getProjectId() {
private volatile java.lang.Object zone_;
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -181,14 +191,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
@@ -206,12 +217,13 @@ public java.lang.String getZone() {
private volatile java.lang.Object clusterId_;
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public java.lang.String getClusterId() {
+ @java.lang.Deprecated public java.lang.String getClusterId() {
java.lang.Object ref = clusterId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -225,12 +237,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIdBytes() {
java.lang.Object ref = clusterId_;
if (ref instanceof java.lang.String) {
@@ -277,6 +290,50 @@ public com.google.container.v1.NetworkPolicyOrBuilder getNetworkPolicyOrBuilder(
return getNetworkPolicy();
}
+ public static final int NAME_FIELD_NUMBER = 6;
+ private volatile java.lang.Object name_;
+ /**
+ *
+ * The name (project, location, cluster id) of the cluster to set networking
+ * policy. Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ }
+ }
+ /**
+ *
+ * The name (project, location, cluster id) of the cluster to set networking
+ * policy. Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -303,6 +360,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
if (networkPolicy_ != null) {
output.writeMessage(4, getNetworkPolicy());
}
+ if (!getNameBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 6, name_);
+ }
unknownFields.writeTo(output);
}
@@ -325,6 +385,9 @@ public int getSerializedSize() {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(4, getNetworkPolicy());
}
+ if (!getNameBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, name_);
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -352,6 +415,8 @@ public boolean equals(final java.lang.Object obj) {
result = result && getNetworkPolicy()
.equals(other.getNetworkPolicy());
}
+ result = result && getName()
+ .equals(other.getName());
result = result && unknownFields.equals(other.unknownFields);
return result;
}
@@ -373,6 +438,8 @@ public int hashCode() {
hash = (37 * hash) + NETWORK_POLICY_FIELD_NUMBER;
hash = (53 * hash) + getNetworkPolicy().hashCode();
}
+ hash = (37 * hash) + NAME_FIELD_NUMBER;
+ hash = (53 * hash) + getName().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -522,6 +589,8 @@ public Builder clear() {
networkPolicy_ = null;
networkPolicyBuilder_ = null;
}
+ name_ = "";
+
return this;
}
@@ -556,6 +625,7 @@ public com.google.container.v1.SetNetworkPolicyRequest buildPartial() {
} else {
result.networkPolicy_ = networkPolicyBuilder_.build();
}
+ result.name_ = name_;
onBuilt();
return result;
}
@@ -619,6 +689,10 @@ public Builder mergeFrom(com.google.container.v1.SetNetworkPolicyRequest other)
if (other.hasNetworkPolicy()) {
mergeNetworkPolicy(other.getNetworkPolicy());
}
+ if (!other.getName().isEmpty()) {
+ name_ = other.name_;
+ onChanged();
+ }
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -651,13 +725,14 @@ public Builder mergeFrom(
private java.lang.Object projectId_ = "";
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -671,13 +746,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof String) {
@@ -692,13 +768,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectId(
+ @java.lang.Deprecated public Builder setProjectId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -710,13 +787,14 @@ public Builder setProjectId(
}
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder clearProjectId() {
+ @java.lang.Deprecated public Builder clearProjectId() {
projectId_ = getDefaultInstance().getProjectId();
onChanged();
@@ -724,13 +802,14 @@ public Builder clearProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectIdBytes(
+ @java.lang.Deprecated public Builder setProjectIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -745,14 +824,15 @@ public Builder setProjectIdBytes(
private java.lang.Object zone_ = "";
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -766,14 +846,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof String) {
@@ -788,14 +869,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZone(
+ @java.lang.Deprecated public Builder setZone(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -807,14 +889,15 @@ public Builder setZone(
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder clearZone() {
+ @java.lang.Deprecated public Builder clearZone() {
zone_ = getDefaultInstance().getZone();
onChanged();
@@ -822,14 +905,15 @@ public Builder clearZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZoneBytes(
+ @java.lang.Deprecated public Builder setZoneBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -844,12 +928,13 @@ public Builder setZoneBytes(
private java.lang.Object clusterId_ = "";
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public java.lang.String getClusterId() {
+ @java.lang.Deprecated public java.lang.String getClusterId() {
java.lang.Object ref = clusterId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -863,12 +948,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIdBytes() {
java.lang.Object ref = clusterId_;
if (ref instanceof String) {
@@ -883,12 +969,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder setClusterId(
+ @java.lang.Deprecated public Builder setClusterId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -900,12 +987,13 @@ public Builder setClusterId(
}
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder clearClusterId() {
+ @java.lang.Deprecated public Builder clearClusterId() {
clusterId_ = getDefaultInstance().getClusterId();
onChanged();
@@ -913,12 +1001,13 @@ public Builder clearClusterId() {
}
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder setClusterIdBytes(
+ @java.lang.Deprecated public Builder setClusterIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -1082,6 +1171,100 @@ public com.google.container.v1.NetworkPolicyOrBuilder getNetworkPolicyOrBuilder(
}
return networkPolicyBuilder_;
}
+
+ private java.lang.Object name_ = "";
+ /**
+ *
+ * The name (project, location, cluster id) of the cluster to set networking
+ * policy. Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ *
+ * The name (project, location, cluster id) of the cluster to set networking
+ * policy. Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ *
+ * The name (project, location, cluster id) of the cluster to set networking
+ * policy. Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ public Builder setName(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * The name (project, location, cluster id) of the cluster to set networking
+ * policy. Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ public Builder clearName() {
+
+ name_ = getDefaultInstance().getName();
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * The name (project, location, cluster id) of the cluster to set networking
+ * policy. Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ public Builder setNameBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNetworkPolicyRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNetworkPolicyRequestOrBuilder.java
index b727dd3192ee..0627f23b838b 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNetworkPolicyRequestOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNetworkPolicyRequestOrBuilder.java
@@ -9,62 +9,68 @@ public interface SetNetworkPolicyRequestOrBuilder extends
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- java.lang.String getProjectId();
+ @java.lang.Deprecated java.lang.String getProjectId();
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getProjectIdBytes();
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- java.lang.String getZone();
+ @java.lang.Deprecated java.lang.String getZone();
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getZoneBytes();
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- java.lang.String getClusterId();
+ @java.lang.Deprecated java.lang.String getClusterId();
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getClusterIdBytes();
/**
@@ -91,4 +97,24 @@ public interface SetNetworkPolicyRequestOrBuilder extends
* .google.container.v1.NetworkPolicy network_policy = 4;
*/
com.google.container.v1.NetworkPolicyOrBuilder getNetworkPolicyOrBuilder();
+
+ /**
+ *
+ * The name (project, location, cluster id) of the cluster to set networking
+ * policy. Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ java.lang.String getName();
+ /**
+ *
+ * The name (project, location, cluster id) of the cluster to set networking
+ * policy. Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ com.google.protobuf.ByteString
+ getNameBytes();
}
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolAutoscalingRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolAutoscalingRequest.java
index 7c7be3781326..7e283ff95c2c 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolAutoscalingRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolAutoscalingRequest.java
@@ -24,6 +24,7 @@ private SetNodePoolAutoscalingRequest() {
zone_ = "";
clusterId_ = "";
nodePoolId_ = "";
+ name_ = "";
}
@java.lang.Override
@@ -87,6 +88,12 @@ private SetNodePoolAutoscalingRequest(
break;
}
+ case 50: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ name_ = s;
+ break;
+ }
default: {
if (!parseUnknownFieldProto3(
input, unknownFields, extensionRegistry, tag)) {
@@ -123,13 +130,14 @@ private SetNodePoolAutoscalingRequest(
private volatile java.lang.Object projectId_;
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -143,13 +151,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
@@ -167,14 +176,15 @@ public java.lang.String getProjectId() {
private volatile java.lang.Object zone_;
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -188,14 +198,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
@@ -213,12 +224,13 @@ public java.lang.String getZone() {
private volatile java.lang.Object clusterId_;
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public java.lang.String getClusterId() {
+ @java.lang.Deprecated public java.lang.String getClusterId() {
java.lang.Object ref = clusterId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -232,12 +244,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIdBytes() {
java.lang.Object ref = clusterId_;
if (ref instanceof java.lang.String) {
@@ -255,12 +268,13 @@ public java.lang.String getClusterId() {
private volatile java.lang.Object nodePoolId_;
/**
*
- * The name of the node pool to upgrade.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public java.lang.String getNodePoolId() {
+ @java.lang.Deprecated public java.lang.String getNodePoolId() {
java.lang.Object ref = nodePoolId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -274,12 +288,13 @@ public java.lang.String getNodePoolId() {
}
/**
*
- * The name of the node pool to upgrade.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getNodePoolIdBytes() {
java.lang.Object ref = nodePoolId_;
if (ref instanceof java.lang.String) {
@@ -326,6 +341,52 @@ public com.google.container.v1.NodePoolAutoscalingOrBuilder getAutoscalingOrBuil
return getAutoscaling();
}
+ public static final int NAME_FIELD_NUMBER = 6;
+ private volatile java.lang.Object name_;
+ /**
+ *
+ * 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;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ }
+ }
+ /**
+ *
+ * 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;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -355,6 +416,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
if (autoscaling_ != null) {
output.writeMessage(5, getAutoscaling());
}
+ if (!getNameBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 6, name_);
+ }
unknownFields.writeTo(output);
}
@@ -380,6 +444,9 @@ public int getSerializedSize() {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(5, getAutoscaling());
}
+ if (!getNameBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, name_);
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -409,6 +476,8 @@ public boolean equals(final java.lang.Object obj) {
result = result && getAutoscaling()
.equals(other.getAutoscaling());
}
+ result = result && getName()
+ .equals(other.getName());
result = result && unknownFields.equals(other.unknownFields);
return result;
}
@@ -432,6 +501,8 @@ public int hashCode() {
hash = (37 * hash) + AUTOSCALING_FIELD_NUMBER;
hash = (53 * hash) + getAutoscaling().hashCode();
}
+ hash = (37 * hash) + NAME_FIELD_NUMBER;
+ hash = (53 * hash) + getName().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -583,6 +654,8 @@ public Builder clear() {
autoscaling_ = null;
autoscalingBuilder_ = null;
}
+ name_ = "";
+
return this;
}
@@ -618,6 +691,7 @@ public com.google.container.v1.SetNodePoolAutoscalingRequest buildPartial() {
} else {
result.autoscaling_ = autoscalingBuilder_.build();
}
+ result.name_ = name_;
onBuilt();
return result;
}
@@ -685,6 +759,10 @@ public Builder mergeFrom(com.google.container.v1.SetNodePoolAutoscalingRequest o
if (other.hasAutoscaling()) {
mergeAutoscaling(other.getAutoscaling());
}
+ if (!other.getName().isEmpty()) {
+ name_ = other.name_;
+ onChanged();
+ }
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -717,13 +795,14 @@ public Builder mergeFrom(
private java.lang.Object projectId_ = "";
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -737,13 +816,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof String) {
@@ -758,13 +838,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectId(
+ @java.lang.Deprecated public Builder setProjectId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -776,13 +857,14 @@ public Builder setProjectId(
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder clearProjectId() {
+ @java.lang.Deprecated public Builder clearProjectId() {
projectId_ = getDefaultInstance().getProjectId();
onChanged();
@@ -790,13 +872,14 @@ public Builder clearProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectIdBytes(
+ @java.lang.Deprecated public Builder setProjectIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -811,14 +894,15 @@ public Builder setProjectIdBytes(
private java.lang.Object zone_ = "";
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -832,14 +916,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof String) {
@@ -854,14 +939,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZone(
+ @java.lang.Deprecated public Builder setZone(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -873,14 +959,15 @@ public Builder setZone(
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder clearZone() {
+ @java.lang.Deprecated public Builder clearZone() {
zone_ = getDefaultInstance().getZone();
onChanged();
@@ -888,14 +975,15 @@ public Builder clearZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZoneBytes(
+ @java.lang.Deprecated public Builder setZoneBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -910,12 +998,13 @@ public Builder setZoneBytes(
private java.lang.Object clusterId_ = "";
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public java.lang.String getClusterId() {
+ @java.lang.Deprecated public java.lang.String getClusterId() {
java.lang.Object ref = clusterId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -929,12 +1018,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIdBytes() {
java.lang.Object ref = clusterId_;
if (ref instanceof String) {
@@ -949,12 +1039,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder setClusterId(
+ @java.lang.Deprecated public Builder setClusterId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -966,12 +1057,13 @@ public Builder setClusterId(
}
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder clearClusterId() {
+ @java.lang.Deprecated public Builder clearClusterId() {
clusterId_ = getDefaultInstance().getClusterId();
onChanged();
@@ -979,12 +1071,13 @@ public Builder clearClusterId() {
}
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder setClusterIdBytes(
+ @java.lang.Deprecated public Builder setClusterIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -999,12 +1092,13 @@ public Builder setClusterIdBytes(
private java.lang.Object nodePoolId_ = "";
/**
*
- * The name of the node pool to upgrade.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public java.lang.String getNodePoolId() {
+ @java.lang.Deprecated public java.lang.String getNodePoolId() {
java.lang.Object ref = nodePoolId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -1018,12 +1112,13 @@ public java.lang.String getNodePoolId() {
}
/**
*
- * The name of the node pool to upgrade.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getNodePoolIdBytes() {
java.lang.Object ref = nodePoolId_;
if (ref instanceof String) {
@@ -1038,12 +1133,13 @@ public java.lang.String getNodePoolId() {
}
/**
*
- * The name of the node pool to upgrade.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public Builder setNodePoolId(
+ @java.lang.Deprecated public Builder setNodePoolId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -1055,12 +1151,13 @@ public Builder setNodePoolId(
}
/**
*
- * The name of the node pool to upgrade.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public Builder clearNodePoolId() {
+ @java.lang.Deprecated public Builder clearNodePoolId() {
nodePoolId_ = getDefaultInstance().getNodePoolId();
onChanged();
@@ -1068,12 +1165,13 @@ public Builder clearNodePoolId() {
}
/**
*
- * The name of the node pool to upgrade.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public Builder setNodePoolIdBytes(
+ @java.lang.Deprecated public Builder setNodePoolIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -1237,6 +1335,105 @@ public com.google.container.v1.NodePoolAutoscalingOrBuilder getAutoscalingOrBuil
}
return autoscalingBuilder_;
}
+
+ private java.lang.Object name_ = "";
+ /**
+ *
+ * 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;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ *
+ * 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;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ *
+ * 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;
+ */
+ public Builder setName(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * 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;
+ */
+ public Builder clearName() {
+
+ name_ = getDefaultInstance().getName();
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * 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;
+ */
+ public Builder setNameBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolAutoscalingRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolAutoscalingRequestOrBuilder.java
index 7a80e0b6b2a5..880dca0fc271 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolAutoscalingRequestOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolAutoscalingRequestOrBuilder.java
@@ -9,80 +9,88 @@ public interface SetNodePoolAutoscalingRequestOrBuilder extends
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- java.lang.String getProjectId();
+ @java.lang.Deprecated java.lang.String getProjectId();
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getProjectIdBytes();
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- java.lang.String getZone();
+ @java.lang.Deprecated java.lang.String getZone();
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getZoneBytes();
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- java.lang.String getClusterId();
+ @java.lang.Deprecated java.lang.String getClusterId();
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getClusterIdBytes();
/**
*
- * The name of the node pool to upgrade.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- java.lang.String getNodePoolId();
+ @java.lang.Deprecated java.lang.String getNodePoolId();
/**
*
- * The name of the node pool to upgrade.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getNodePoolIdBytes();
/**
@@ -109,4 +117,26 @@ public interface SetNodePoolAutoscalingRequestOrBuilder extends
* .google.container.v1.NodePoolAutoscaling autoscaling = 5;
*/
com.google.container.v1.NodePoolAutoscalingOrBuilder getAutoscalingOrBuilder();
+
+ /**
+ *
+ * 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;
+ */
+ java.lang.String getName();
+ /**
+ *
+ * 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;
+ */
+ com.google.protobuf.ByteString
+ getNameBytes();
}
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolManagementRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolManagementRequest.java
index 23186f9e4678..34f1007a55cd 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolManagementRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolManagementRequest.java
@@ -25,6 +25,7 @@ private SetNodePoolManagementRequest() {
zone_ = "";
clusterId_ = "";
nodePoolId_ = "";
+ name_ = "";
}
@java.lang.Override
@@ -88,6 +89,12 @@ private SetNodePoolManagementRequest(
break;
}
+ case 58: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ name_ = s;
+ break;
+ }
default: {
if (!parseUnknownFieldProto3(
input, unknownFields, extensionRegistry, tag)) {
@@ -124,13 +131,14 @@ private SetNodePoolManagementRequest(
private volatile java.lang.Object projectId_;
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -144,13 +152,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
@@ -168,14 +177,15 @@ public java.lang.String getProjectId() {
private volatile java.lang.Object zone_;
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -189,14 +199,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
@@ -214,12 +225,13 @@ public java.lang.String getZone() {
private volatile java.lang.Object clusterId_;
/**
*
- * The name of the cluster to update.
+ * Deprecated. The name of the cluster to update.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public java.lang.String getClusterId() {
+ @java.lang.Deprecated public java.lang.String getClusterId() {
java.lang.Object ref = clusterId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -233,12 +245,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster to update.
+ * Deprecated. The name of the cluster to update.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIdBytes() {
java.lang.Object ref = clusterId_;
if (ref instanceof java.lang.String) {
@@ -256,12 +269,13 @@ public java.lang.String getClusterId() {
private volatile java.lang.Object nodePoolId_;
/**
*
- * The name of the node pool to update.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public java.lang.String getNodePoolId() {
+ @java.lang.Deprecated public java.lang.String getNodePoolId() {
java.lang.Object ref = nodePoolId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -275,12 +289,13 @@ public java.lang.String getNodePoolId() {
}
/**
*
- * The name of the node pool to update.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getNodePoolIdBytes() {
java.lang.Object ref = nodePoolId_;
if (ref instanceof java.lang.String) {
@@ -327,6 +342,52 @@ public com.google.container.v1.NodeManagementOrBuilder getManagementOrBuilder()
return getManagement();
}
+ public static final int NAME_FIELD_NUMBER = 7;
+ private volatile java.lang.Object name_;
+ /**
+ *
+ * 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;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ }
+ }
+ /**
+ *
+ * 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;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -356,6 +417,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
if (management_ != null) {
output.writeMessage(5, getManagement());
}
+ if (!getNameBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 7, name_);
+ }
unknownFields.writeTo(output);
}
@@ -381,6 +445,9 @@ public int getSerializedSize() {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(5, getManagement());
}
+ if (!getNameBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, name_);
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -410,6 +477,8 @@ public boolean equals(final java.lang.Object obj) {
result = result && getManagement()
.equals(other.getManagement());
}
+ result = result && getName()
+ .equals(other.getName());
result = result && unknownFields.equals(other.unknownFields);
return result;
}
@@ -433,6 +502,8 @@ public int hashCode() {
hash = (37 * hash) + MANAGEMENT_FIELD_NUMBER;
hash = (53 * hash) + getManagement().hashCode();
}
+ hash = (37 * hash) + NAME_FIELD_NUMBER;
+ hash = (53 * hash) + getName().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -585,6 +656,8 @@ public Builder clear() {
management_ = null;
managementBuilder_ = null;
}
+ name_ = "";
+
return this;
}
@@ -620,6 +693,7 @@ public com.google.container.v1.SetNodePoolManagementRequest buildPartial() {
} else {
result.management_ = managementBuilder_.build();
}
+ result.name_ = name_;
onBuilt();
return result;
}
@@ -687,6 +761,10 @@ public Builder mergeFrom(com.google.container.v1.SetNodePoolManagementRequest ot
if (other.hasManagement()) {
mergeManagement(other.getManagement());
}
+ if (!other.getName().isEmpty()) {
+ name_ = other.name_;
+ onChanged();
+ }
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -719,13 +797,14 @@ public Builder mergeFrom(
private java.lang.Object projectId_ = "";
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -739,13 +818,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof String) {
@@ -760,13 +840,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectId(
+ @java.lang.Deprecated public Builder setProjectId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -778,13 +859,14 @@ public Builder setProjectId(
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder clearProjectId() {
+ @java.lang.Deprecated public Builder clearProjectId() {
projectId_ = getDefaultInstance().getProjectId();
onChanged();
@@ -792,13 +874,14 @@ public Builder clearProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectIdBytes(
+ @java.lang.Deprecated public Builder setProjectIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -813,14 +896,15 @@ public Builder setProjectIdBytes(
private java.lang.Object zone_ = "";
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -834,14 +918,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof String) {
@@ -856,14 +941,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZone(
+ @java.lang.Deprecated public Builder setZone(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -875,14 +961,15 @@ public Builder setZone(
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder clearZone() {
+ @java.lang.Deprecated public Builder clearZone() {
zone_ = getDefaultInstance().getZone();
onChanged();
@@ -890,14 +977,15 @@ public Builder clearZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZoneBytes(
+ @java.lang.Deprecated public Builder setZoneBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -912,12 +1000,13 @@ public Builder setZoneBytes(
private java.lang.Object clusterId_ = "";
/**
*
- * The name of the cluster to update.
+ * Deprecated. The name of the cluster to update.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public java.lang.String getClusterId() {
+ @java.lang.Deprecated public java.lang.String getClusterId() {
java.lang.Object ref = clusterId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -931,12 +1020,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster to update.
+ * Deprecated. The name of the cluster to update.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIdBytes() {
java.lang.Object ref = clusterId_;
if (ref instanceof String) {
@@ -951,12 +1041,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster to update.
+ * Deprecated. The name of the cluster to update.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder setClusterId(
+ @java.lang.Deprecated public Builder setClusterId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -968,12 +1059,13 @@ public Builder setClusterId(
}
/**
*
- * The name of the cluster to update.
+ * Deprecated. The name of the cluster to update.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder clearClusterId() {
+ @java.lang.Deprecated public Builder clearClusterId() {
clusterId_ = getDefaultInstance().getClusterId();
onChanged();
@@ -981,12 +1073,13 @@ public Builder clearClusterId() {
}
/**
*
- * The name of the cluster to update.
+ * Deprecated. The name of the cluster to update.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder setClusterIdBytes(
+ @java.lang.Deprecated public Builder setClusterIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -1001,12 +1094,13 @@ public Builder setClusterIdBytes(
private java.lang.Object nodePoolId_ = "";
/**
*
- * The name of the node pool to update.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public java.lang.String getNodePoolId() {
+ @java.lang.Deprecated public java.lang.String getNodePoolId() {
java.lang.Object ref = nodePoolId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -1020,12 +1114,13 @@ public java.lang.String getNodePoolId() {
}
/**
*
- * The name of the node pool to update.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getNodePoolIdBytes() {
java.lang.Object ref = nodePoolId_;
if (ref instanceof String) {
@@ -1040,12 +1135,13 @@ public java.lang.String getNodePoolId() {
}
/**
*
- * The name of the node pool to update.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public Builder setNodePoolId(
+ @java.lang.Deprecated public Builder setNodePoolId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -1057,12 +1153,13 @@ public Builder setNodePoolId(
}
/**
*
- * The name of the node pool to update.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public Builder clearNodePoolId() {
+ @java.lang.Deprecated public Builder clearNodePoolId() {
nodePoolId_ = getDefaultInstance().getNodePoolId();
onChanged();
@@ -1070,12 +1167,13 @@ public Builder clearNodePoolId() {
}
/**
*
- * The name of the node pool to update.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public Builder setNodePoolIdBytes(
+ @java.lang.Deprecated public Builder setNodePoolIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -1239,6 +1337,105 @@ public com.google.container.v1.NodeManagementOrBuilder getManagementOrBuilder()
}
return managementBuilder_;
}
+
+ private java.lang.Object name_ = "";
+ /**
+ *
+ * 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;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ *
+ * 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;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ *
+ * 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;
+ */
+ public Builder setName(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * 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;
+ */
+ public Builder clearName() {
+
+ name_ = getDefaultInstance().getName();
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * 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;
+ */
+ public Builder setNameBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolManagementRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolManagementRequestOrBuilder.java
index 64455f656e66..c3cfde3ff3c9 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolManagementRequestOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolManagementRequestOrBuilder.java
@@ -9,80 +9,88 @@ public interface SetNodePoolManagementRequestOrBuilder extends
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- java.lang.String getProjectId();
+ @java.lang.Deprecated java.lang.String getProjectId();
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getProjectIdBytes();
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- java.lang.String getZone();
+ @java.lang.Deprecated java.lang.String getZone();
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getZoneBytes();
/**
*
- * The name of the cluster to update.
+ * Deprecated. The name of the cluster to update.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- java.lang.String getClusterId();
+ @java.lang.Deprecated java.lang.String getClusterId();
/**
*
- * The name of the cluster to update.
+ * Deprecated. The name of the cluster to update.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getClusterIdBytes();
/**
*
- * The name of the node pool to update.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- java.lang.String getNodePoolId();
+ @java.lang.Deprecated java.lang.String getNodePoolId();
/**
*
- * The name of the node pool to update.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getNodePoolIdBytes();
/**
@@ -109,4 +117,26 @@ public interface SetNodePoolManagementRequestOrBuilder extends
* .google.container.v1.NodeManagement management = 5;
*/
com.google.container.v1.NodeManagementOrBuilder getManagementOrBuilder();
+
+ /**
+ *
+ * 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;
+ */
+ java.lang.String getName();
+ /**
+ *
+ * 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;
+ */
+ com.google.protobuf.ByteString
+ getNameBytes();
}
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolSizeRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolSizeRequest.java
index 3bcdc6144827..d4686ced8d66 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolSizeRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolSizeRequest.java
@@ -26,6 +26,7 @@ private SetNodePoolSizeRequest() {
clusterId_ = "";
nodePoolId_ = "";
nodeCount_ = 0;
+ name_ = "";
}
@java.lang.Override
@@ -81,6 +82,12 @@ private SetNodePoolSizeRequest(
nodeCount_ = input.readInt32();
break;
}
+ case 58: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ name_ = s;
+ break;
+ }
default: {
if (!parseUnknownFieldProto3(
input, unknownFields, extensionRegistry, tag)) {
@@ -117,13 +124,14 @@ private SetNodePoolSizeRequest(
private volatile java.lang.Object projectId_;
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -137,13 +145,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
@@ -161,14 +170,15 @@ public java.lang.String getProjectId() {
private volatile java.lang.Object zone_;
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -182,14 +192,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
@@ -207,12 +218,13 @@ public java.lang.String getZone() {
private volatile java.lang.Object clusterId_;
/**
*
- * The name of the cluster to update.
+ * Deprecated. The name of the cluster to update.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public java.lang.String getClusterId() {
+ @java.lang.Deprecated public java.lang.String getClusterId() {
java.lang.Object ref = clusterId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -226,12 +238,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster to update.
+ * Deprecated. The name of the cluster to update.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIdBytes() {
java.lang.Object ref = clusterId_;
if (ref instanceof java.lang.String) {
@@ -249,12 +262,13 @@ public java.lang.String getClusterId() {
private volatile java.lang.Object nodePoolId_;
/**
*
- * The name of the node pool to update.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public java.lang.String getNodePoolId() {
+ @java.lang.Deprecated public java.lang.String getNodePoolId() {
java.lang.Object ref = nodePoolId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -268,12 +282,13 @@ public java.lang.String getNodePoolId() {
}
/**
*
- * The name of the node pool to update.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getNodePoolIdBytes() {
java.lang.Object ref = nodePoolId_;
if (ref instanceof java.lang.String) {
@@ -300,6 +315,52 @@ public int getNodeCount() {
return nodeCount_;
}
+ public static final int NAME_FIELD_NUMBER = 7;
+ private volatile java.lang.Object name_;
+ /**
+ *
+ * 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;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ }
+ }
+ /**
+ *
+ * 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;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -329,6 +390,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
if (nodeCount_ != 0) {
output.writeInt32(5, nodeCount_);
}
+ if (!getNameBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 7, name_);
+ }
unknownFields.writeTo(output);
}
@@ -354,6 +418,9 @@ public int getSerializedSize() {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(5, nodeCount_);
}
+ if (!getNameBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, name_);
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -380,6 +447,8 @@ public boolean equals(final java.lang.Object obj) {
.equals(other.getNodePoolId());
result = result && (getNodeCount()
== other.getNodeCount());
+ result = result && getName()
+ .equals(other.getName());
result = result && unknownFields.equals(other.unknownFields);
return result;
}
@@ -401,6 +470,8 @@ public int hashCode() {
hash = (53 * hash) + getNodePoolId().hashCode();
hash = (37 * hash) + NODE_COUNT_FIELD_NUMBER;
hash = (53 * hash) + getNodeCount();
+ hash = (37 * hash) + NAME_FIELD_NUMBER;
+ hash = (53 * hash) + getName().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -549,6 +620,8 @@ public Builder clear() {
nodeCount_ = 0;
+ name_ = "";
+
return this;
}
@@ -580,6 +653,7 @@ public com.google.container.v1.SetNodePoolSizeRequest buildPartial() {
result.clusterId_ = clusterId_;
result.nodePoolId_ = nodePoolId_;
result.nodeCount_ = nodeCount_;
+ result.name_ = name_;
onBuilt();
return result;
}
@@ -647,6 +721,10 @@ public Builder mergeFrom(com.google.container.v1.SetNodePoolSizeRequest other) {
if (other.getNodeCount() != 0) {
setNodeCount(other.getNodeCount());
}
+ if (!other.getName().isEmpty()) {
+ name_ = other.name_;
+ onChanged();
+ }
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -679,13 +757,14 @@ public Builder mergeFrom(
private java.lang.Object projectId_ = "";
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -699,13 +778,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof String) {
@@ -720,13 +800,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectId(
+ @java.lang.Deprecated public Builder setProjectId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -738,13 +819,14 @@ public Builder setProjectId(
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder clearProjectId() {
+ @java.lang.Deprecated public Builder clearProjectId() {
projectId_ = getDefaultInstance().getProjectId();
onChanged();
@@ -752,13 +834,14 @@ public Builder clearProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectIdBytes(
+ @java.lang.Deprecated public Builder setProjectIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -773,14 +856,15 @@ public Builder setProjectIdBytes(
private java.lang.Object zone_ = "";
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -794,14 +878,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof String) {
@@ -816,14 +901,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZone(
+ @java.lang.Deprecated public Builder setZone(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -835,14 +921,15 @@ public Builder setZone(
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder clearZone() {
+ @java.lang.Deprecated public Builder clearZone() {
zone_ = getDefaultInstance().getZone();
onChanged();
@@ -850,14 +937,15 @@ public Builder clearZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZoneBytes(
+ @java.lang.Deprecated public Builder setZoneBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -872,12 +960,13 @@ public Builder setZoneBytes(
private java.lang.Object clusterId_ = "";
/**
*
- * The name of the cluster to update.
+ * Deprecated. The name of the cluster to update.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public java.lang.String getClusterId() {
+ @java.lang.Deprecated public java.lang.String getClusterId() {
java.lang.Object ref = clusterId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -891,12 +980,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster to update.
+ * Deprecated. The name of the cluster to update.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIdBytes() {
java.lang.Object ref = clusterId_;
if (ref instanceof String) {
@@ -911,12 +1001,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster to update.
+ * Deprecated. The name of the cluster to update.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder setClusterId(
+ @java.lang.Deprecated public Builder setClusterId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -928,12 +1019,13 @@ public Builder setClusterId(
}
/**
*
- * The name of the cluster to update.
+ * Deprecated. The name of the cluster to update.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder clearClusterId() {
+ @java.lang.Deprecated public Builder clearClusterId() {
clusterId_ = getDefaultInstance().getClusterId();
onChanged();
@@ -941,12 +1033,13 @@ public Builder clearClusterId() {
}
/**
*
- * The name of the cluster to update.
+ * Deprecated. The name of the cluster to update.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder setClusterIdBytes(
+ @java.lang.Deprecated public Builder setClusterIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -961,12 +1054,13 @@ public Builder setClusterIdBytes(
private java.lang.Object nodePoolId_ = "";
/**
*
- * The name of the node pool to update.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public java.lang.String getNodePoolId() {
+ @java.lang.Deprecated public java.lang.String getNodePoolId() {
java.lang.Object ref = nodePoolId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -980,12 +1074,13 @@ public java.lang.String getNodePoolId() {
}
/**
*
- * The name of the node pool to update.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getNodePoolIdBytes() {
java.lang.Object ref = nodePoolId_;
if (ref instanceof String) {
@@ -1000,12 +1095,13 @@ public java.lang.String getNodePoolId() {
}
/**
*
- * The name of the node pool to update.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public Builder setNodePoolId(
+ @java.lang.Deprecated public Builder setNodePoolId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -1017,12 +1113,13 @@ public Builder setNodePoolId(
}
/**
*
- * The name of the node pool to update.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public Builder clearNodePoolId() {
+ @java.lang.Deprecated public Builder clearNodePoolId() {
nodePoolId_ = getDefaultInstance().getNodePoolId();
onChanged();
@@ -1030,12 +1127,13 @@ public Builder clearNodePoolId() {
}
/**
*
- * The name of the node pool to update.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public Builder setNodePoolIdBytes(
+ @java.lang.Deprecated public Builder setNodePoolIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -1084,6 +1182,105 @@ public Builder clearNodeCount() {
onChanged();
return this;
}
+
+ private java.lang.Object name_ = "";
+ /**
+ *
+ * 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;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ *
+ * 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;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ *
+ * 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;
+ */
+ public Builder setName(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * 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;
+ */
+ public Builder clearName() {
+
+ name_ = getDefaultInstance().getName();
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * 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;
+ */
+ public Builder setNameBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolSizeRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolSizeRequestOrBuilder.java
index 6d859bf12899..a33b1c0c1c7b 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolSizeRequestOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolSizeRequestOrBuilder.java
@@ -9,80 +9,88 @@ public interface SetNodePoolSizeRequestOrBuilder extends
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- java.lang.String getProjectId();
+ @java.lang.Deprecated java.lang.String getProjectId();
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getProjectIdBytes();
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- java.lang.String getZone();
+ @java.lang.Deprecated java.lang.String getZone();
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getZoneBytes();
/**
*
- * The name of the cluster to update.
+ * Deprecated. The name of the cluster to update.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- java.lang.String getClusterId();
+ @java.lang.Deprecated java.lang.String getClusterId();
/**
*
- * The name of the cluster to update.
+ * Deprecated. The name of the cluster to update.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getClusterIdBytes();
/**
*
- * The name of the node pool to update.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- java.lang.String getNodePoolId();
+ @java.lang.Deprecated java.lang.String getNodePoolId();
/**
*
- * The name of the node pool to update.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getNodePoolIdBytes();
/**
@@ -93,4 +101,26 @@ public interface SetNodePoolSizeRequestOrBuilder extends
* int32 node_count = 5;
*/
int getNodeCount();
+
+ /**
+ *
+ * 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;
+ */
+ java.lang.String getName();
+ /**
+ *
+ * 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;
+ */
+ com.google.protobuf.ByteString
+ getNameBytes();
}
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/StartIPRotationRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/StartIPRotationRequest.java
index 634a3948bdcd..7cff7014363b 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/StartIPRotationRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/StartIPRotationRequest.java
@@ -24,6 +24,8 @@ private StartIPRotationRequest() {
projectId_ = "";
zone_ = "";
clusterId_ = "";
+ name_ = "";
+ rotateCredentials_ = false;
}
@java.lang.Override
@@ -68,6 +70,17 @@ private StartIPRotationRequest(
clusterId_ = s;
break;
}
+ case 50: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ name_ = s;
+ break;
+ }
+ case 56: {
+
+ rotateCredentials_ = input.readBool();
+ break;
+ }
default: {
if (!parseUnknownFieldProto3(
input, unknownFields, extensionRegistry, tag)) {
@@ -104,13 +117,14 @@ private StartIPRotationRequest(
private volatile java.lang.Object projectId_;
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -124,13 +138,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
@@ -148,14 +163,15 @@ public java.lang.String getProjectId() {
private volatile java.lang.Object zone_;
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -169,14 +185,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
@@ -194,12 +211,13 @@ public java.lang.String getZone() {
private volatile java.lang.Object clusterId_;
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public java.lang.String getClusterId() {
+ @java.lang.Deprecated public java.lang.String getClusterId() {
java.lang.Object ref = clusterId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -213,12 +231,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIdBytes() {
java.lang.Object ref = clusterId_;
if (ref instanceof java.lang.String) {
@@ -232,6 +251,63 @@ public java.lang.String getClusterId() {
}
}
+ public static final int NAME_FIELD_NUMBER = 6;
+ private volatile java.lang.Object name_;
+ /**
+ *
+ * The name (project, location, cluster id) of the cluster to start IP
+ * rotation. Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ }
+ }
+ /**
+ *
+ * The name (project, location, cluster id) of the cluster to start IP
+ * rotation. Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
+ public static final int ROTATE_CREDENTIALS_FIELD_NUMBER = 7;
+ private boolean rotateCredentials_;
+ /**
+ *
+ * Whether to rotate credentials during IP rotation.
+ *
+ *
+ * bool rotate_credentials = 7;
+ */
+ public boolean getRotateCredentials() {
+ return rotateCredentials_;
+ }
+
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -255,6 +331,12 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
if (!getClusterIdBytes().isEmpty()) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 3, clusterId_);
}
+ if (!getNameBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 6, name_);
+ }
+ if (rotateCredentials_ != false) {
+ output.writeBool(7, rotateCredentials_);
+ }
unknownFields.writeTo(output);
}
@@ -273,6 +355,13 @@ public int getSerializedSize() {
if (!getClusterIdBytes().isEmpty()) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, clusterId_);
}
+ if (!getNameBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, name_);
+ }
+ if (rotateCredentials_ != false) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeBoolSize(7, rotateCredentials_);
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -295,6 +384,10 @@ public boolean equals(final java.lang.Object obj) {
.equals(other.getZone());
result = result && getClusterId()
.equals(other.getClusterId());
+ result = result && getName()
+ .equals(other.getName());
+ result = result && (getRotateCredentials()
+ == other.getRotateCredentials());
result = result && unknownFields.equals(other.unknownFields);
return result;
}
@@ -312,6 +405,11 @@ public int hashCode() {
hash = (53 * hash) + getZone().hashCode();
hash = (37 * hash) + CLUSTER_ID_FIELD_NUMBER;
hash = (53 * hash) + getClusterId().hashCode();
+ hash = (37 * hash) + NAME_FIELD_NUMBER;
+ hash = (53 * hash) + getName().hashCode();
+ hash = (37 * hash) + ROTATE_CREDENTIALS_FIELD_NUMBER;
+ hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+ getRotateCredentials());
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -456,6 +554,10 @@ public Builder clear() {
clusterId_ = "";
+ name_ = "";
+
+ rotateCredentials_ = false;
+
return this;
}
@@ -485,6 +587,8 @@ public com.google.container.v1.StartIPRotationRequest buildPartial() {
result.projectId_ = projectId_;
result.zone_ = zone_;
result.clusterId_ = clusterId_;
+ result.name_ = name_;
+ result.rotateCredentials_ = rotateCredentials_;
onBuilt();
return result;
}
@@ -545,6 +649,13 @@ public Builder mergeFrom(com.google.container.v1.StartIPRotationRequest other) {
clusterId_ = other.clusterId_;
onChanged();
}
+ if (!other.getName().isEmpty()) {
+ name_ = other.name_;
+ onChanged();
+ }
+ if (other.getRotateCredentials() != false) {
+ setRotateCredentials(other.getRotateCredentials());
+ }
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -577,13 +688,14 @@ public Builder mergeFrom(
private java.lang.Object projectId_ = "";
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -597,13 +709,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof String) {
@@ -618,13 +731,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectId(
+ @java.lang.Deprecated public Builder setProjectId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -636,13 +750,14 @@ public Builder setProjectId(
}
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder clearProjectId() {
+ @java.lang.Deprecated public Builder clearProjectId() {
projectId_ = getDefaultInstance().getProjectId();
onChanged();
@@ -650,13 +765,14 @@ public Builder clearProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectIdBytes(
+ @java.lang.Deprecated public Builder setProjectIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -671,14 +787,15 @@ public Builder setProjectIdBytes(
private java.lang.Object zone_ = "";
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -692,14 +809,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof String) {
@@ -714,14 +832,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZone(
+ @java.lang.Deprecated public Builder setZone(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -733,14 +852,15 @@ public Builder setZone(
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder clearZone() {
+ @java.lang.Deprecated public Builder clearZone() {
zone_ = getDefaultInstance().getZone();
onChanged();
@@ -748,14 +868,15 @@ public Builder clearZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZoneBytes(
+ @java.lang.Deprecated public Builder setZoneBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -770,12 +891,13 @@ public Builder setZoneBytes(
private java.lang.Object clusterId_ = "";
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public java.lang.String getClusterId() {
+ @java.lang.Deprecated public java.lang.String getClusterId() {
java.lang.Object ref = clusterId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -789,12 +911,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIdBytes() {
java.lang.Object ref = clusterId_;
if (ref instanceof String) {
@@ -809,12 +932,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder setClusterId(
+ @java.lang.Deprecated public Builder setClusterId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -826,12 +950,13 @@ public Builder setClusterId(
}
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder clearClusterId() {
+ @java.lang.Deprecated public Builder clearClusterId() {
clusterId_ = getDefaultInstance().getClusterId();
onChanged();
@@ -839,12 +964,13 @@ public Builder clearClusterId() {
}
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder setClusterIdBytes(
+ @java.lang.Deprecated public Builder setClusterIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -855,6 +981,138 @@ public Builder setClusterIdBytes(
onChanged();
return this;
}
+
+ private java.lang.Object name_ = "";
+ /**
+ *
+ * The name (project, location, cluster id) of the cluster to start IP
+ * rotation. Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ *
+ * The name (project, location, cluster id) of the cluster to start IP
+ * rotation. Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ *
+ * The name (project, location, cluster id) of the cluster to start IP
+ * rotation. Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ public Builder setName(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * The name (project, location, cluster id) of the cluster to start IP
+ * rotation. Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ public Builder clearName() {
+
+ name_ = getDefaultInstance().getName();
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * The name (project, location, cluster id) of the cluster to start IP
+ * rotation. Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ public Builder setNameBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
+
+ private boolean rotateCredentials_ ;
+ /**
+ *
+ * Whether to rotate credentials during IP rotation.
+ *
+ *
+ * bool rotate_credentials = 7;
+ */
+ public boolean getRotateCredentials() {
+ return rotateCredentials_;
+ }
+ /**
+ *
+ * Whether to rotate credentials during IP rotation.
+ *
+ *
+ * bool rotate_credentials = 7;
+ */
+ public Builder setRotateCredentials(boolean value) {
+
+ rotateCredentials_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * Whether to rotate credentials during IP rotation.
+ *
+ *
+ * bool rotate_credentials = 7;
+ */
+ public Builder clearRotateCredentials() {
+
+ rotateCredentials_ = false;
+ onChanged();
+ return this;
+ }
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/StartIPRotationRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/StartIPRotationRequestOrBuilder.java
index 1a593fc0aae9..a4bb7bde0f36 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/StartIPRotationRequestOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/StartIPRotationRequestOrBuilder.java
@@ -9,61 +9,96 @@ public interface StartIPRotationRequestOrBuilder extends
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- java.lang.String getProjectId();
+ @java.lang.Deprecated java.lang.String getProjectId();
/**
*
- * The Google Developers Console [project ID or project
+ * Deprecated. 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;
+ * string project_id = 1 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getProjectIdBytes();
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- java.lang.String getZone();
+ @java.lang.Deprecated java.lang.String getZone();
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getZoneBytes();
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- java.lang.String getClusterId();
+ @java.lang.Deprecated java.lang.String getClusterId();
/**
*
- * The name of the cluster.
+ * Deprecated. The name of the cluster.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getClusterIdBytes();
+
+ /**
+ *
+ * The name (project, location, cluster id) of the cluster to start IP
+ * rotation. Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ java.lang.String getName();
+ /**
+ *
+ * The name (project, location, cluster id) of the cluster to start IP
+ * rotation. Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 6;
+ */
+ com.google.protobuf.ByteString
+ getNameBytes();
+
+ /**
+ *
+ * Whether to rotate credentials during IP rotation.
+ *
+ *
+ * bool rotate_credentials = 7;
+ */
+ boolean getRotateCredentials();
}
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateClusterRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateClusterRequest.java
index 6b6a6e9fe04f..e7c26d81ca45 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateClusterRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateClusterRequest.java
@@ -23,6 +23,7 @@ private UpdateClusterRequest() {
projectId_ = "";
zone_ = "";
clusterId_ = "";
+ name_ = "";
}
@java.lang.Override
@@ -80,6 +81,12 @@ private UpdateClusterRequest(
break;
}
+ case 42: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ name_ = s;
+ break;
+ }
default: {
if (!parseUnknownFieldProto3(
input, unknownFields, extensionRegistry, tag)) {
@@ -116,13 +123,14 @@ private UpdateClusterRequest(
private volatile java.lang.Object projectId_;
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -136,13 +144,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
@@ -160,14 +169,15 @@ public java.lang.String getProjectId() {
private volatile java.lang.Object zone_;
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -181,14 +191,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
@@ -206,12 +217,13 @@ public java.lang.String getZone() {
private volatile java.lang.Object clusterId_;
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public java.lang.String getClusterId() {
+ @java.lang.Deprecated public java.lang.String getClusterId() {
java.lang.Object ref = clusterId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -225,12 +237,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIdBytes() {
java.lang.Object ref = clusterId_;
if (ref instanceof java.lang.String) {
@@ -277,6 +290,50 @@ public com.google.container.v1.ClusterUpdateOrBuilder getUpdateOrBuilder() {
return getUpdate();
}
+ public static final int NAME_FIELD_NUMBER = 5;
+ private volatile java.lang.Object name_;
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to update.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 5;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ }
+ }
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to update.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 5;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -303,6 +360,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
if (update_ != null) {
output.writeMessage(4, getUpdate());
}
+ if (!getNameBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 5, name_);
+ }
unknownFields.writeTo(output);
}
@@ -325,6 +385,9 @@ public int getSerializedSize() {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(4, getUpdate());
}
+ if (!getNameBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, name_);
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -352,6 +415,8 @@ public boolean equals(final java.lang.Object obj) {
result = result && getUpdate()
.equals(other.getUpdate());
}
+ result = result && getName()
+ .equals(other.getName());
result = result && unknownFields.equals(other.unknownFields);
return result;
}
@@ -373,6 +438,8 @@ public int hashCode() {
hash = (37 * hash) + UPDATE_FIELD_NUMBER;
hash = (53 * hash) + getUpdate().hashCode();
}
+ hash = (37 * hash) + NAME_FIELD_NUMBER;
+ hash = (53 * hash) + getName().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -522,6 +589,8 @@ public Builder clear() {
update_ = null;
updateBuilder_ = null;
}
+ name_ = "";
+
return this;
}
@@ -556,6 +625,7 @@ public com.google.container.v1.UpdateClusterRequest buildPartial() {
} else {
result.update_ = updateBuilder_.build();
}
+ result.name_ = name_;
onBuilt();
return result;
}
@@ -619,6 +689,10 @@ public Builder mergeFrom(com.google.container.v1.UpdateClusterRequest other) {
if (other.hasUpdate()) {
mergeUpdate(other.getUpdate());
}
+ if (!other.getName().isEmpty()) {
+ name_ = other.name_;
+ onChanged();
+ }
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -651,13 +725,14 @@ public Builder mergeFrom(
private java.lang.Object projectId_ = "";
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -671,13 +746,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof String) {
@@ -692,13 +768,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectId(
+ @java.lang.Deprecated public Builder setProjectId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -710,13 +787,14 @@ public Builder setProjectId(
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder clearProjectId() {
+ @java.lang.Deprecated public Builder clearProjectId() {
projectId_ = getDefaultInstance().getProjectId();
onChanged();
@@ -724,13 +802,14 @@ public Builder clearProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectIdBytes(
+ @java.lang.Deprecated public Builder setProjectIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -745,14 +824,15 @@ public Builder setProjectIdBytes(
private java.lang.Object zone_ = "";
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -766,14 +846,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof String) {
@@ -788,14 +869,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZone(
+ @java.lang.Deprecated public Builder setZone(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -807,14 +889,15 @@ public Builder setZone(
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder clearZone() {
+ @java.lang.Deprecated public Builder clearZone() {
zone_ = getDefaultInstance().getZone();
onChanged();
@@ -822,14 +905,15 @@ public Builder clearZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZoneBytes(
+ @java.lang.Deprecated public Builder setZoneBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -844,12 +928,13 @@ public Builder setZoneBytes(
private java.lang.Object clusterId_ = "";
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public java.lang.String getClusterId() {
+ @java.lang.Deprecated public java.lang.String getClusterId() {
java.lang.Object ref = clusterId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -863,12 +948,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIdBytes() {
java.lang.Object ref = clusterId_;
if (ref instanceof String) {
@@ -883,12 +969,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder setClusterId(
+ @java.lang.Deprecated public Builder setClusterId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -900,12 +987,13 @@ public Builder setClusterId(
}
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder clearClusterId() {
+ @java.lang.Deprecated public Builder clearClusterId() {
clusterId_ = getDefaultInstance().getClusterId();
onChanged();
@@ -913,12 +1001,13 @@ public Builder clearClusterId() {
}
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder setClusterIdBytes(
+ @java.lang.Deprecated public Builder setClusterIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -1082,6 +1171,100 @@ public com.google.container.v1.ClusterUpdateOrBuilder getUpdateOrBuilder() {
}
return updateBuilder_;
}
+
+ private java.lang.Object name_ = "";
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to update.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 5;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to update.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 5;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to update.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 5;
+ */
+ public Builder setName(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to update.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 5;
+ */
+ public Builder clearName() {
+
+ name_ = getDefaultInstance().getName();
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to update.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 5;
+ */
+ public Builder setNameBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateClusterRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateClusterRequestOrBuilder.java
index 2e56721ef626..0973188ba4fa 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateClusterRequestOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateClusterRequestOrBuilder.java
@@ -9,62 +9,68 @@ public interface UpdateClusterRequestOrBuilder extends
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- java.lang.String getProjectId();
+ @java.lang.Deprecated java.lang.String getProjectId();
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getProjectIdBytes();
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- java.lang.String getZone();
+ @java.lang.Deprecated java.lang.String getZone();
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getZoneBytes();
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- java.lang.String getClusterId();
+ @java.lang.Deprecated java.lang.String getClusterId();
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getClusterIdBytes();
/**
@@ -91,4 +97,24 @@ public interface UpdateClusterRequestOrBuilder extends
* .google.container.v1.ClusterUpdate update = 4;
*/
com.google.container.v1.ClusterUpdateOrBuilder getUpdateOrBuilder();
+
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to update.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 5;
+ */
+ java.lang.String getName();
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to update.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 5;
+ */
+ com.google.protobuf.ByteString
+ getNameBytes();
}
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateMasterRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateMasterRequest.java
index b7b74590bb92..9ceec1027cb1 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateMasterRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateMasterRequest.java
@@ -24,6 +24,7 @@ private UpdateMasterRequest() {
zone_ = "";
clusterId_ = "";
masterVersion_ = "";
+ name_ = "";
}
@java.lang.Override
@@ -74,6 +75,12 @@ private UpdateMasterRequest(
masterVersion_ = s;
break;
}
+ case 58: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ name_ = s;
+ break;
+ }
default: {
if (!parseUnknownFieldProto3(
input, unknownFields, extensionRegistry, tag)) {
@@ -110,13 +117,14 @@ private UpdateMasterRequest(
private volatile java.lang.Object projectId_;
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -130,13 +138,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
@@ -154,14 +163,15 @@ public java.lang.String getProjectId() {
private volatile java.lang.Object zone_;
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -175,14 +185,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
@@ -200,12 +211,13 @@ public java.lang.String getZone() {
private volatile java.lang.Object clusterId_;
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public java.lang.String getClusterId() {
+ @java.lang.Deprecated public java.lang.String getClusterId() {
java.lang.Object ref = clusterId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -219,12 +231,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIdBytes() {
java.lang.Object ref = clusterId_;
if (ref instanceof java.lang.String) {
@@ -242,9 +255,14 @@ public java.lang.String getClusterId() {
private volatile java.lang.Object masterVersion_;
/**
*
- * The Kubernetes version to change the master to. The only valid value is the
- * latest supported version. Use "-" to have the server automatically select
- * the latest version.
+ * 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;
@@ -263,9 +281,14 @@ public java.lang.String getMasterVersion() {
}
/**
*
- * 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.
+ * 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;
@@ -284,6 +307,50 @@ public java.lang.String getMasterVersion() {
}
}
+ public static final int NAME_FIELD_NUMBER = 7;
+ private volatile java.lang.Object name_;
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to update.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 7;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ }
+ }
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to update.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 7;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -310,6 +377,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
if (!getMasterVersionBytes().isEmpty()) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 4, masterVersion_);
}
+ if (!getNameBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 7, name_);
+ }
unknownFields.writeTo(output);
}
@@ -331,6 +401,9 @@ public int getSerializedSize() {
if (!getMasterVersionBytes().isEmpty()) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, masterVersion_);
}
+ if (!getNameBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, name_);
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -355,6 +428,8 @@ public boolean equals(final java.lang.Object obj) {
.equals(other.getClusterId());
result = result && getMasterVersion()
.equals(other.getMasterVersion());
+ result = result && getName()
+ .equals(other.getName());
result = result && unknownFields.equals(other.unknownFields);
return result;
}
@@ -374,6 +449,8 @@ public int hashCode() {
hash = (53 * hash) + getClusterId().hashCode();
hash = (37 * hash) + MASTER_VERSION_FIELD_NUMBER;
hash = (53 * hash) + getMasterVersion().hashCode();
+ hash = (37 * hash) + NAME_FIELD_NUMBER;
+ hash = (53 * hash) + getName().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -519,6 +596,8 @@ public Builder clear() {
masterVersion_ = "";
+ name_ = "";
+
return this;
}
@@ -549,6 +628,7 @@ public com.google.container.v1.UpdateMasterRequest buildPartial() {
result.zone_ = zone_;
result.clusterId_ = clusterId_;
result.masterVersion_ = masterVersion_;
+ result.name_ = name_;
onBuilt();
return result;
}
@@ -613,6 +693,10 @@ public Builder mergeFrom(com.google.container.v1.UpdateMasterRequest other) {
masterVersion_ = other.masterVersion_;
onChanged();
}
+ if (!other.getName().isEmpty()) {
+ name_ = other.name_;
+ onChanged();
+ }
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -645,13 +729,14 @@ public Builder mergeFrom(
private java.lang.Object projectId_ = "";
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -665,13 +750,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof String) {
@@ -686,13 +772,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectId(
+ @java.lang.Deprecated public Builder setProjectId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -704,13 +791,14 @@ public Builder setProjectId(
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder clearProjectId() {
+ @java.lang.Deprecated public Builder clearProjectId() {
projectId_ = getDefaultInstance().getProjectId();
onChanged();
@@ -718,13 +806,14 @@ public Builder clearProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectIdBytes(
+ @java.lang.Deprecated public Builder setProjectIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -739,14 +828,15 @@ public Builder setProjectIdBytes(
private java.lang.Object zone_ = "";
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -760,14 +850,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof String) {
@@ -782,14 +873,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZone(
+ @java.lang.Deprecated public Builder setZone(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -801,14 +893,15 @@ public Builder setZone(
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder clearZone() {
+ @java.lang.Deprecated public Builder clearZone() {
zone_ = getDefaultInstance().getZone();
onChanged();
@@ -816,14 +909,15 @@ public Builder clearZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZoneBytes(
+ @java.lang.Deprecated public Builder setZoneBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -838,12 +932,13 @@ public Builder setZoneBytes(
private java.lang.Object clusterId_ = "";
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public java.lang.String getClusterId() {
+ @java.lang.Deprecated public java.lang.String getClusterId() {
java.lang.Object ref = clusterId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -857,12 +952,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIdBytes() {
java.lang.Object ref = clusterId_;
if (ref instanceof String) {
@@ -877,12 +973,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder setClusterId(
+ @java.lang.Deprecated public Builder setClusterId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -894,12 +991,13 @@ public Builder setClusterId(
}
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder clearClusterId() {
+ @java.lang.Deprecated public Builder clearClusterId() {
clusterId_ = getDefaultInstance().getClusterId();
onChanged();
@@ -907,12 +1005,13 @@ public Builder clearClusterId() {
}
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder setClusterIdBytes(
+ @java.lang.Deprecated public Builder setClusterIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -927,9 +1026,14 @@ public Builder setClusterIdBytes(
private java.lang.Object masterVersion_ = "";
/**
*
- * The Kubernetes version to change the master to. The only valid value is the
- * latest supported version. Use "-" to have the server automatically select
- * the latest version.
+ * 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;
@@ -948,9 +1052,14 @@ public java.lang.String getMasterVersion() {
}
/**
*
- * 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.
+ * 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;
@@ -970,9 +1079,14 @@ public java.lang.String getMasterVersion() {
}
/**
*
- * 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.
+ * 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;
@@ -989,9 +1103,14 @@ public Builder setMasterVersion(
}
/**
*
- * 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.
+ * 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;
@@ -1004,9 +1123,14 @@ public Builder clearMasterVersion() {
}
/**
*
- * 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.
+ * 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;
@@ -1022,6 +1146,100 @@ public Builder setMasterVersionBytes(
onChanged();
return this;
}
+
+ private java.lang.Object name_ = "";
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to update.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 7;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to update.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 7;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to update.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 7;
+ */
+ public Builder setName(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to update.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 7;
+ */
+ public Builder clearName() {
+
+ name_ = getDefaultInstance().getName();
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to update.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 7;
+ */
+ public Builder setNameBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateMasterRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateMasterRequestOrBuilder.java
index a4b2e7f07534..5db5839219d7 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateMasterRequestOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateMasterRequestOrBuilder.java
@@ -9,69 +9,80 @@ public interface UpdateMasterRequestOrBuilder extends
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- java.lang.String getProjectId();
+ @java.lang.Deprecated java.lang.String getProjectId();
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getProjectIdBytes();
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- java.lang.String getZone();
+ @java.lang.Deprecated java.lang.String getZone();
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getZoneBytes();
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- java.lang.String getClusterId();
+ @java.lang.Deprecated java.lang.String getClusterId();
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getClusterIdBytes();
/**
*
- * 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.
+ * 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;
@@ -79,13 +90,38 @@ public interface UpdateMasterRequestOrBuilder extends
java.lang.String getMasterVersion();
/**
*
- * 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.
+ * 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;
*/
com.google.protobuf.ByteString
getMasterVersionBytes();
+
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to update.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 7;
+ */
+ java.lang.String getName();
+ /**
+ *
+ * The name (project, location, cluster) of the cluster to update.
+ * Specified in the format 'projects/*/locations/*/clusters/*'.
+ *
+ *
+ * string name = 7;
+ */
+ com.google.protobuf.ByteString
+ getNameBytes();
}
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateNodePoolRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateNodePoolRequest.java
index 488dceba53d4..e445590dd6d0 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateNodePoolRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateNodePoolRequest.java
@@ -26,6 +26,7 @@ private UpdateNodePoolRequest() {
nodePoolId_ = "";
nodeVersion_ = "";
imageType_ = "";
+ name_ = "";
}
@java.lang.Override
@@ -88,6 +89,12 @@ private UpdateNodePoolRequest(
imageType_ = s;
break;
}
+ case 66: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ name_ = s;
+ break;
+ }
default: {
if (!parseUnknownFieldProto3(
input, unknownFields, extensionRegistry, tag)) {
@@ -124,13 +131,14 @@ private UpdateNodePoolRequest(
private volatile java.lang.Object projectId_;
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -144,13 +152,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof java.lang.String) {
@@ -168,14 +177,15 @@ public java.lang.String getProjectId() {
private volatile java.lang.Object zone_;
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -189,14 +199,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof java.lang.String) {
@@ -214,12 +225,13 @@ public java.lang.String getZone() {
private volatile java.lang.Object clusterId_;
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public java.lang.String getClusterId() {
+ @java.lang.Deprecated public java.lang.String getClusterId() {
java.lang.Object ref = clusterId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -233,12 +245,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIdBytes() {
java.lang.Object ref = clusterId_;
if (ref instanceof java.lang.String) {
@@ -256,12 +269,13 @@ public java.lang.String getClusterId() {
private volatile java.lang.Object nodePoolId_;
/**
*
- * The name of the node pool to upgrade.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public java.lang.String getNodePoolId() {
+ @java.lang.Deprecated public java.lang.String getNodePoolId() {
java.lang.Object ref = nodePoolId_;
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
@@ -275,12 +289,13 @@ public java.lang.String getNodePoolId() {
}
/**
*
- * The name of the node pool to upgrade.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getNodePoolIdBytes() {
java.lang.Object ref = nodePoolId_;
if (ref instanceof java.lang.String) {
@@ -299,8 +314,14 @@ public java.lang.String getNodePoolId() {
/**
*
* The Kubernetes version to change the nodes to (typically an
- * upgrade). Use `-` to upgrade to the latest version supported by
- * the server.
+ * upgrade).
+ * Users may specify either explicit versions offered by Kubernetes Engine or
+ * version aliases, which have the following behavior:
+ * - "latest": picks the highest valid Kubernetes version
+ * - "1.X": picks the highest valid patch+gke.N patch in the 1.X version
+ * - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version
+ * - "1.X.Y-gke.N": picks an explicit Kubernetes version
+ * - "-": picks the Kubernetes master version
*
*
* string node_version = 5;
@@ -320,8 +341,14 @@ public java.lang.String getNodeVersion() {
/**
*
* The Kubernetes version to change the nodes to (typically an
- * upgrade). Use `-` to upgrade to the latest version supported by
- * the server.
+ * upgrade).
+ * Users may specify either explicit versions offered by Kubernetes Engine or
+ * version aliases, which have the following behavior:
+ * - "latest": picks the highest valid Kubernetes version
+ * - "1.X": picks the highest valid patch+gke.N patch in the 1.X version
+ * - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version
+ * - "1.X.Y-gke.N": picks an explicit Kubernetes version
+ * - "-": picks the Kubernetes master version
*
*
* string node_version = 5;
@@ -382,6 +409,52 @@ public java.lang.String getImageType() {
}
}
+ public static final int NAME_FIELD_NUMBER = 8;
+ private volatile java.lang.Object name_;
+ /**
+ *
+ * The name (project, location, cluster, node pool) of the node pool to
+ * update. Specified in the format
+ * 'projects/*/locations/*/clusters/*/nodePools/*'.
+ *
+ *
+ * string name = 8;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ }
+ }
+ /**
+ *
+ * The name (project, location, cluster, node pool) of the node pool to
+ * update. Specified in the format
+ * 'projects/*/locations/*/clusters/*/nodePools/*'.
+ *
+ *
+ * string name = 8;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -414,6 +487,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
if (!getImageTypeBytes().isEmpty()) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 6, imageType_);
}
+ if (!getNameBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 8, name_);
+ }
unknownFields.writeTo(output);
}
@@ -441,6 +517,9 @@ public int getSerializedSize() {
if (!getImageTypeBytes().isEmpty()) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, imageType_);
}
+ if (!getNameBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, name_);
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -469,6 +548,8 @@ public boolean equals(final java.lang.Object obj) {
.equals(other.getNodeVersion());
result = result && getImageType()
.equals(other.getImageType());
+ result = result && getName()
+ .equals(other.getName());
result = result && unknownFields.equals(other.unknownFields);
return result;
}
@@ -492,6 +573,8 @@ public int hashCode() {
hash = (53 * hash) + getNodeVersion().hashCode();
hash = (37 * hash) + IMAGE_TYPE_FIELD_NUMBER;
hash = (53 * hash) + getImageType().hashCode();
+ hash = (37 * hash) + NAME_FIELD_NUMBER;
+ hash = (53 * hash) + getName().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -641,6 +724,8 @@ public Builder clear() {
imageType_ = "";
+ name_ = "";
+
return this;
}
@@ -673,6 +758,7 @@ public com.google.container.v1.UpdateNodePoolRequest buildPartial() {
result.nodePoolId_ = nodePoolId_;
result.nodeVersion_ = nodeVersion_;
result.imageType_ = imageType_;
+ result.name_ = name_;
onBuilt();
return result;
}
@@ -745,6 +831,10 @@ public Builder mergeFrom(com.google.container.v1.UpdateNodePoolRequest other) {
imageType_ = other.imageType_;
onChanged();
}
+ if (!other.getName().isEmpty()) {
+ name_ = other.name_;
+ onChanged();
+ }
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -777,13 +867,14 @@ public Builder mergeFrom(
private java.lang.Object projectId_ = "";
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public java.lang.String getProjectId() {
+ @java.lang.Deprecated public java.lang.String getProjectId() {
java.lang.Object ref = projectId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -797,13 +888,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getProjectIdBytes() {
java.lang.Object ref = projectId_;
if (ref instanceof String) {
@@ -818,13 +910,14 @@ public java.lang.String getProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectId(
+ @java.lang.Deprecated public Builder setProjectId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -836,13 +929,14 @@ public Builder setProjectId(
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder clearProjectId() {
+ @java.lang.Deprecated public Builder clearProjectId() {
projectId_ = getDefaultInstance().getProjectId();
onChanged();
@@ -850,13 +944,14 @@ public Builder clearProjectId() {
}
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- public Builder setProjectIdBytes(
+ @java.lang.Deprecated public Builder setProjectIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -871,14 +966,15 @@ public Builder setProjectIdBytes(
private java.lang.Object zone_ = "";
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public java.lang.String getZone() {
+ @java.lang.Deprecated public java.lang.String getZone() {
java.lang.Object ref = zone_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -892,14 +988,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getZoneBytes() {
java.lang.Object ref = zone_;
if (ref instanceof String) {
@@ -914,14 +1011,15 @@ public java.lang.String getZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZone(
+ @java.lang.Deprecated public Builder setZone(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -933,14 +1031,15 @@ public Builder setZone(
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder clearZone() {
+ @java.lang.Deprecated public Builder clearZone() {
zone_ = getDefaultInstance().getZone();
onChanged();
@@ -948,14 +1047,15 @@ public Builder clearZone() {
}
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- public Builder setZoneBytes(
+ @java.lang.Deprecated public Builder setZoneBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -970,12 +1070,13 @@ public Builder setZoneBytes(
private java.lang.Object clusterId_ = "";
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public java.lang.String getClusterId() {
+ @java.lang.Deprecated public java.lang.String getClusterId() {
java.lang.Object ref = clusterId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -989,12 +1090,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getClusterIdBytes() {
java.lang.Object ref = clusterId_;
if (ref instanceof String) {
@@ -1009,12 +1111,13 @@ public java.lang.String getClusterId() {
}
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder setClusterId(
+ @java.lang.Deprecated public Builder setClusterId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -1026,12 +1129,13 @@ public Builder setClusterId(
}
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder clearClusterId() {
+ @java.lang.Deprecated public Builder clearClusterId() {
clusterId_ = getDefaultInstance().getClusterId();
onChanged();
@@ -1039,12 +1143,13 @@ public Builder clearClusterId() {
}
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- public Builder setClusterIdBytes(
+ @java.lang.Deprecated public Builder setClusterIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -1059,12 +1164,13 @@ public Builder setClusterIdBytes(
private java.lang.Object nodePoolId_ = "";
/**
*
- * The name of the node pool to upgrade.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public java.lang.String getNodePoolId() {
+ @java.lang.Deprecated public java.lang.String getNodePoolId() {
java.lang.Object ref = nodePoolId_;
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
@@ -1078,12 +1184,13 @@ public java.lang.String getNodePoolId() {
}
/**
*
- * The name of the node pool to upgrade.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public com.google.protobuf.ByteString
+ @java.lang.Deprecated public com.google.protobuf.ByteString
getNodePoolIdBytes() {
java.lang.Object ref = nodePoolId_;
if (ref instanceof String) {
@@ -1098,12 +1205,13 @@ public java.lang.String getNodePoolId() {
}
/**
*
- * The name of the node pool to upgrade.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public Builder setNodePoolId(
+ @java.lang.Deprecated public Builder setNodePoolId(
java.lang.String value) {
if (value == null) {
throw new NullPointerException();
@@ -1115,12 +1223,13 @@ public Builder setNodePoolId(
}
/**
*
- * The name of the node pool to upgrade.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public Builder clearNodePoolId() {
+ @java.lang.Deprecated public Builder clearNodePoolId() {
nodePoolId_ = getDefaultInstance().getNodePoolId();
onChanged();
@@ -1128,12 +1237,13 @@ public Builder clearNodePoolId() {
}
/**
*
- * The name of the node pool to upgrade.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- public Builder setNodePoolIdBytes(
+ @java.lang.Deprecated public Builder setNodePoolIdBytes(
com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
@@ -1149,8 +1259,14 @@ public Builder setNodePoolIdBytes(
/**
*
* The Kubernetes version to change the nodes to (typically an
- * upgrade). Use `-` to upgrade to the latest version supported by
- * the server.
+ * upgrade).
+ * Users may specify either explicit versions offered by Kubernetes Engine or
+ * version aliases, which have the following behavior:
+ * - "latest": picks the highest valid Kubernetes version
+ * - "1.X": picks the highest valid patch+gke.N patch in the 1.X version
+ * - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version
+ * - "1.X.Y-gke.N": picks an explicit Kubernetes version
+ * - "-": picks the Kubernetes master version
*
*
* string node_version = 5;
@@ -1170,8 +1286,14 @@ public java.lang.String getNodeVersion() {
/**
*
* The Kubernetes version to change the nodes to (typically an
- * upgrade). Use `-` to upgrade to the latest version supported by
- * the server.
+ * upgrade).
+ * Users may specify either explicit versions offered by Kubernetes Engine or
+ * version aliases, which have the following behavior:
+ * - "latest": picks the highest valid Kubernetes version
+ * - "1.X": picks the highest valid patch+gke.N patch in the 1.X version
+ * - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version
+ * - "1.X.Y-gke.N": picks an explicit Kubernetes version
+ * - "-": picks the Kubernetes master version
*
*
* string node_version = 5;
@@ -1192,8 +1314,14 @@ public java.lang.String getNodeVersion() {
/**
*
* The Kubernetes version to change the nodes to (typically an
- * upgrade). Use `-` to upgrade to the latest version supported by
- * the server.
+ * upgrade).
+ * Users may specify either explicit versions offered by Kubernetes Engine or
+ * version aliases, which have the following behavior:
+ * - "latest": picks the highest valid Kubernetes version
+ * - "1.X": picks the highest valid patch+gke.N patch in the 1.X version
+ * - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version
+ * - "1.X.Y-gke.N": picks an explicit Kubernetes version
+ * - "-": picks the Kubernetes master version
*
*
* string node_version = 5;
@@ -1211,8 +1339,14 @@ public Builder setNodeVersion(
/**
*
* The Kubernetes version to change the nodes to (typically an
- * upgrade). Use `-` to upgrade to the latest version supported by
- * the server.
+ * upgrade).
+ * Users may specify either explicit versions offered by Kubernetes Engine or
+ * version aliases, which have the following behavior:
+ * - "latest": picks the highest valid Kubernetes version
+ * - "1.X": picks the highest valid patch+gke.N patch in the 1.X version
+ * - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version
+ * - "1.X.Y-gke.N": picks an explicit Kubernetes version
+ * - "-": picks the Kubernetes master version
*
*
* string node_version = 5;
@@ -1226,8 +1360,14 @@ public Builder clearNodeVersion() {
/**
*
* The Kubernetes version to change the nodes to (typically an
- * upgrade). Use `-` to upgrade to the latest version supported by
- * the server.
+ * upgrade).
+ * Users may specify either explicit versions offered by Kubernetes Engine or
+ * version aliases, which have the following behavior:
+ * - "latest": picks the highest valid Kubernetes version
+ * - "1.X": picks the highest valid patch+gke.N patch in the 1.X version
+ * - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version
+ * - "1.X.Y-gke.N": picks an explicit Kubernetes version
+ * - "-": picks the Kubernetes master version
*
*
* string node_version = 5;
@@ -1332,6 +1472,105 @@ public Builder setImageTypeBytes(
onChanged();
return this;
}
+
+ private java.lang.Object name_ = "";
+ /**
+ *
+ * The name (project, location, cluster, node pool) of the node pool to
+ * update. Specified in the format
+ * 'projects/*/locations/*/clusters/*/nodePools/*'.
+ *
+ *
+ * string name = 8;
+ */
+ public java.lang.String getName() {
+ java.lang.Object ref = name_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ name_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ *
+ * The name (project, location, cluster, node pool) of the node pool to
+ * update. Specified in the format
+ * 'projects/*/locations/*/clusters/*/nodePools/*'.
+ *
+ *
+ * string name = 8;
+ */
+ public com.google.protobuf.ByteString
+ getNameBytes() {
+ java.lang.Object ref = name_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ name_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ *
+ * The name (project, location, cluster, node pool) of the node pool to
+ * update. Specified in the format
+ * 'projects/*/locations/*/clusters/*/nodePools/*'.
+ *
+ *
+ * string name = 8;
+ */
+ public Builder setName(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * The name (project, location, cluster, node pool) of the node pool to
+ * update. Specified in the format
+ * 'projects/*/locations/*/clusters/*/nodePools/*'.
+ *
+ *
+ * string name = 8;
+ */
+ public Builder clearName() {
+
+ name_ = getDefaultInstance().getName();
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ * The name (project, location, cluster, node pool) of the node pool to
+ * update. Specified in the format
+ * 'projects/*/locations/*/clusters/*/nodePools/*'.
+ *
+ *
+ * string name = 8;
+ */
+ public Builder setNameBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ name_ = value;
+ onChanged();
+ return this;
+ }
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateNodePoolRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateNodePoolRequestOrBuilder.java
index aee02b81eb11..c91907fd12d5 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateNodePoolRequestOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateNodePoolRequestOrBuilder.java
@@ -9,87 +9,101 @@ public interface UpdateNodePoolRequestOrBuilder extends
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- java.lang.String getProjectId();
+ @java.lang.Deprecated java.lang.String getProjectId();
/**
*
- * The Google Developers Console [project ID or project
+ * 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;
+ * string project_id = 1 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getProjectIdBytes();
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- java.lang.String getZone();
+ @java.lang.Deprecated java.lang.String getZone();
/**
*
- * The name of the Google Compute Engine
+ * 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;
+ * string zone = 2 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getZoneBytes();
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- java.lang.String getClusterId();
+ @java.lang.Deprecated java.lang.String getClusterId();
/**
*
- * The name of the cluster to upgrade.
+ * Deprecated. The name of the cluster to upgrade.
+ * This field has been deprecated and replaced by the name field.
*
*
- * string cluster_id = 3;
+ * string cluster_id = 3 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getClusterIdBytes();
/**
*
- * The name of the node pool to upgrade.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- java.lang.String getNodePoolId();
+ @java.lang.Deprecated java.lang.String getNodePoolId();
/**
*
- * The name of the node pool to upgrade.
+ * 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;
+ * string node_pool_id = 4 [deprecated = true];
*/
- com.google.protobuf.ByteString
+ @java.lang.Deprecated com.google.protobuf.ByteString
getNodePoolIdBytes();
/**
*
* The Kubernetes version to change the nodes to (typically an
- * upgrade). Use `-` to upgrade to the latest version supported by
- * the server.
+ * upgrade).
+ * Users may specify either explicit versions offered by Kubernetes Engine or
+ * version aliases, which have the following behavior:
+ * - "latest": picks the highest valid Kubernetes version
+ * - "1.X": picks the highest valid patch+gke.N patch in the 1.X version
+ * - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version
+ * - "1.X.Y-gke.N": picks an explicit Kubernetes version
+ * - "-": picks the Kubernetes master version
*
*
* string node_version = 5;
@@ -98,8 +112,14 @@ public interface UpdateNodePoolRequestOrBuilder extends
/**
*
* The Kubernetes version to change the nodes to (typically an
- * upgrade). Use `-` to upgrade to the latest version supported by
- * the server.
+ * upgrade).
+ * Users may specify either explicit versions offered by Kubernetes Engine or
+ * version aliases, which have the following behavior:
+ * - "latest": picks the highest valid Kubernetes version
+ * - "1.X": picks the highest valid patch+gke.N patch in the 1.X version
+ * - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version
+ * - "1.X.Y-gke.N": picks an explicit Kubernetes version
+ * - "-": picks the Kubernetes master version
*
*
* string node_version = 5;
@@ -124,4 +144,26 @@ public interface UpdateNodePoolRequestOrBuilder extends
*/
com.google.protobuf.ByteString
getImageTypeBytes();
+
+ /**
+ *
+ * The name (project, location, cluster, node pool) of the node pool to
+ * update. Specified in the format
+ * 'projects/*/locations/*/clusters/*/nodePools/*'.
+ *
+ *
+ * string name = 8;
+ */
+ java.lang.String getName();
+ /**
+ *
+ * The name (project, location, cluster, node pool) of the node pool to
+ * update. Specified in the format
+ * 'projects/*/locations/*/clusters/*/nodePools/*'.
+ *
+ *
+ * string name = 8;
+ */
+ com.google.protobuf.ByteString
+ getNameBytes();
}
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/proto/google/container/v1/cluster_service.proto b/google-api-grpc/proto-google-cloud-container-v1/src/main/proto/google/container/v1/cluster_service.proto
index 4636fdcc5d60..db7744d04e8e 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/proto/google/container/v1/cluster_service.proto
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/proto/google/container/v1/cluster_service.proto
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc.
+// Copyright 2018 Google LLC.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -11,6 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
+//
syntax = "proto3";
@@ -27,17 +28,27 @@ option csharp_namespace = "Google.Cloud.Container.V1";
option php_namespace = "Google\\Cloud\\Container\\V1";
-// Google Container Engine Cluster Manager v1
+// Google Kubernetes 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/projects/{project_id}/zones/{zone}/clusters" };
+ option (google.api.http) = {
+ get: "/v1/{parent=projects/*/locations/*}/clusters"
+ additional_bindings {
+ 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/projects/{project_id}/zones/{zone}/clusters/{cluster_id}" };
+ option (google.api.http) = {
+ get: "/v1/{name=projects/*/locations/*/clusters/*}"
+ additional_bindings {
+ get: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}"
+ }
+ };
}
// Creates a cluster, consisting of the specified number and type of Google
@@ -54,54 +65,124 @@ 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/projects/{project_id}/zones/{zone}/clusters" body: "*" };
+ option (google.api.http) = {
+ post: "/v1/{parent=projects/*/locations/*}/clusters"
+ body: "*"
+ additional_bindings {
+ 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/projects/{project_id}/zones/{zone}/clusters/{cluster_id}" body: "*" };
+ option (google.api.http) = {
+ put: "/v1/{name=projects/*/locations/*/clusters/*}"
+ body: "*"
+ additional_bindings {
+ put: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}"
+ body: "*"
+ }
+ };
}
- // Updates the version and/or image type of a specific node pool.
+ // Updates the version and/or image type for a specific node pool.
rpc UpdateNodePool(UpdateNodePoolRequest) returns (Operation) {
- option (google.api.http) = { post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools/{node_pool_id}/update" body: "*" };
+ 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: "*"
+ }
+ };
}
- // Sets the autoscaling settings of a specific node pool.
+ // Sets the autoscaling settings for a specific node pool.
rpc SetNodePoolAutoscaling(SetNodePoolAutoscalingRequest) returns (Operation) {
- option (google.api.http) = { post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools/{node_pool_id}/autoscaling" body: "*" };
+ 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: "*"
+ }
+ };
}
- // Sets the logging service of a specific cluster.
+ // Sets the logging service for a specific cluster.
rpc SetLoggingService(SetLoggingServiceRequest) returns (Operation) {
- option (google.api.http) = { post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/logging" body: "*" };
+ 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: "*"
+ }
+ };
}
- // Sets the monitoring service of a specific cluster.
+ // Sets the monitoring service for a specific cluster.
rpc SetMonitoringService(SetMonitoringServiceRequest) returns (Operation) {
- option (google.api.http) = { post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/monitoring" body: "*" };
+ 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: "*"
+ }
+ };
}
- // Sets the addons of a specific cluster.
+ // Sets the addons for a specific cluster.
rpc SetAddonsConfig(SetAddonsConfigRequest) returns (Operation) {
- option (google.api.http) = { post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/addons" body: "*" };
+ 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: "*"
+ }
+ };
}
- // Sets the locations of a specific cluster.
+ // Sets the locations for a specific cluster.
rpc SetLocations(SetLocationsRequest) returns (Operation) {
- option (google.api.http) = { post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/locations" body: "*" };
+ 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: "*"
+ }
+ };
}
- // Updates the master of a specific cluster.
+ // Updates the master for a specific cluster.
rpc UpdateMaster(UpdateMasterRequest) returns (Operation) {
- option (google.api.http) = { post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/master" body: "*" };
+ 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: "*"
+ }
+ };
}
// Used to set master auth materials. Currently supports :-
- // Changing the admin password of a specific cluster.
+ // Changing the admin password for a specific cluster.
// This can be either via password generation or explicitly set the password.
rpc SetMasterAuth(SetMasterAuthRequest) returns (Operation) {
- option (google.api.http) = { post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}:setMasterAuth" body: "*" };
+ 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: "*"
+ }
+ };
}
// Deletes the cluster, including the Kubernetes endpoint and all worker
@@ -114,93 +195,205 @@ 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/projects/{project_id}/zones/{zone}/clusters/{cluster_id}" };
+ option (google.api.http) = {
+ delete: "/v1/{name=projects/*/locations/*/clusters/*}"
+ additional_bindings {
+ 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/projects/{project_id}/zones/{zone}/operations" };
+ option (google.api.http) = {
+ get: "/v1/{parent=projects/*/locations/*}/operations"
+ additional_bindings {
+ get: "/v1/projects/{project_id}/zones/{zone}/operations"
+ }
+ };
}
// Gets the specified operation.
rpc GetOperation(GetOperationRequest) returns (Operation) {
- option (google.api.http) = { get: "/v1/projects/{project_id}/zones/{zone}/operations/{operation_id}" };
+ option (google.api.http) = {
+ get: "/v1/{name=projects/*/locations/*/operations/*}"
+ additional_bindings {
+ 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/projects/{project_id}/zones/{zone}/operations/{operation_id}:cancel" body: "*" };
+ 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: "*"
+ }
+ };
}
- // Returns configuration info about the Container Engine service.
+ // Returns configuration info about the Kubernetes Engine service.
rpc GetServerConfig(GetServerConfigRequest) returns (ServerConfig) {
- option (google.api.http) = { get: "/v1/projects/{project_id}/zones/{zone}/serverconfig" };
+ option (google.api.http) = {
+ get: "/v1/{name=projects/*/locations/*}/serverConfig"
+ additional_bindings {
+ 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/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools" };
+ option (google.api.http) = {
+ get: "/v1/{parent=projects/*/locations/*/clusters/*}/nodePools"
+ additional_bindings {
+ 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/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools/{node_pool_id}" };
+ 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}"
+ }
+ };
}
// Creates a node pool for a cluster.
rpc CreateNodePool(CreateNodePoolRequest) returns (Operation) {
- option (google.api.http) = { post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools" body: "*" };
+ 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: "*"
+ }
+ };
}
// Deletes a node pool from a cluster.
rpc DeleteNodePool(DeleteNodePoolRequest) returns (Operation) {
- option (google.api.http) = { delete: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools/{node_pool_id}" };
+ 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}"
+ }
+ };
}
// 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/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools/{node_pool_id}:rollback" body: "*" };
+ 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: "*"
+ }
+ };
}
// Sets the NodeManagement options for a node pool.
rpc SetNodePoolManagement(SetNodePoolManagementRequest) returns (Operation) {
- option (google.api.http) = { post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools/{node_pool_id}/setManagement" body: "*" };
+ 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: "*"
+ }
+ };
}
// Sets labels on a cluster.
rpc SetLabels(SetLabelsRequest) returns (Operation) {
- option (google.api.http) = { post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/resourceLabels" body: "*" };
+ 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: "*"
+ }
+ };
}
// Enables or disables the ABAC authorization mechanism on a cluster.
rpc SetLegacyAbac(SetLegacyAbacRequest) returns (Operation) {
- option (google.api.http) = { post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/legacyAbac" body: "*" };
+ 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: "*"
+ }
+ };
}
// Start master IP rotation.
rpc StartIPRotation(StartIPRotationRequest) returns (Operation) {
- option (google.api.http) = { post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}:startIpRotation" body: "*" };
+ 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: "*"
+ }
+ };
}
// Completes master IP rotation.
rpc CompleteIPRotation(CompleteIPRotationRequest) returns (Operation) {
- option (google.api.http) = { post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}:completeIpRotation" body: "*" };
+ 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: "*"
+ }
+ };
}
- // Sets the size of a specific node pool.
+ // Sets the size for a specific node pool.
rpc SetNodePoolSize(SetNodePoolSizeRequest) returns (Operation) {
- option (google.api.http) = { post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}/nodePools/{node_pool_id}/setSize" body: "*" };
+ 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: "*"
+ }
+ };
}
// Enables/Disables Network Policy for a cluster.
rpc SetNetworkPolicy(SetNetworkPolicyRequest) returns (Operation) {
- option (google.api.http) = { post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}:setNetworkPolicy" body: "*" };
+ 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: "*"
+ }
+ };
}
// Sets the maintenance policy for a cluster.
rpc SetMaintenancePolicy(SetMaintenancePolicyRequest) returns (Operation) {
- option (google.api.http) = { post: "/v1/projects/{project_id}/zones/{zone}/clusters/{cluster_id}:setMaintenancePolicy" body: "*" };
+ 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: "*"
+ }
+ };
}
}
@@ -245,8 +438,18 @@ 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 four reserved keys:
- // "instance-template", "kube-env", "startup-script", and "user-data"
+ // 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"
//
// 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
@@ -293,12 +496,18 @@ 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;
}
@@ -317,8 +526,9 @@ message MasterAuth {
// must be non-empty.
string password = 2;
- // Configuration for client certificate authentication on the cluster. If no
- // configuration is specified, a client certificate is issued.
+ // Configuration for client certificate authentication on the cluster. For
+ // clusters before v1.12, 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
@@ -394,7 +604,29 @@ message NetworkPolicyConfig {
bool disabled = 1;
}
-// Master authorized networks is a Beta feature.
+// Configuration options for private clusters.
+message PrivateClusterConfig {
+ // Whether nodes have internal IP addresses only. If enabled, all nodes are
+ // given only RFC 1918 private 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 range in CIDR notation to use for the hosted master network. This
+ // range will be used for assigning internal IP addresses to the master or
+ // set of masters, as well as the ILB VIP. This range must not overlap with
+ // any other ranges in use within the cluster's network.
+ 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,
@@ -462,13 +694,13 @@ message IPAllocationPolicy {
string subnetwork_name = 3;
// This field is deprecated, use cluster_ipv4_cidr_block.
- string cluster_ipv4_cidr = 4;
+ string cluster_ipv4_cidr = 4 [deprecated = true];
// This field is deprecated, use node_ipv4_cidr_block.
- string node_ipv4_cidr = 5;
+ string node_ipv4_cidr = 5 [deprecated = true];
// This field is deprecated, use services_ipv4_cidr_block.
- string services_ipv4_cidr = 6;
+ string services_ipv4_cidr = 6 [deprecated = true];
// The name of the secondary range to be used for the cluster CIDR
// block. The secondary range will be used for pod IP
@@ -539,7 +771,7 @@ message IPAllocationPolicy {
string services_ipv4_cidr_block = 11;
}
-// A Google Container Engine cluster.
+// A Google Kubernetes Engine cluster.
message Cluster {
// The current status of the cluster.
enum Status {
@@ -564,6 +796,10 @@ 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
@@ -672,20 +908,26 @@ 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;
+
+ // Configuration for private cluster.
+ PrivateClusterConfig private_cluster_config = 37;
+
// [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.
- string zone = 101;
+ // This field is deprecated, use location instead.
+ string zone = 101 [deprecated = true];
// [Output only] The IP address of this cluster's master endpoint.
// The endpoint can be accessed from the internet at
@@ -699,15 +941,26 @@ 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] 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] 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 time the cluster was created, in
// [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format.
@@ -733,7 +986,7 @@ message Cluster {
string services_ipv4_cidr = 110;
// Deprecated. Use node_pools.instance_group_urls.
- repeated string instance_group_urls = 111;
+ repeated string instance_group_urls = 111 [deprecated = true];
// [Output only] The number of nodes currently in the cluster.
int32 current_node_count = 112;
@@ -741,6 +994,12 @@ 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
@@ -748,8 +1007,16 @@ message Cluster {
// provided.
message ClusterUpdate {
// The Kubernetes version to change the nodes to (typically an
- // upgrade). Use `-` to upgrade to the latest version supported by
- // the server.
+ // upgrade).
+ //
+ // Users may specify either explicit versions offered by
+ // Kubernetes Engine or version aliases, which have the following behavior:
+ //
+ // - "latest": picks the highest valid Kubernetes version
+ // - "1.X": picks the highest valid patch+gke.N patch in the 1.X version
+ // - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version
+ // - "1.X.Y-gke.N": picks an explicit Kubernetes version
+ // - "-": picks the Kubernetes master version
string desired_node_version = 4;
// The monitoring service the cluster should use to write metrics.
@@ -787,13 +1054,19 @@ 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. The only valid value is the
- // latest supported version. Use "-" to have the server automatically select
- // the latest version.
+ // 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 desired_master_version = 100;
}
@@ -878,7 +1151,8 @@ message Operation {
// The name of the Google Compute Engine
// [zone](/compute/docs/zones#available) in which the operation
// is taking place.
- string zone = 2;
+ // This field is deprecated, use location instead.
+ string zone = 2 [deprecated = true];
// The operation type.
Type operation_type = 3;
@@ -898,6 +1172,12 @@ 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;
@@ -909,113 +1189,162 @@ message Operation {
// CreateClusterRequest creates a cluster.
message CreateClusterRequest {
- // The Google Developers Console [project ID or project
+ // Deprecated. The Google Developers Console [project ID or project
// number](https://support.google.com/cloud/answer/6158840).
- string project_id = 1;
+ // This field has been deprecated and replaced by the parent field.
+ string project_id = 1 [deprecated = true];
- // The name of the Google Compute Engine
+ // Deprecated. The name of the Google Compute Engine
// [zone](/compute/docs/zones#available) in which the cluster
// resides.
- string zone = 2;
+ // This field has been deprecated and replaced by the parent field.
+ string zone = 2 [deprecated = true];
// 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 {
- // The Google Developers Console [project ID or project
+ // Deprecated. The Google Developers Console [project ID or project
// number](https://support.google.com/cloud/answer/6158840).
- string project_id = 1;
+ // This field has been deprecated and replaced by the name field.
+ string project_id = 1 [deprecated = true];
- // The name of the Google Compute Engine
+ // Deprecated. The name of the Google Compute Engine
// [zone](/compute/docs/zones#available) in which the cluster
// resides.
- string zone = 2;
+ // This field has been deprecated and replaced by the name field.
+ string zone = 2 [deprecated = true];
- // The name of the cluster to retrieve.
- string cluster_id = 3;
+ // 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;
}
// UpdateClusterRequest updates the settings of a cluster.
message UpdateClusterRequest {
- // The Google Developers Console [project ID or project
+ // Deprecated. The Google Developers Console [project ID or project
// number](https://support.google.com/cloud/answer/6158840).
- string project_id = 1;
+ // This field has been deprecated and replaced by the name field.
+ string project_id = 1 [deprecated = true];
- // The name of the Google Compute Engine
+ // Deprecated. The name of the Google Compute Engine
// [zone](/compute/docs/zones#available) in which the cluster
// resides.
- string zone = 2;
+ // This field has been deprecated and replaced by the name field.
+ string zone = 2 [deprecated = true];
- // The name of the cluster to upgrade.
- string cluster_id = 3;
+ // 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];
// 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 {
- // The Google Developers Console [project ID or project
+ // Deprecated. The Google Developers Console [project ID or project
// number](https://support.google.com/cloud/answer/6158840).
- string project_id = 1;
+ // This field has been deprecated and replaced by the name field.
+ string project_id = 1 [deprecated = true];
- // The name of the Google Compute Engine
+ // Deprecated. The name of the Google Compute Engine
// [zone](/compute/docs/zones#available) in which the cluster
// resides.
- string zone = 2;
+ // This field has been deprecated and replaced by the name field.
+ string zone = 2 [deprecated = true];
- // The name of the cluster to upgrade.
- string cluster_id = 3;
+ // 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 node pool to upgrade.
- string node_pool_id = 4;
+ // 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). Use `-` to upgrade to the latest version supported by
- // the server.
+ // upgrade).
+ //
+ // Users may specify either explicit versions offered by Kubernetes Engine or
+ // version aliases, which have the following behavior:
+ //
+ // - "latest": picks the highest valid Kubernetes version
+ // - "1.X": picks the highest valid patch+gke.N patch in the 1.X version
+ // - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version
+ // - "1.X.Y-gke.N": picks an explicit Kubernetes version
+ // - "-": picks the Kubernetes master version
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 {
- // The Google Developers Console [project ID or project
+ // Deprecated. The Google Developers Console [project ID or project
// number](https://support.google.com/cloud/answer/6158840).
- string project_id = 1;
+ // This field has been deprecated and replaced by the name field.
+ string project_id = 1 [deprecated = true];
- // The name of the Google Compute Engine
+ // Deprecated. The name of the Google Compute Engine
// [zone](/compute/docs/zones#available) in which the cluster
// resides.
- string zone = 2;
+ // This field has been deprecated and replaced by the name field.
+ string zone = 2 [deprecated = true];
- // The name of the cluster to upgrade.
- string cluster_id = 3;
+ // 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 node pool to upgrade.
- string node_pool_id = 4;
+ // 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 {
- // The Google Developers Console [project ID or project
+ // Deprecated. The Google Developers Console [project ID or project
// number](https://support.google.com/cloud/answer/6158840).
- string project_id = 1;
+ // This field has been deprecated and replaced by the name field.
+ string project_id = 1 [deprecated = true];
- // The name of the Google Compute Engine
+ // 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;
- // The name of the cluster to upgrade.
- string cluster_id = 3;
+ // 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:
@@ -1023,21 +1352,28 @@ 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 {
- // The Google Developers Console [project ID or project
+ // Deprecated. The Google Developers Console [project ID or project
// number](https://support.google.com/cloud/answer/6158840).
- string project_id = 1;
+ // This field has been deprecated and replaced by the name field.
+ string project_id = 1 [deprecated = true];
- // The name of the Google Compute Engine
+ // Deprecated. The name of the Google Compute Engine
// [zone](/compute/docs/zones#available) in which the cluster
// resides.
- string zone = 2;
+ // This field has been deprecated and replaced by the name field.
+ string zone = 2 [deprecated = true];
- // The name of the cluster to upgrade.
- string cluster_id = 3;
+ // 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:
@@ -1045,40 +1381,54 @@ 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 {
- // The Google Developers Console [project ID or project
+ // Deprecated. The Google Developers Console [project ID or project
// number](https://support.google.com/cloud/answer/6158840).
- string project_id = 1;
+ // This field has been deprecated and replaced by the name field.
+ string project_id = 1 [deprecated = true];
- // The name of the Google Compute Engine
+ // Deprecated. The name of the Google Compute Engine
// [zone](/compute/docs/zones#available) in which the cluster
// resides.
- string zone = 2;
+ // This field has been deprecated and replaced by the name field.
+ string zone = 2 [deprecated = true];
- // The name of the cluster to upgrade.
- string cluster_id = 3;
+ // 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 {
- // The Google Developers Console [project ID or project
+ // Deprecated. The Google Developers Console [project ID or project
// number](https://support.google.com/cloud/answer/6158840).
- string project_id = 1;
+ // This field has been deprecated and replaced by the name field.
+ string project_id = 1 [deprecated = true];
- // The name of the Google Compute Engine
+ // Deprecated. The name of the Google Compute Engine
// [zone](/compute/docs/zones#available) in which the cluster
// resides.
- string zone = 2;
+ // This field has been deprecated and replaced by the name field.
+ string zone = 2 [deprecated = true];
- // The name of the cluster to upgrade.
- string cluster_id = 3;
+ // 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
@@ -1088,26 +1438,44 @@ 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 {
- // The Google Developers Console [project ID or project
+ // Deprecated. The Google Developers Console [project ID or project
// number](https://support.google.com/cloud/answer/6158840).
- string project_id = 1;
+ // This field has been deprecated and replaced by the name field.
+ string project_id = 1 [deprecated = true];
- // The name of the Google Compute Engine
+ // Deprecated. The name of the Google Compute Engine
// [zone](/compute/docs/zones#available) in which the cluster
// resides.
- string zone = 2;
+ // This field has been deprecated and replaced by the name field.
+ string zone = 2 [deprecated = true];
- // The name of the cluster to upgrade.
- string cluster_id = 3;
+ // 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. The only valid value is the
- // latest supported version. Use "-" to have the server automatically select
- // the latest version.
+ // 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.
@@ -1130,50 +1498,71 @@ message SetMasterAuthRequest {
SET_USERNAME = 3;
}
- // The Google Developers Console [project ID or project
+ // Deprecated. The Google Developers Console [project ID or project
// number](https://support.google.com/cloud/answer/6158840).
- string project_id = 1;
+ // This field has been deprecated and replaced by the name field.
+ string project_id = 1 [deprecated = true];
- // The name of the Google Compute Engine
+ // Deprecated. The name of the Google Compute Engine
// [zone](/compute/docs/zones#available) in which the cluster
// resides.
- string zone = 2;
+ // This field has been deprecated and replaced by the name field.
+ string zone = 2 [deprecated = true];
- // The name of the cluster to upgrade.
- string cluster_id = 3;
+ // 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 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 {
- // The Google Developers Console [project ID or project
+ // Deprecated. The Google Developers Console [project ID or project
// number](https://support.google.com/cloud/answer/6158840).
- string project_id = 1;
+ // This field has been deprecated and replaced by the name field.
+ string project_id = 1 [deprecated = true];
- // The name of the Google Compute Engine
+ // Deprecated. The name of the Google Compute Engine
// [zone](/compute/docs/zones#available) in which the cluster
// resides.
- string zone = 2;
+ // This field has been deprecated and replaced by the name field.
+ string zone = 2 [deprecated = true];
- // The name of the cluster to delete.
- string cluster_id = 3;
+ // 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;
}
// ListClustersRequest lists clusters.
message ListClustersRequest {
- // The Google Developers Console [project ID or project
+ // Deprecated. The Google Developers Console [project ID or project
// number](https://support.google.com/cloud/answer/6158840).
- string project_id = 1;
+ // This field has been deprecated and replaced by the parent field.
+ string project_id = 1 [deprecated = true];
- // The name of the Google Compute Engine
+ // Deprecated. The name of the Google Compute Engine
// [zone](/compute/docs/zones#available) in which the cluster
// resides, or "-" for all zones.
- string zone = 2;
+ // 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;
}
// ListClustersResponse is the result of ListClustersRequest.
@@ -1189,42 +1578,63 @@ message ListClustersResponse {
// GetOperationRequest gets a single operation.
message GetOperationRequest {
- // The Google Developers Console [project ID or project
+ // Deprecated. The Google Developers Console [project ID or project
// number](https://support.google.com/cloud/answer/6158840).
- string project_id = 1;
+ // This field has been deprecated and replaced by the name field.
+ string project_id = 1 [deprecated = true];
- // The name of the Google Compute Engine
+ // Deprecated. The name of the Google Compute Engine
// [zone](/compute/docs/zones#available) in which the cluster
// resides.
- string zone = 2;
+ // This field has been deprecated and replaced by the name field.
+ string zone = 2 [deprecated = true];
+
+ // 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.
- string operation_id = 3;
+ // The name (project, location, operation id) of the operation to get.
+ // Specified in the format 'projects/*/locations/*/operations/*'.
+ string name = 5;
}
// ListOperationsRequest lists operations.
message ListOperationsRequest {
- // The Google Developers Console [project ID or project
+ // Deprecated. The Google Developers Console [project ID or project
// number](https://support.google.com/cloud/answer/6158840).
- string project_id = 1;
-
- // The name of the Google Compute Engine [zone](/compute/docs/zones#available)
- // to return operations for, or `-` for all zones.
- string zone = 2;
+ // This field has been deprecated and replaced by the parent field.
+ string project_id = 1 [deprecated = true];
+
+ // 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;
}
// CancelOperationRequest cancels a single operation.
message CancelOperationRequest {
- // The Google Developers Console [project ID or project
+ // Deprecated. The Google Developers Console [project ID or project
// number](https://support.google.com/cloud/answer/6158840).
- string project_id = 1;
+ // This field has been deprecated and replaced by the name field.
+ string project_id = 1 [deprecated = true];
- // The name of the Google Compute Engine
+ // Deprecated. The name of the Google Compute Engine
// [zone](/compute/docs/zones#available) in which the operation resides.
- string zone = 2;
+ // This field has been deprecated and replaced by the name field.
+ string zone = 2 [deprecated = true];
+
+ // 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.
- string operation_id = 3;
+ // The name (project, location, operation id) of the operation to cancel.
+ // Specified in the format 'projects/*/locations/*/operations/*'.
+ string name = 4;
}
// ListOperationsResponse is the result of ListOperationsRequest.
@@ -1237,18 +1647,24 @@ message ListOperationsResponse {
repeated string missing_zones = 2;
}
-// Gets the current Container Engine service configuration.
+// Gets the current Kubernetes Engine service configuration.
message GetServerConfigRequest {
- // The Google Developers Console [project ID or project
+ // Deprecated. The Google Developers Console [project ID or project
// number](https://support.google.com/cloud/answer/6158840).
- string project_id = 1;
+ // This field has been deprecated and replaced by the name field.
+ string project_id = 1 [deprecated = true];
- // The name of the Google Compute Engine [zone](/compute/docs/zones#available)
- // to return operations for.
- string zone = 2;
+ // 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;
}
-// Container Engine service configuration.
+// Kubernetes Engine service configuration.
message ServerConfig {
// Version of Kubernetes the service deploys by default.
string default_cluster_version = 1;
@@ -1268,71 +1684,104 @@ message ServerConfig {
// CreateNodePoolRequest creates a node pool for a cluster.
message CreateNodePoolRequest {
- // The Google Developers Console [project ID or project
+ // Deprecated. The Google Developers Console [project ID or project
// number](https://developers.google.com/console/help/new/#projectnumber).
- string project_id = 1;
+ // This field has been deprecated and replaced by the parent field.
+ string project_id = 1 [deprecated = true];
- // The name of the Google Compute Engine
+ // Deprecated. The name of the Google Compute Engine
// [zone](/compute/docs/zones#available) in which the cluster
// resides.
- string zone = 2;
+ // This field has been deprecated and replaced by the parent field.
+ string zone = 2 [deprecated = true];
- // The name of the cluster.
- string cluster_id = 3;
+ // Deprecated. The name of the cluster.
+ // This field has been deprecated and replaced by the parent field.
+ string cluster_id = 3 [deprecated = true];
// 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 {
- // The Google Developers Console [project ID or project
+ // Deprecated. The Google Developers Console [project ID or project
// number](https://developers.google.com/console/help/new/#projectnumber).
- string project_id = 1;
+ // This field has been deprecated and replaced by the name field.
+ string project_id = 1 [deprecated = true];
- // The name of the Google Compute Engine
+ // Deprecated. The name of the Google Compute Engine
// [zone](/compute/docs/zones#available) in which the cluster
// resides.
- string zone = 2;
+ // This field has been deprecated and replaced by the name field.
+ string zone = 2 [deprecated = true];
- // The name of the cluster.
- string cluster_id = 3;
+ // Deprecated. The name of the cluster.
+ // 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 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.
- 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/*'.
+ string name = 6;
}
// ListNodePoolsRequest lists the node pool(s) for a cluster.
message ListNodePoolsRequest {
- // The Google Developers Console [project ID or project
+ // Deprecated. The Google Developers Console [project ID or project
// number](https://developers.google.com/console/help/new/#projectnumber).
- string project_id = 1;
+ // This field has been deprecated and replaced by the parent field.
+ string project_id = 1 [deprecated = true];
- // The name of the Google Compute Engine
+ // Deprecated. The name of the Google Compute Engine
// [zone](/compute/docs/zones#available) in which the cluster
// resides.
- string zone = 2;
+ // This field has been deprecated and replaced by the parent field.
+ string zone = 2 [deprecated = true];
- // The name of the cluster.
- string cluster_id = 3;
+ // 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;
}
// GetNodePoolRequest retrieves a node pool for a cluster.
message GetNodePoolRequest {
- // The Google Developers Console [project ID or project
+ // Deprecated. The Google Developers Console [project ID or project
// number](https://developers.google.com/console/help/new/#projectnumber).
- string project_id = 1;
+ // This field has been deprecated and replaced by the name field.
+ string project_id = 1 [deprecated = true];
- // The name of the Google Compute Engine
+ // Deprecated. The name of the Google Compute Engine
// [zone](/compute/docs/zones#available) in which the cluster
// resides.
- string zone = 2;
+ // This field has been deprecated and replaced by the name field.
+ string zone = 2 [deprecated = true];
- // The name of the cluster.
- string cluster_id = 3;
+ // 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 node pool.
- string node_pool_id = 4;
+ // 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;
}
// NodePool contains the name and configuration for a cluster's node pool.
@@ -1473,65 +1922,92 @@ message DailyMaintenanceWindow {
// SetNodePoolManagementRequest sets the node management properties of a node
// pool.
message SetNodePoolManagementRequest {
- // The Google Developers Console [project ID or project
+ // Deprecated. The Google Developers Console [project ID or project
// number](https://support.google.com/cloud/answer/6158840).
- string project_id = 1;
+ // This field has been deprecated and replaced by the name field.
+ string project_id = 1 [deprecated = true];
- // The name of the Google Compute Engine
+ // Deprecated. The name of the Google Compute Engine
// [zone](/compute/docs/zones#available) in which the cluster
// resides.
- string zone = 2;
+ // This field has been deprecated and replaced by the name field.
+ string zone = 2 [deprecated = true];
- // The name of the cluster to update.
- string cluster_id = 3;
+ // 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 node pool to update.
- string node_pool_id = 4;
+ // 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];
// 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 {
- // The Google Developers Console [project ID or project
+ // Deprecated. The Google Developers Console [project ID or project
// number](https://support.google.com/cloud/answer/6158840).
- string project_id = 1;
+ // This field has been deprecated and replaced by the name field.
+ string project_id = 1 [deprecated = true];
- // The name of the Google Compute Engine
+ // Deprecated. The name of the Google Compute Engine
// [zone](/compute/docs/zones#available) in which the cluster
// resides.
- string zone = 2;
+ // This field has been deprecated and replaced by the name field.
+ string zone = 2 [deprecated = true];
- // The name of the cluster to update.
- string cluster_id = 3;
+ // 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 node pool to update.
- string node_pool_id = 4;
+ // 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 {
- // The Google Developers Console [project ID or project
+ // Deprecated. The Google Developers Console [project ID or project
// number](https://support.google.com/cloud/answer/6158840).
- string project_id = 1;
+ // This field has been deprecated and replaced by the name field.
+ string project_id = 1 [deprecated = true];
- // The name of the Google Compute Engine
+ // Deprecated. The name of the Google Compute Engine
// [zone](/compute/docs/zones#available) in which the cluster
// resides.
- string zone = 2;
+ // This field has been deprecated and replaced by the name field.
+ string zone = 2 [deprecated = true];
- // The name of the cluster to rollback.
- string cluster_id = 3;
+ // 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];
+
+ // 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.
- string node_pool_id = 4;
+ // 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;
}
// ListNodePoolsResponse is the result of ListNodePoolsRequest.
@@ -1559,78 +2035,109 @@ message NodePoolAutoscaling {
// Engine cluster, which will in turn set them for Google Compute Engine
// resources used by that cluster
message SetLabelsRequest {
- // The Google Developers Console [project ID or project
+ // Deprecated. The Google Developers Console [project ID or project
// number](https://developers.google.com/console/help/new/#projectnumber).
- string project_id = 1;
+ // This field has been deprecated and replaced by the name field.
+ string project_id = 1 [deprecated = true];
- // The name of the Google Compute Engine
+ // Deprecated. The name of the Google Compute Engine
// [zone](/compute/docs/zones#available) in which the cluster
// resides.
- string zone = 2;
+ // This field has been deprecated and replaced by the name field.
+ string zone = 2 [deprecated = true];
- // The name of the cluster.
- string cluster_id = 3;
+ // Deprecated. The name of the cluster.
+ // This field has been deprecated and replaced by the name field.
+ string cluster_id = 3 [deprecated = true];
// 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
- // Container Engine and changes after every request to modify or update
+ // Kubernetes 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 {
- // The Google Developers Console [project ID or project
+ // Deprecated. The Google Developers Console [project ID or project
// number](https://support.google.com/cloud/answer/6158840).
- string project_id = 1;
+ // This field has been deprecated and replaced by the name field.
+ string project_id = 1 [deprecated = true];
- // The name of the Google Compute Engine
+ // Deprecated. The name of the Google Compute Engine
// [zone](/compute/docs/zones#available) in which the cluster
// resides.
- string zone = 2;
+ // This field has been deprecated and replaced by the name field.
+ string zone = 2 [deprecated = true];
- // The name of the cluster to update.
- string cluster_id = 3;
+ // 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];
// 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 {
- // The Google Developers Console [project ID or project
+ // Deprecated. The Google Developers Console [project ID or project
// number](https://developers.google.com/console/help/new/#projectnumber).
- string project_id = 1;
+ // This field has been deprecated and replaced by the name field.
+ string project_id = 1 [deprecated = true];
- // The name of the Google Compute Engine
+ // Deprecated. The name of the Google Compute Engine
// [zone](/compute/docs/zones#available) in which the cluster
// resides.
- string zone = 2;
+ // This field has been deprecated and replaced by the name field.
+ string zone = 2 [deprecated = true];
- // The name of the cluster.
- string cluster_id = 3;
+ // 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;
}
// CompleteIPRotationRequest moves the cluster master back into single-IP mode.
message CompleteIPRotationRequest {
- // The Google Developers Console [project ID or project
+ // Deprecated. The Google Developers Console [project ID or project
// number](https://developers.google.com/console/help/new/#projectnumber).
- string project_id = 1;
+ // This field has been deprecated and replaced by the name field.
+ string project_id = 1 [deprecated = true];
- // The name of the Google Compute Engine
+ // Deprecated. The name of the Google Compute Engine
// [zone](/compute/docs/zones#available) in which the cluster
// resides.
- string zone = 2;
+ // This field has been deprecated and replaced by the name field.
+ string zone = 2 [deprecated = true];
- // The name of the cluster.
- string cluster_id = 3;
+ // 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;
}
// AcceleratorConfig represents a Hardware Accelerator request.
@@ -1645,20 +2152,27 @@ message AcceleratorConfig {
// SetNetworkPolicyRequest enables/disables network policy for a cluster.
message SetNetworkPolicyRequest {
- // The Google Developers Console [project ID or project
+ // Deprecated. The Google Developers Console [project ID or project
// number](https://developers.google.com/console/help/new/#projectnumber).
- string project_id = 1;
+ // This field has been deprecated and replaced by the name field.
+ string project_id = 1 [deprecated = true];
- // The name of the Google Compute Engine
+ // Deprecated. The name of the Google Compute Engine
// [zone](/compute/docs/zones#available) in which the cluster
// resides.
- string zone = 2;
+ // This field has been deprecated and replaced by the name field.
+ string zone = 2 [deprecated = true];
- // The name of the cluster.
- string cluster_id = 3;
+ // Deprecated. The name of the cluster.
+ // This field has been deprecated and replaced by the name field.
+ string cluster_id = 3 [deprecated = true];
// 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.
@@ -1678,4 +2192,23 @@ 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-cloud-clients/google-cloud-container/src/main/java/com/google/cloud/container/v1/ClusterManagerClient.java b/google-cloud-clients/google-cloud-container/src/main/java/com/google/cloud/container/v1/ClusterManagerClient.java
index 18eb318c459e..104b665e3571 100644
--- a/google-cloud-clients/google-cloud-container/src/main/java/com/google/cloud/container/v1/ClusterManagerClient.java
+++ b/google-cloud-clients/google-cloud-container/src/main/java/com/google/cloud/container/v1/ClusterManagerClient.java
@@ -69,7 +69,7 @@
// AUTO-GENERATED DOCUMENTATION AND SERVICE
/**
- * Service Description: Google Container Engine Cluster Manager v1
+ * Service Description: Google Kubernetes Engine Cluster Manager v1
*
* This class provides the ability to make remote calls to the backing service through method
* calls that map to API methods. Sample code to get started:
@@ -202,10 +202,12 @@ public ClusterManagerStub getStub() {
* }
*
*
- * @param projectId The Google Developers Console [project ID or project
- * number](https://support.google.com/cloud/answer/6158840).
- * @param zone The name of the Google Compute Engine [zone](/compute/docs/zones#available) in
- * which the cluster resides, or "-" for all zones.
+ * @param projectId 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 parent field.
+ * @param zone Deprecated. 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.
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
*/
public final ListClustersResponse listClusters(String projectId, String zone) {
@@ -279,11 +281,14 @@ public final UnaryCallable listCluste
* }
*
*
- * @param projectId The Google Developers Console [project ID or project
- * number](https://support.google.com/cloud/answer/6158840).
- * @param zone The name of the Google Compute Engine [zone](/compute/docs/zones#available) in
- * which the cluster resides.
- * @param clusterId The name of the cluster to retrieve.
+ * @param projectId 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.
+ * @param zone 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.
+ * @param clusterId Deprecated. The name of the cluster to retrieve. This field has been
+ * deprecated and replaced by the name field.
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
*/
public final Cluster getCluster(String projectId, String zone, String clusterId) {
@@ -376,10 +381,12 @@ public final UnaryCallable getClusterCallable() {
* }
*
*
- * @param projectId The Google Developers Console [project ID or project
- * number](https://support.google.com/cloud/answer/6158840).
- * @param zone The name of the Google Compute Engine [zone](/compute/docs/zones#available) in
- * which the cluster resides.
+ * @param projectId 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 parent field.
+ * @param zone 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 parent field.
* @param cluster A [cluster
* resource](/container-engine/reference/rest/v1/projects.zones.clusters)
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
@@ -486,11 +493,14 @@ public final UnaryCallable createClusterCallabl
* }
*
*
- * @param projectId The Google Developers Console [project ID or project
- * number](https://support.google.com/cloud/answer/6158840).
- * @param zone The name of the Google Compute Engine [zone](/compute/docs/zones#available) in
- * which the cluster resides.
- * @param clusterId The name of the cluster to upgrade.
+ * @param projectId 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.
+ * @param zone 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.
+ * @param clusterId Deprecated. The name of the cluster to upgrade. This field has been deprecated
+ * and replaced by the name field.
* @param update A description of the update.
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
*/
@@ -566,7 +576,7 @@ public final UnaryCallable updateClusterCallabl
// AUTO-GENERATED DOCUMENTATION AND METHOD
/**
- * Updates the version and/or image type of a specific node pool.
+ * Updates the version and/or image type for a specific node pool.
*
* Sample code:
*
@@ -599,7 +609,7 @@ public final Operation updateNodePool(UpdateNodePoolRequest request) {
// AUTO-GENERATED DOCUMENTATION AND METHOD
/**
- * Updates the version and/or image type of a specific node pool.
+ * Updates the version and/or image type for a specific node pool.
*
*
Sample code:
*
@@ -631,7 +641,7 @@ public final UnaryCallable updateNodePoolCalla
// AUTO-GENERATED DOCUMENTATION AND METHOD
/**
- * Sets the autoscaling settings of a specific node pool.
+ * Sets the autoscaling settings for a specific node pool.
*
* Sample code:
*
@@ -662,7 +672,7 @@ public final Operation setNodePoolAutoscaling(SetNodePoolAutoscalingRequest requ
// AUTO-GENERATED DOCUMENTATION AND METHOD
/**
- * Sets the autoscaling settings of a specific node pool.
+ * Sets the autoscaling settings for a specific node pool.
*
*
Sample code:
*
@@ -693,7 +703,7 @@ public final Operation setNodePoolAutoscaling(SetNodePoolAutoscalingRequest requ
// AUTO-GENERATED DOCUMENTATION AND METHOD
/**
- * Sets the logging service of a specific cluster.
+ * Sets the logging service for a specific cluster.
*
*
Sample code:
*
@@ -707,11 +717,14 @@ public final Operation setNodePoolAutoscaling(SetNodePoolAutoscalingRequest requ
* }
*
*
- * @param projectId The Google Developers Console [project ID or project
- * number](https://support.google.com/cloud/answer/6158840).
- * @param zone The name of the Google Compute Engine [zone](/compute/docs/zones#available) in
- * which the cluster resides.
- * @param clusterId The name of the cluster to upgrade.
+ * @param projectId 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.
+ * @param zone 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.
+ * @param clusterId Deprecated. The name of the cluster to upgrade. This field has been deprecated
+ * and replaced by the name field.
* @param loggingService The logging service the cluster should use to write metrics. Currently
* available options:
* * "logging.googleapis.com" - the Google Cloud Logging service * "none" - no
@@ -733,7 +746,7 @@ public final Operation setLoggingService(
// AUTO-GENERATED DOCUMENTATION AND METHOD
/**
- * Sets the logging service of a specific cluster.
+ * Sets the logging service for a specific cluster.
*
*
Sample code:
*
@@ -762,7 +775,7 @@ public final Operation setLoggingService(SetLoggingServiceRequest request) {
// AUTO-GENERATED DOCUMENTATION AND METHOD
/**
- * Sets the logging service of a specific cluster.
+ * Sets the logging service for a specific cluster.
*
*
Sample code:
*
@@ -790,7 +803,7 @@ public final UnaryCallable setLoggingServic
// AUTO-GENERATED DOCUMENTATION AND METHOD
/**
- * Sets the monitoring service of a specific cluster.
+ * Sets the monitoring service for a specific cluster.
*
* Sample code:
*
@@ -804,11 +817,14 @@ public final UnaryCallable setLoggingServic
* }
*
*
- * @param projectId The Google Developers Console [project ID or project
- * number](https://support.google.com/cloud/answer/6158840).
- * @param zone The name of the Google Compute Engine [zone](/compute/docs/zones#available) in
- * which the cluster resides.
- * @param clusterId The name of the cluster to upgrade.
+ * @param projectId 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.
+ * @param zone 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.
+ * @param clusterId Deprecated. The name of the cluster to upgrade. This field has been deprecated
+ * and replaced by the name field.
* @param monitoringService The monitoring service the cluster should use to write metrics.
* Currently available options:
* * "monitoring.googleapis.com" - the Google Cloud Monitoring service * "none" -
@@ -830,7 +846,7 @@ public final Operation setMonitoringService(
// AUTO-GENERATED DOCUMENTATION AND METHOD
/**
- * Sets the monitoring service of a specific cluster.
+ * Sets the monitoring service for a specific cluster.
*
*
Sample code:
*
@@ -859,7 +875,7 @@ public final Operation setMonitoringService(SetMonitoringServiceRequest request)
// AUTO-GENERATED DOCUMENTATION AND METHOD
/**
- * Sets the monitoring service of a specific cluster.
+ * Sets the monitoring service for a specific cluster.
*
*
Sample code:
*
@@ -888,7 +904,7 @@ public final Operation setMonitoringService(SetMonitoringServiceRequest request)
// AUTO-GENERATED DOCUMENTATION AND METHOD
/**
- * Sets the addons of a specific cluster.
+ * Sets the addons for a specific cluster.
*
*
Sample code:
*
@@ -902,11 +918,14 @@ public final Operation setMonitoringService(SetMonitoringServiceRequest request)
* }
*
*
- * @param projectId The Google Developers Console [project ID or project
- * number](https://support.google.com/cloud/answer/6158840).
- * @param zone The name of the Google Compute Engine [zone](/compute/docs/zones#available) in
- * which the cluster resides.
- * @param clusterId The name of the cluster to upgrade.
+ * @param projectId 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.
+ * @param zone 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.
+ * @param clusterId Deprecated. The name of the cluster to upgrade. This field has been deprecated
+ * and replaced by the name field.
* @param addonsConfig The desired configurations for the various addons available to run in the
* cluster.
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
@@ -926,7 +945,7 @@ public final Operation setAddonsConfig(
// AUTO-GENERATED DOCUMENTATION AND METHOD
/**
- * Sets the addons of a specific cluster.
+ * Sets the addons for a specific cluster.
*
* Sample code:
*
@@ -955,7 +974,7 @@ public final Operation setAddonsConfig(SetAddonsConfigRequest request) {
// AUTO-GENERATED DOCUMENTATION AND METHOD
/**
- * Sets the addons of a specific cluster.
+ * Sets the addons for a specific cluster.
*
*
Sample code:
*
@@ -983,7 +1002,7 @@ public final UnaryCallable setAddonsConfigCal
// AUTO-GENERATED DOCUMENTATION AND METHOD
/**
- * Sets the locations of a specific cluster.
+ * Sets the locations for a specific cluster.
*
* Sample code:
*
@@ -997,11 +1016,14 @@ public final UnaryCallable setAddonsConfigCal
* }
*
*
- * @param projectId The Google Developers Console [project ID or project
- * number](https://support.google.com/cloud/answer/6158840).
- * @param zone The name of the Google Compute Engine [zone](/compute/docs/zones#available) in
- * which the cluster resides.
- * @param clusterId The name of the cluster to upgrade.
+ * @param projectId 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.
+ * @param zone 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.
+ * @param clusterId Deprecated. The name of the cluster to upgrade. This field has been deprecated
+ * and replaced by the name field.
* @param locations 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
@@ -1024,7 +1046,7 @@ public final Operation setLocations(
// AUTO-GENERATED DOCUMENTATION AND METHOD
/**
- * Sets the locations of a specific cluster.
+ * Sets the locations for a specific cluster.
*
* Sample code:
*
@@ -1053,7 +1075,7 @@ public final Operation setLocations(SetLocationsRequest request) {
// AUTO-GENERATED DOCUMENTATION AND METHOD
/**
- * Sets the locations of a specific cluster.
+ * Sets the locations for a specific cluster.
*
*
Sample code:
*
@@ -1081,7 +1103,7 @@ public final UnaryCallable setLocationsCallable(
// AUTO-GENERATED DOCUMENTATION AND METHOD
/**
- * Updates the master of a specific cluster.
+ * Updates the master for a specific cluster.
*
* Sample code:
*
@@ -1095,14 +1117,21 @@ public final UnaryCallable setLocationsCallable(
* }
*
*
- * @param projectId The Google Developers Console [project ID or project
- * number](https://support.google.com/cloud/answer/6158840).
- * @param zone The name of the Google Compute Engine [zone](/compute/docs/zones#available) in
- * which the cluster resides.
- * @param clusterId The name of the cluster to upgrade.
- * @param masterVersion The Kubernetes version to change the master to. The only valid value is
- * the latest supported version. Use "-" to have the server automatically select the latest
- * version.
+ * @param projectId 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.
+ * @param zone 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.
+ * @param clusterId Deprecated. The name of the cluster to upgrade. This field has been deprecated
+ * and replaced by the name field.
+ * @param masterVersion The Kubernetes version to change the master to.
+ * Users may specify either explicit versions offered by Kubernetes Engine or version
+ * aliases, which have the following behavior:
+ *
- "latest": picks the highest valid Kubernetes version - "1.X": picks the highest valid
+ * patch+gke.N patch in the 1.X version - "1.X.Y": picks the highest valid gke.N patch in the
+ * 1.X.Y version - "1.X.Y-gke.N": picks an explicit Kubernetes version - "-": picks the
+ * default Kubernetes version
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
*/
public final Operation updateMaster(
@@ -1120,7 +1149,7 @@ public final Operation updateMaster(
// AUTO-GENERATED DOCUMENTATION AND METHOD
/**
- * Updates the master of a specific cluster.
+ * Updates the master for a specific cluster.
*
*
Sample code:
*
@@ -1149,7 +1178,7 @@ public final Operation updateMaster(UpdateMasterRequest request) {
// AUTO-GENERATED DOCUMENTATION AND METHOD
/**
- * Updates the master of a specific cluster.
+ * Updates the master for a specific cluster.
*
*
Sample code:
*
@@ -1177,7 +1206,7 @@ public final UnaryCallable updateMasterCallable(
// AUTO-GENERATED DOCUMENTATION AND METHOD
/**
- * Used to set master auth materials. Currently supports :- Changing the admin password of a
+ * Used to set master auth materials. Currently supports :- Changing the admin password for a
* specific cluster. This can be either via password generation or explicitly set the password.
*
* Sample code:
@@ -1209,7 +1238,7 @@ public final Operation setMasterAuth(SetMasterAuthRequest request) {
// AUTO-GENERATED DOCUMENTATION AND METHOD
/**
- * Used to set master auth materials. Currently supports :- Changing the admin password of a
+ * Used to set master auth materials. Currently supports :- Changing the admin password for a
* specific cluster. This can be either via password generation or explicitly set the password.
*
*
Sample code:
@@ -1258,11 +1287,14 @@ public final UnaryCallable setMasterAuthCallabl
* }
*
*
- * @param projectId The Google Developers Console [project ID or project
- * number](https://support.google.com/cloud/answer/6158840).
- * @param zone The name of the Google Compute Engine [zone](/compute/docs/zones#available) in
- * which the cluster resides.
- * @param clusterId The name of the cluster to delete.
+ * @param projectId 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.
+ * @param zone 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.
+ * @param clusterId Deprecated. The name of the cluster to delete. This field has been deprecated
+ * and replaced by the name field.
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
*/
public final Operation deleteCluster(String projectId, String zone, String clusterId) {
@@ -1353,10 +1385,12 @@ public final UnaryCallableSample code:
*
@@ -1602,10 +1642,12 @@ public final UnaryCallable Sample code:
*
@@ -1642,7 +1684,7 @@ public final ServerConfig getServerConfig(GetServerConfigRequest request) {
// AUTO-GENERATED DOCUMENTATION AND METHOD
/**
- * Returns configuration info about the Container Engine service.
+ * Returns configuration info about the Kubernetes Engine service.
*
* Sample code:
*
@@ -1679,11 +1721,14 @@ public final UnaryCallable Sample code:
*
@@ -2553,7 +2622,7 @@ public final Operation setNodePoolSize(SetNodePoolSizeRequest request) {
// AUTO-GENERATED DOCUMENTATION AND METHOD
/**
- * Sets the size of a specific node pool.
+ * Sets the size for a specific node pool.
*
* Sample code:
*
@@ -2597,11 +2666,14 @@ public final UnaryCallable The interfaces provided are listed below, along with usage samples.
*
* ==================== ClusterManagerClient ====================
*
- * Service Description: Google Container Engine Cluster Manager v1
+ * Service Description: Google Kubernetes Engine Cluster Manager v1
*
* Sample for ClusterManagerClient:
*
diff --git a/google-cloud-clients/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/ClusterManagerStub.java b/google-cloud-clients/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/ClusterManagerStub.java
index f07ba6b8bd78..729a8f8505ba 100644
--- a/google-cloud-clients/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/ClusterManagerStub.java
+++ b/google-cloud-clients/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/ClusterManagerStub.java
@@ -60,7 +60,7 @@
// AUTO-GENERATED DOCUMENTATION AND CLASS
/**
- * Base stub class for Google Container Engine API.
+ * Base stub class for Kubernetes Engine API.
*
* This class is for advanced usage and reflects the underlying API directly.
*/
diff --git a/google-cloud-clients/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/GrpcClusterManagerCallableFactory.java b/google-cloud-clients/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/GrpcClusterManagerCallableFactory.java
index 8196e08725cc..d203fa494b9c 100644
--- a/google-cloud-clients/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/GrpcClusterManagerCallableFactory.java
+++ b/google-cloud-clients/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/GrpcClusterManagerCallableFactory.java
@@ -37,7 +37,7 @@
// AUTO-GENERATED DOCUMENTATION AND CLASS
/**
- * gRPC callable factory implementation for Google Container Engine API.
+ * gRPC callable factory implementation for Kubernetes Engine API.
*
* This class is for advanced usage.
*/
diff --git a/google-cloud-clients/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/GrpcClusterManagerStub.java b/google-cloud-clients/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/GrpcClusterManagerStub.java
index 665b08d5c0f8..2b7f406a7ddd 100644
--- a/google-cloud-clients/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/GrpcClusterManagerStub.java
+++ b/google-cloud-clients/google-cloud-container/src/main/java/com/google/cloud/container/v1/stub/GrpcClusterManagerStub.java
@@ -68,7 +68,7 @@
// AUTO-GENERATED DOCUMENTATION AND CLASS
/**
- * gRPC stub implementation for Google Container Engine API.
+ * gRPC stub implementation for Kubernetes Engine API.
*
* This class is for advanced usage and reflects the underlying API directly.
*/
diff --git a/google-cloud-clients/google-cloud-container/src/test/java/com/google/cloud/container/v1/ClusterManagerClientTest.java b/google-cloud-clients/google-cloud-container/src/test/java/com/google/cloud/container/v1/ClusterManagerClientTest.java
index 922414195ad5..abf049b9620c 100644
--- a/google-cloud-clients/google-cloud-container/src/test/java/com/google/cloud/container/v1/ClusterManagerClientTest.java
+++ b/google-cloud-clients/google-cloud-container/src/test/java/com/google/cloud/container/v1/ClusterManagerClientTest.java
@@ -175,6 +175,7 @@ public void getClusterTest() {
String servicesIpv4Cidr = "servicesIpv4Cidr1966438125";
int currentNodeCount = 178977560;
String expireTime = "expireTime-96179731";
+ String location = "location1901043637";
Cluster expectedResponse =
Cluster.newBuilder()
.setName(name)
@@ -199,6 +200,7 @@ public void getClusterTest() {
.setServicesIpv4Cidr(servicesIpv4Cidr)
.setCurrentNodeCount(currentNodeCount)
.setExpireTime(expireTime)
+ .setLocation(location)
.build();
mockClusterManager.addResponse(expectedResponse);
@@ -249,6 +251,7 @@ public void createClusterTest() {
String statusMessage = "statusMessage-239442758";
String selfLink = "selfLink-1691268851";
String targetLink = "targetLink-2084812312";
+ String location = "location1901043637";
String startTime = "startTime-1573145462";
String endTime = "endTime1725551537";
Operation expectedResponse =
@@ -259,6 +262,7 @@ public void createClusterTest() {
.setStatusMessage(statusMessage)
.setSelfLink(selfLink)
.setTargetLink(targetLink)
+ .setLocation(location)
.setStartTime(startTime)
.setEndTime(endTime)
.build();
@@ -311,6 +315,7 @@ public void updateClusterTest() {
String statusMessage = "statusMessage-239442758";
String selfLink = "selfLink-1691268851";
String targetLink = "targetLink-2084812312";
+ String location = "location1901043637";
String startTime = "startTime-1573145462";
String endTime = "endTime1725551537";
Operation expectedResponse =
@@ -321,6 +326,7 @@ public void updateClusterTest() {
.setStatusMessage(statusMessage)
.setSelfLink(selfLink)
.setTargetLink(targetLink)
+ .setLocation(location)
.setStartTime(startTime)
.setEndTime(endTime)
.build();
@@ -376,6 +382,7 @@ public void setLoggingServiceTest() {
String statusMessage = "statusMessage-239442758";
String selfLink = "selfLink-1691268851";
String targetLink = "targetLink-2084812312";
+ String location = "location1901043637";
String startTime = "startTime-1573145462";
String endTime = "endTime1725551537";
Operation expectedResponse =
@@ -386,6 +393,7 @@ public void setLoggingServiceTest() {
.setStatusMessage(statusMessage)
.setSelfLink(selfLink)
.setTargetLink(targetLink)
+ .setLocation(location)
.setStartTime(startTime)
.setEndTime(endTime)
.build();
@@ -441,6 +449,7 @@ public void setMonitoringServiceTest() {
String statusMessage = "statusMessage-239442758";
String selfLink = "selfLink-1691268851";
String targetLink = "targetLink-2084812312";
+ String location = "location1901043637";
String startTime = "startTime-1573145462";
String endTime = "endTime1725551537";
Operation expectedResponse =
@@ -451,6 +460,7 @@ public void setMonitoringServiceTest() {
.setStatusMessage(statusMessage)
.setSelfLink(selfLink)
.setTargetLink(targetLink)
+ .setLocation(location)
.setStartTime(startTime)
.setEndTime(endTime)
.build();
@@ -507,6 +517,7 @@ public void setAddonsConfigTest() {
String statusMessage = "statusMessage-239442758";
String selfLink = "selfLink-1691268851";
String targetLink = "targetLink-2084812312";
+ String location = "location1901043637";
String startTime = "startTime-1573145462";
String endTime = "endTime1725551537";
Operation expectedResponse =
@@ -517,6 +528,7 @@ public void setAddonsConfigTest() {
.setStatusMessage(statusMessage)
.setSelfLink(selfLink)
.setTargetLink(targetLink)
+ .setLocation(location)
.setStartTime(startTime)
.setEndTime(endTime)
.build();
@@ -572,6 +584,7 @@ public void setLocationsTest() {
String statusMessage = "statusMessage-239442758";
String selfLink = "selfLink-1691268851";
String targetLink = "targetLink-2084812312";
+ String location = "location1901043637";
String startTime = "startTime-1573145462";
String endTime = "endTime1725551537";
Operation expectedResponse =
@@ -582,6 +595,7 @@ public void setLocationsTest() {
.setStatusMessage(statusMessage)
.setSelfLink(selfLink)
.setTargetLink(targetLink)
+ .setLocation(location)
.setStartTime(startTime)
.setEndTime(endTime)
.build();
@@ -637,6 +651,7 @@ public void updateMasterTest() {
String statusMessage = "statusMessage-239442758";
String selfLink = "selfLink-1691268851";
String targetLink = "targetLink-2084812312";
+ String location = "location1901043637";
String startTime = "startTime-1573145462";
String endTime = "endTime1725551537";
Operation expectedResponse =
@@ -647,6 +662,7 @@ public void updateMasterTest() {
.setStatusMessage(statusMessage)
.setSelfLink(selfLink)
.setTargetLink(targetLink)
+ .setLocation(location)
.setStartTime(startTime)
.setEndTime(endTime)
.build();
@@ -702,6 +718,7 @@ public void deleteClusterTest() {
String statusMessage = "statusMessage-239442758";
String selfLink = "selfLink-1691268851";
String targetLink = "targetLink-2084812312";
+ String location = "location1901043637";
String startTime = "startTime-1573145462";
String endTime = "endTime1725551537";
Operation expectedResponse =
@@ -712,6 +729,7 @@ public void deleteClusterTest() {
.setStatusMessage(statusMessage)
.setSelfLink(selfLink)
.setTargetLink(targetLink)
+ .setLocation(location)
.setStartTime(startTime)
.setEndTime(endTime)
.build();
@@ -805,6 +823,7 @@ public void getOperationTest() {
String statusMessage = "statusMessage-239442758";
String selfLink = "selfLink-1691268851";
String targetLink = "targetLink-2084812312";
+ String location = "location1901043637";
String startTime = "startTime-1573145462";
String endTime = "endTime1725551537";
Operation expectedResponse =
@@ -815,6 +834,7 @@ public void getOperationTest() {
.setStatusMessage(statusMessage)
.setSelfLink(selfLink)
.setTargetLink(targetLink)
+ .setLocation(location)
.setStartTime(startTime)
.setEndTime(endTime)
.build();
@@ -1060,6 +1080,7 @@ public void createNodePoolTest() {
String statusMessage = "statusMessage-239442758";
String selfLink = "selfLink-1691268851";
String targetLink = "targetLink-2084812312";
+ String location = "location1901043637";
String startTime = "startTime-1573145462";
String endTime = "endTime1725551537";
Operation expectedResponse =
@@ -1070,6 +1091,7 @@ public void createNodePoolTest() {
.setStatusMessage(statusMessage)
.setSelfLink(selfLink)
.setTargetLink(targetLink)
+ .setLocation(location)
.setStartTime(startTime)
.setEndTime(endTime)
.build();
@@ -1125,6 +1147,7 @@ public void deleteNodePoolTest() {
String statusMessage = "statusMessage-239442758";
String selfLink = "selfLink-1691268851";
String targetLink = "targetLink-2084812312";
+ String location = "location1901043637";
String startTime = "startTime-1573145462";
String endTime = "endTime1725551537";
Operation expectedResponse =
@@ -1135,6 +1158,7 @@ public void deleteNodePoolTest() {
.setStatusMessage(statusMessage)
.setSelfLink(selfLink)
.setTargetLink(targetLink)
+ .setLocation(location)
.setStartTime(startTime)
.setEndTime(endTime)
.build();
@@ -1190,6 +1214,7 @@ public void rollbackNodePoolUpgradeTest() {
String statusMessage = "statusMessage-239442758";
String selfLink = "selfLink-1691268851";
String targetLink = "targetLink-2084812312";
+ String location = "location1901043637";
String startTime = "startTime-1573145462";
String endTime = "endTime1725551537";
Operation expectedResponse =
@@ -1200,6 +1225,7 @@ public void rollbackNodePoolUpgradeTest() {
.setStatusMessage(statusMessage)
.setSelfLink(selfLink)
.setTargetLink(targetLink)
+ .setLocation(location)
.setStartTime(startTime)
.setEndTime(endTime)
.build();
@@ -1257,6 +1283,7 @@ public void setLegacyAbacTest() {
String statusMessage = "statusMessage-239442758";
String selfLink = "selfLink-1691268851";
String targetLink = "targetLink-2084812312";
+ String location = "location1901043637";
String startTime = "startTime-1573145462";
String endTime = "endTime1725551537";
Operation expectedResponse =
@@ -1267,6 +1294,7 @@ public void setLegacyAbacTest() {
.setStatusMessage(statusMessage)
.setSelfLink(selfLink)
.setTargetLink(targetLink)
+ .setLocation(location)
.setStartTime(startTime)
.setEndTime(endTime)
.build();
@@ -1322,6 +1350,7 @@ public void startIPRotationTest() {
String statusMessage = "statusMessage-239442758";
String selfLink = "selfLink-1691268851";
String targetLink = "targetLink-2084812312";
+ String location = "location1901043637";
String startTime = "startTime-1573145462";
String endTime = "endTime1725551537";
Operation expectedResponse =
@@ -1332,6 +1361,7 @@ public void startIPRotationTest() {
.setStatusMessage(statusMessage)
.setSelfLink(selfLink)
.setTargetLink(targetLink)
+ .setLocation(location)
.setStartTime(startTime)
.setEndTime(endTime)
.build();
@@ -1384,6 +1414,7 @@ public void completeIPRotationTest() {
String statusMessage = "statusMessage-239442758";
String selfLink = "selfLink-1691268851";
String targetLink = "targetLink-2084812312";
+ String location = "location1901043637";
String startTime = "startTime-1573145462";
String endTime = "endTime1725551537";
Operation expectedResponse =
@@ -1394,6 +1425,7 @@ public void completeIPRotationTest() {
.setStatusMessage(statusMessage)
.setSelfLink(selfLink)
.setTargetLink(targetLink)
+ .setLocation(location)
.setStartTime(startTime)
.setEndTime(endTime)
.build();
@@ -1446,6 +1478,7 @@ public void setNetworkPolicyTest() {
String statusMessage = "statusMessage-239442758";
String selfLink = "selfLink-1691268851";
String targetLink = "targetLink-2084812312";
+ String location = "location1901043637";
String startTime = "startTime-1573145462";
String endTime = "endTime1725551537";
Operation expectedResponse =
@@ -1456,6 +1489,7 @@ public void setNetworkPolicyTest() {
.setStatusMessage(statusMessage)
.setSelfLink(selfLink)
.setTargetLink(targetLink)
+ .setLocation(location)
.setStartTime(startTime)
.setEndTime(endTime)
.build();
@@ -1511,6 +1545,7 @@ public void setMaintenancePolicyTest() {
String statusMessage = "statusMessage-239442758";
String selfLink = "selfLink-1691268851";
String targetLink = "targetLink-2084812312";
+ String location = "location1901043637";
String startTime = "startTime-1573145462";
String endTime = "endTime1725551537";
Operation expectedResponse =
@@ -1521,6 +1556,7 @@ public void setMaintenancePolicyTest() {
.setStatusMessage(statusMessage)
.setSelfLink(selfLink)
.setTargetLink(targetLink)
+ .setLocation(location)
.setStartTime(startTime)
.setEndTime(endTime)
.build();