Skip to content

Commit 90a49b2

Browse files
docs: [google-cloud-batch] Update reservation field to include NO_RESERVATION (googleapis#13308)
- [ ] Regenerate this pull request now. --- BEGIN_COMMIT_OVERRIDE docs: Update reservation field to include NO_RESERVATION docs: clarify that user provided labels will also be applied to Cloud Logging END_COMMIT_OVERRIDE PiperOrigin-RevId: 700592805 Source-Link: googleapis/googleapis@ef5e670 Source-Link: https://github.com/googleapis/googleapis-gen/commit/f785d99bae2d43e2b9cb39ee992abe696ef162c9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWJhdGNoLy5Pd2xCb3QueWFtbCIsImgiOiJmNzg1ZDk5YmFlMmQ0M2UyYjljYjM5ZWU5OTJhYmU2OTZlZjE2MmM5In0= BEGIN_NESTED_COMMIT docs: [google-cloud-batch] Update reservation field to include NO_RESERVATION --- docs: clarify that user provided labels will also be applied to Cloud Logging --- docs: Clarify Batch only supports global custom instance template now PiperOrigin-RevId: 700490716 Source-Link: googleapis/googleapis@898125d Source-Link: https://github.com/googleapis/googleapis-gen/commit/c0dac7c27e1f65603b2c83db2d58453bfd07561f Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWJhdGNoLy5Pd2xCb3QueWFtbCIsImgiOiJjMGRhYzdjMjdlMWY2NTYwM2IyYzgzZGIyZDU4NDUzYmZkMDc1NjFmIn0= END_NESTED_COMMIT --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent 4035ab8 commit 90a49b2

File tree

7 files changed

+66
-42
lines changed

7 files changed

+66
-42
lines changed

packages/google-cloud-batch/google/cloud/batch/gapic_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#
16-
__version__ = "0.17.31" # {x-release-please-version}
16+
__version__ = "0.0.0" # {x-release-please-version}

packages/google-cloud-batch/google/cloud/batch_v1/gapic_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#
16-
__version__ = "0.17.31" # {x-release-please-version}
16+
__version__ = "0.0.0" # {x-release-please-version}

packages/google-cloud-batch/google/cloud/batch_v1/types/job.py

Lines changed: 28 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,18 @@ class Job(proto.Message):
6060
Compute resource allocation for all
6161
TaskGroups in the Job.
6262
labels (MutableMapping[str, str]):
63-
Labels for the Job. Labels could be user provided or system
64-
generated. For example, "labels": { "department": "finance",
65-
"environment": "test" } You can assign up to 64 labels.
66-
`Google Compute Engine label
67-
restrictions <https://cloud.google.com/compute/docs/labeling-resources#restrictions>`__
68-
apply. Label names that start with "goog-" or "google-" are
69-
reserved.
63+
Custom labels to apply to the job and any Cloud Logging
64+
`LogEntry <https://cloud.google.com/logging/docs/reference/v2/rest/v2/LogEntry>`__
65+
that it generates.
66+
67+
Use labels to group and describe the resources they are
68+
applied to. Batch automatically applies predefined labels
69+
and supports multiple ``labels`` fields for each job, which
70+
each let you apply custom labels to various resources. Label
71+
names that start with "goog-" or "google-" are reserved for
72+
predefined labels. For more information about labels with
73+
Batch, see `Organize resources using
74+
labels <https://cloud.google.com/batch/docs/organize-resources-using-labels>`__.
7075
status (google.cloud.batch_v1.types.JobStatus):
7176
Output only. Job status. It is read only for
7277
users.
@@ -446,13 +451,18 @@ class AllocationPolicy(proto.Message):
446451
account, beyond the default cloud-platform scope. (list
447452
of strings)
448453
labels (MutableMapping[str, str]):
449-
Labels applied to all VM instances and other resources
450-
created by AllocationPolicy. Labels could be user provided
451-
or system generated. You can assign up to 64 labels. `Google
452-
Compute Engine label
453-
restrictions <https://cloud.google.com/compute/docs/labeling-resources#restrictions>`__
454-
apply. Label names that start with "goog-" or "google-" are
455-
reserved.
454+
Custom labels to apply to the job and all the Compute Engine
455+
resources that both are created by this allocation policy
456+
and support labels.
457+
458+
Use labels to group and describe the resources they are
459+
applied to. Batch automatically applies predefined labels
460+
and supports multiple ``labels`` fields for each job, which
461+
each let you apply custom labels to various resources. Label
462+
names that start with "goog-" or "google-" are reserved for
463+
predefined labels. For more information about labels with
464+
Batch, see `Organize resources using
465+
labels <https://cloud.google.com/batch/docs/organize-resources-using-labels>`__.
456466
network (google.cloud.batch_v1.types.AllocationPolicy.NetworkPolicy):
457467
The network policy.
458468
@@ -729,10 +739,10 @@ class InstancePolicy(proto.Message):
729739
file system or a raw storage drive that is not
730740
ready for data storage and accessing.
731741
reservation (str):
732-
Optional. If specified, VMs will consume only
733-
the specified reservation. If not specified
734-
(default), VMs will consume any applicable
735-
reservation.
742+
Optional. If specified, VMs will consume only the specified
743+
reservation. If not specified (default), VMs will consume
744+
any applicable reservation. Additionally, VMs will not
745+
consume any reservation if "NO_RESERVATION" is specified.
736746
"""
737747

738748
machine_type: str = proto.Field(

packages/google-cloud-batch/google/cloud/batch_v1alpha/gapic_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#
16-
__version__ = "0.17.31" # {x-release-please-version}
16+
__version__ = "0.0.0" # {x-release-please-version}

packages/google-cloud-batch/google/cloud/batch_v1alpha/types/job.py

Lines changed: 33 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,18 @@ class Job(proto.Message):
6969
Compute resource allocation for all
7070
TaskGroups in the Job.
7171
labels (MutableMapping[str, str]):
72-
Labels for the Job. Labels could be user provided or system
73-
generated. For example, "labels": { "department": "finance",
74-
"environment": "test" } You can assign up to 64 labels.
75-
`Google Compute Engine label
76-
restrictions <https://cloud.google.com/compute/docs/labeling-resources#restrictions>`__
77-
apply. Label names that start with "goog-" or "google-" are
78-
reserved.
72+
Custom labels to apply to the job and any Cloud Logging
73+
`LogEntry <https://cloud.google.com/logging/docs/reference/v2/rest/v2/LogEntry>`__
74+
that it generates.
75+
76+
Use labels to group and describe the resources they are
77+
applied to. Batch automatically applies predefined labels
78+
and supports multiple ``labels`` fields for each job, which
79+
each let you apply custom labels to various resources. Label
80+
names that start with "goog-" or "google-" are reserved for
81+
predefined labels. For more information about labels with
82+
Batch, see `Organize resources using
83+
labels <https://cloud.google.com/batch/docs/organize-resources-using-labels>`__.
7984
status (google.cloud.batch_v1alpha.types.JobStatus):
8085
Output only. Job status. It is read only for
8186
users.
@@ -568,13 +573,18 @@ class AllocationPolicy(proto.Message):
568573
account, beyond the default cloud-platform scope. (list
569574
of strings)
570575
labels (MutableMapping[str, str]):
571-
Labels applied to all VM instances and other resources
572-
created by AllocationPolicy. Labels could be user provided
573-
or system generated. You can assign up to 64 labels. `Google
574-
Compute Engine label
575-
restrictions <https://cloud.google.com/compute/docs/labeling-resources#restrictions>`__
576-
apply. Label names that start with "goog-" or "google-" are
577-
reserved.
576+
Custom labels to apply to the job and all the Compute Engine
577+
resources that both are created by this allocation policy
578+
and support labels.
579+
580+
Use labels to group and describe the resources they are
581+
applied to. Batch automatically applies predefined labels
582+
and supports multiple ``labels`` fields for each job, which
583+
each let you apply custom labels to various resources. Label
584+
names that start with "goog-" or "google-" are reserved for
585+
predefined labels. For more information about labels with
586+
Batch, see `Organize resources using
587+
labels <https://cloud.google.com/batch/docs/organize-resources-using-labels>`__.
578588
network (google.cloud.batch_v1alpha.types.AllocationPolicy.NetworkPolicy):
579589
The network policy.
580590
@@ -861,10 +871,10 @@ class InstancePolicy(proto.Message):
861871
file system or a raw storage drive that is not
862872
ready for data storage and accessing.
863873
reservation (str):
864-
Optional. If specified, VMs will consume only
865-
the specified reservation. If not specified
866-
(default), VMs will consume any applicable
867-
reservation.
874+
Optional. If specified, VMs will consume only the specified
875+
reservation. If not specified (default), VMs will consume
876+
any applicable reservation. Additionally, VMs will not
877+
consume any reservation if "NO_RESERVATION" is specified.
868878
"""
869879

870880
allowed_machine_types: MutableSequence[str] = proto.RepeatedField(
@@ -928,7 +938,11 @@ class InstancePolicyOrTemplate(proto.Message):
928938
instance_template (str):
929939
Name of an instance template used to create VMs. Named the
930940
field as 'instance_template' instead of 'template' to avoid
931-
c++ keyword conflict.
941+
C++ keyword conflict.
942+
943+
Batch only supports global instance templates. You can
944+
specify the global instance template as a full or partial
945+
URL.
932946
933947
This field is a member of `oneof`_ ``policy_template``.
934948
install_gpu_drivers (bool):

packages/google-cloud-batch/samples/generated_samples/snippet_metadata_google.cloud.batch.v1.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
],
99
"language": "PYTHON",
1010
"name": "google-cloud-batch",
11-
"version": "0.17.31"
11+
"version": "0.1.0"
1212
},
1313
"snippets": [
1414
{

packages/google-cloud-batch/samples/generated_samples/snippet_metadata_google.cloud.batch.v1alpha.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
],
99
"language": "PYTHON",
1010
"name": "google-cloud-batch",
11-
"version": "0.17.31"
11+
"version": "0.1.0"
1212
},
1313
"snippets": [
1414
{

0 commit comments

Comments
 (0)