Skip to content

Commit 8c0feef

Browse files
committed
Apply new annotations model to more resources
1 parent df9725a commit 8c0feef

10 files changed

+10
-14
lines changed

mmv1/products/cloudrunv2/Job.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ properties:
137137
138138
Cloud Run API v2 does not support labels with `run.googleapis.com`, `cloud.googleapis.com`, `serving.knative.dev`, or `autoscaling.knative.dev` namespaces, and they will be rejected.
139139
All system labels in v1 now have a corresponding field in v2 Job.
140-
- !ruby/object:Api::Type::KeyValuePairs
140+
- !ruby/object:Api::Type::KeyValueAnnotations
141141
name: "annotations"
142142
description: |-
143143
Unstructured key value map that may be set by external tools to store and arbitrary metadata. They are not queryable and should be preserved when modifying objects.

mmv1/products/gkeonprem/BareMetalAdminCluster.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ properties:
133133
Allows clients to perform consistent read-modify-writes
134134
through optimistic concurrency control.
135135
output: true
136-
- !ruby/object:Api::Type::KeyValuePairs
136+
- !ruby/object:Api::Type::KeyValueAnnotations
137137
name: "annotations"
138138
description: |
139139
Annotations on the Bare Metal Admin Cluster.

mmv1/products/gkeonprem/BareMetalCluster.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ properties:
8585
required: true
8686
description: |
8787
A human readable description of this Bare Metal User Cluster.
88-
- !ruby/object:Api::Type::KeyValuePairs
88+
- !ruby/object:Api::Type::KeyValueAnnotations
8989
name: "annotations"
9090
description: |
9191
Annotations on the Bare Metal User Cluster.
@@ -96,7 +96,6 @@ properties:
9696
Prefix must be a DNS subdomain.
9797
Name must be 63 characters or less, begin and end with alphanumerics,
9898
with dashes (-), underscores (_), dots (.), and alphanumerics between.
99-
default_from_api: true
10099
- !ruby/object:Api::Type::NestedObject
101100
name: "networkConfig"
102101
description: |

mmv1/products/gkeonprem/BareMetalNodePool.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ properties:
7474
name: 'displayName'
7575
description: |
7676
The display name for the Bare Metal Node Pool.
77-
- !ruby/object:Api::Type::KeyValuePairs
77+
- !ruby/object:Api::Type::KeyValueAnnotations
7878
name: 'annotations'
7979
description: |
8080
Annotations on the Bare Metal Node Pool.
@@ -85,7 +85,6 @@ properties:
8585
Prefix must be a DNS subdomain.
8686
Name must be 63 characters or less, begin and end with alphanumerics,
8787
with dashes (-), underscores (_), dots (.), and alphanumerics between.
88-
default_from_api: true
8988
- !ruby/object:Api::Type::NestedObject
9089
name: 'nodePoolConfig'
9190
required: true

mmv1/products/gkeonprem/VmwareCluster.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ properties:
8989
required: true
9090
description: |
9191
The Anthos clusters on the VMware version for your user cluster.
92-
- !ruby/object:Api::Type::KeyValuePairs
92+
- !ruby/object:Api::Type::KeyValueAnnotations
9393
name: 'annotations'
9494
description: |
9595
Annotations on the VMware User Cluster.
@@ -100,7 +100,6 @@ properties:
100100
Prefix must be a DNS subdomain.
101101
Name must be 63 characters or less, begin and end with alphanumerics,
102102
with dashes (-), underscores (_), dots (.), and alphanumerics between.
103-
default_from_api: true
104103
- !ruby/object:Api::Type::NestedObject
105104
name: 'controlPlaneNode'
106105
description: |

mmv1/products/gkeonprem/VmwareNodePool.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ properties:
7171
- !ruby/object:Api::Type::String
7272
name: "displayName"
7373
description: The display name for the node pool.
74-
- !ruby/object:Api::Type::KeyValuePairs
74+
- !ruby/object:Api::Type::KeyValueAnnotations
7575
name: "annotations"
7676
description: |
7777
Annotations on the node Pool.
@@ -82,7 +82,6 @@ properties:
8282
Prefix must be a DNS subdomain.
8383
Name must be 63 characters or less, begin and end with alphanumerics,
8484
with dashes (-), underscores (_), dots (.), and alphanumerics between.
85-
default_from_api: true
8685
- !ruby/object:Api::Type::NestedObject
8786
name: "nodePoolAutoscaling"
8887
description: Node Pool autoscaling config for the node pool.

mmv1/products/secretmanager/Secret.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ properties:
7676
7777
An object containing a list of "key": value pairs. Example:
7878
{ "name": "wrench", "mass": "1.3kg", "count": "3" }.
79-
- !ruby/object:Api::Type::KeyValuePairs
79+
- !ruby/object:Api::Type::KeyValueAnnotations
8080
name: annotations
8181
description: |
8282
Custom metadata about the secret.

mmv1/products/workstations/Workstation.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ properties:
122122
description:
123123
'Client-specified labels that are applied to the resource and that are
124124
also propagated to the underlying Compute Engine resources.'
125-
- !ruby/object:Api::Type::KeyValuePairs
125+
- !ruby/object:Api::Type::KeyValueAnnotations
126126
name: 'annotations'
127127
description: 'Client-specified annotations. This is distinct from labels.'
128128
- !ruby/object:Api::Type::Time

mmv1/products/workstations/WorkstationCluster.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ properties:
118118
Whether this resource is in degraded mode, in which case it may require user action to restore full functionality.
119119
Details can be found in the conditions field.
120120
output: true
121-
- !ruby/object:Api::Type::KeyValuePairs
121+
- !ruby/object:Api::Type::KeyValueAnnotations
122122
name: "annotations"
123123
description: "Client-specified annotations. This is distinct from labels."
124124
- !ruby/object:Api::Type::Fingerprint

mmv1/products/workstations/WorkstationConfig.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ properties:
158158
description:
159159
'Client-specified labels that are applied to the resource and that are
160160
also propagated to the underlying Compute Engine resources.'
161-
- !ruby/object:Api::Type::KeyValuePairs
161+
- !ruby/object:Api::Type::KeyValueAnnotations
162162
name: 'annotations'
163163
description: 'Client-specified annotations. This is distinct from labels.'
164164
- !ruby/object:Api::Type::Fingerprint

0 commit comments

Comments
 (0)