Skip to content

Commit 4e8469f

Browse files
Fix remaining field metadata for container_cluster (#13154) (#21543)
[upstream:aa70615346b0c13fad7e8ea582005e98f77cd378] Signed-off-by: Modular Magician <[email protected]>
1 parent 151dc09 commit 4e8469f

File tree

2 files changed

+40
-20
lines changed

2 files changed

+40
-20
lines changed

.changelog/13154.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:none
2+
3+
```

google/services/container/resource_container_cluster_meta.yaml

Lines changed: 37 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ fields:
9393
- field: 'default_snat_status.disabled'
9494
api_field: 'network_config.default_snat_status.disabled'
9595
- field: 'deletion_protection'
96+
provider_only: true
9697
- field: 'description'
9798
- field: 'dns_config.additive_vpc_scope_dns_domain'
9899
api_field: 'network_config.dns_config.additive_vpc_scope_dns_domain'
@@ -204,8 +205,11 @@ fields:
204205
- field: 'node_config.disk_size_gb'
205206
- field: 'node_config.disk_type'
206207
- field: 'node_config.effective_taints.effect'
208+
provider_only: true
207209
- field: 'node_config.effective_taints.key'
210+
provider_only: true
208211
- field: 'node_config.effective_taints.value'
212+
provider_only: true
209213
- field: 'node_config.enable_confidential_storage'
210214
- field: 'node_config.ephemeral_storage_local_ssd_config.local_ssd_count'
211215
- field: 'node_config.fast_socket.enabled'
@@ -233,12 +237,15 @@ fields:
233237
- field: 'node_config.labels'
234238
- field: 'node_config.linux_node_config.cgroup_mode'
235239
- field: 'node_config.linux_node_config.hugepages_config.hugepage_size_1g'
240+
api_field: 'node_config.linux_node_config.hugepages.hugepage_size1g'
236241
- field: 'node_config.linux_node_config.hugepages_config.hugepage_size_2m'
242+
api_field: 'node_config.linux_node_config.hugepages.hugepage_size2m'
237243
- field: 'node_config.linux_node_config.sysctls'
238244
- field: 'node_config.local_nvme_ssd_block_config.local_ssd_count'
239245
- field: 'node_config.local_ssd_count'
240246
- field: 'node_config.local_ssd_encryption_mode'
241247
- field: 'node_config.logging_variant'
248+
api_field: 'node_config.logging_config.variant_config.variant'
242249
- field: 'node_config.machine_type'
243250
- field: 'node_config.max_run_duration'
244251
- field: 'node_config.metadata'
@@ -251,20 +258,27 @@ fields:
251258
- field: 'node_config.reservation_affinity.values'
252259
- field: 'node_config.resource_labels'
253260
- field: 'node_config.resource_manager_tags'
261+
api_field: 'node_config.resource_manager_tags.tags'
254262
- field: 'node_config.secondary_boot_disks.disk_image'
255263
- field: 'node_config.secondary_boot_disks.mode'
256264
- field: 'node_config.service_account'
257265
- field: 'node_config.shielded_instance_config.enable_integrity_monitoring'
258266
- field: 'node_config.shielded_instance_config.enable_secure_boot'
259267
- field: 'node_config.sole_tenant_config.node_affinity.key'
268+
api_field: 'node_config.sole_tenant_config.node_affinities.key'
260269
- field: 'node_config.sole_tenant_config.node_affinity.operator'
270+
api_field: 'node_config.sole_tenant_config.node_affinities.operator'
261271
- field: 'node_config.sole_tenant_config.node_affinity.values'
272+
api_field: 'node_config.sole_tenant_config.node_affinities.values'
262273
- field: 'node_config.spot'
263274
- field: 'node_config.storage_pools'
264275
- field: 'node_config.tags'
265276
- field: 'node_config.taint.effect'
277+
api_field: 'node_config.taints.effect'
266278
- field: 'node_config.taint.key'
279+
api_field: 'node_config.taints.key'
267280
- field: 'node_config.taint.value'
281+
api_field: 'node_config.taints.value'
268282
- field: 'node_config.workload_metadata_config.mode'
269283
- field: 'node_locations'
270284
api_field: 'locations'
@@ -283,23 +297,23 @@ fields:
283297
- field: 'node_pool.instance_group_urls'
284298
api_field: 'node_pools.instance_group_urls'
285299
- field: 'node_pool.managed_instance_group_urls'
286-
api_field: 'node_pools.managed_instance_group_urls'
300+
provider_only: true
287301
- field: 'node_pool.management.auto_repair'
288302
api_field: 'node_pools.management.auto_repair'
289303
- field: 'node_pool.management.auto_upgrade'
290304
api_field: 'node_pools.management.auto_upgrade'
291305
- field: 'node_pool.max_pods_per_node'
292-
api_field: 'node_pools.max_pods_per_node'
306+
api_field: 'node_pools.max_pods_constraint.max_pods_per_node'
293307
- field: 'node_pool.name'
294308
api_field: 'node_pools.name'
295309
- field: 'node_pool.name_prefix'
296-
api_field: 'node_pools.name_prefix'
310+
provider_only: true
297311
- field: 'node_pool.network_config.additional_node_network_configs.network'
298312
api_field: 'node_pools.network_config.additional_node_network_configs.network'
299313
- field: 'node_pool.network_config.additional_node_network_configs.subnetwork'
300314
api_field: 'node_pools.network_config.additional_node_network_configs.subnetwork'
301315
- field: 'node_pool.network_config.additional_pod_network_configs.max_pods_per_node'
302-
api_field: 'node_pools.network_config.additional_pod_network_configs.max_pods_per_node'
316+
api_field: 'node_pools.network_config.additional_pod_network_configs.max_pods_per_node.max_pods_per_node'
303317
- field: 'node_pool.network_config.additional_pod_network_configs.secondary_pod_range'
304318
api_field: 'node_pools.network_config.additional_pod_network_configs.secondary_pod_range'
305319
- field: 'node_pool.network_config.additional_pod_network_configs.subnetwork'
@@ -311,7 +325,7 @@ fields:
311325
- field: 'node_pool.network_config.network_performance_config.total_egress_bandwidth_tier'
312326
api_field: 'node_pools.network_config.network_performance_config.total_egress_bandwidth_tier'
313327
- field: 'node_pool.network_config.pod_cidr_overprovision_config.disabled'
314-
api_field: 'node_pools.network_config.pod_cidr_overprovision_config.disabled'
328+
api_field: 'node_pools.network_config.pod_cidr_overprovision_config.disable'
315329
- field: 'node_pool.network_config.pod_ipv4_cidr_block'
316330
api_field: 'node_pools.network_config.pod_ipv4_cidr_block'
317331
- field: 'node_pool.network_config.pod_range'
@@ -335,11 +349,11 @@ fields:
335349
- field: 'node_pool.node_config.disk_type'
336350
api_field: 'node_pools.config.disk_type'
337351
- field: 'node_pool.node_config.effective_taints.effect'
338-
api_field: 'node_pools.config.effective_taints.effect'
352+
provider_only: true
339353
- field: 'node_pool.node_config.effective_taints.key'
340-
api_field: 'node_pools.config.effective_taints.key'
354+
provider_only: true
341355
- field: 'node_pool.node_config.effective_taints.value'
342-
api_field: 'node_pools.config.effective_taints.value'
356+
provider_only: true
343357
- field: 'node_pool.node_config.enable_confidential_storage'
344358
api_field: 'node_pools.config.enable_confidential_storage'
345359
- field: 'node_pool.node_config.ephemeral_storage_local_ssd_config.local_ssd_count'
@@ -381,9 +395,9 @@ fields:
381395
- field: 'node_pool.node_config.linux_node_config.cgroup_mode'
382396
api_field: 'node_pools.config.linux_node_config.cgroup_mode'
383397
- field: 'node_pool.node_config.linux_node_config.hugepages_config.hugepage_size_1g'
384-
api_field: 'node_pools.config.linux_node_config.hugepages_config.hugepage_size_1g'
398+
api_field: 'node_pools.config.linux_node_config.hugepages.hugepage_size1g'
385399
- field: 'node_pool.node_config.linux_node_config.hugepages_config.hugepage_size_2m'
386-
api_field: 'node_pools.config.linux_node_config.hugepages_config.hugepage_size_2m'
400+
api_field: 'node_pools.config.linux_node_config.hugepages.hugepage_size2m'
387401
- field: 'node_pool.node_config.linux_node_config.sysctls'
388402
api_field: 'node_pools.config.linux_node_config.sysctls'
389403
- field: 'node_pool.node_config.local_nvme_ssd_block_config.local_ssd_count'
@@ -393,7 +407,7 @@ fields:
393407
- field: 'node_pool.node_config.local_ssd_encryption_mode'
394408
api_field: 'node_pools.config.local_ssd_encryption_mode'
395409
- field: 'node_pool.node_config.logging_variant'
396-
api_field: 'node_pools.config.logging_variant'
410+
api_field: 'node_pools.config.logging_config.variant_config.variant'
397411
- field: 'node_pool.node_config.machine_type'
398412
api_field: 'node_pools.config.machine_type'
399413
- field: 'node_pool.node_config.max_run_duration'
@@ -417,7 +431,7 @@ fields:
417431
- field: 'node_pool.node_config.resource_labels'
418432
api_field: 'node_pools.config.resource_labels'
419433
- field: 'node_pool.node_config.resource_manager_tags'
420-
api_field: 'node_pools.config.resource_manager_tags'
434+
api_field: 'node_pools.config.resource_manager_tags.tags'
421435
- field: 'node_pool.node_config.secondary_boot_disks.disk_image'
422436
api_field: 'node_pools.config.secondary_boot_disks.disk_image'
423437
- field: 'node_pool.node_config.secondary_boot_disks.mode'
@@ -429,29 +443,29 @@ fields:
429443
- field: 'node_pool.node_config.shielded_instance_config.enable_secure_boot'
430444
api_field: 'node_pools.config.shielded_instance_config.enable_secure_boot'
431445
- field: 'node_pool.node_config.sole_tenant_config.node_affinity.key'
432-
api_field: 'node_pools.config.sole_tenant_config.node_affinity.key'
446+
api_field: 'node_pools.config.sole_tenant_config.node_affinities.key'
433447
- field: 'node_pool.node_config.sole_tenant_config.node_affinity.operator'
434-
api_field: 'node_pools.config.sole_tenant_config.node_affinity.operator'
448+
api_field: 'node_pools.config.sole_tenant_config.node_affinities.operator'
435449
- field: 'node_pool.node_config.sole_tenant_config.node_affinity.values'
436-
api_field: 'node_pools.config.sole_tenant_config.node_affinity.values'
450+
api_field: 'node_pools.config.sole_tenant_config.node_affinities.values'
437451
- field: 'node_pool.node_config.spot'
438452
api_field: 'node_pools.config.spot'
439453
- field: 'node_pool.node_config.storage_pools'
440454
api_field: 'node_pools.config.storage_pools'
441455
- field: 'node_pool.node_config.tags'
442456
api_field: 'node_pools.config.tags'
443457
- field: 'node_pool.node_config.taint.effect'
444-
api_field: 'node_pools.config.taint.effect'
458+
api_field: 'node_pools.config.taints.effect'
445459
- field: 'node_pool.node_config.taint.key'
446-
api_field: 'node_pools.config.taint.key'
460+
api_field: 'node_pools.config.taints.key'
447461
- field: 'node_pool.node_config.taint.value'
448-
api_field: 'node_pools.config.taint.value'
462+
api_field: 'node_pools.config.taints.value'
449463
- field: 'node_pool.node_config.workload_metadata_config.mode'
450464
api_field: 'node_pools.config.workload_metadata_config.mode'
451465
- field: 'node_pool.node_count'
452-
api_field: 'node_pools.node_count'
466+
provider_only: true
453467
- field: 'node_pool.node_locations'
454-
api_field: 'node_pools.node_locations'
468+
api_field: 'node_pools.locations'
455469
- field: 'node_pool.placement_policy.policy_name'
456470
api_field: 'node_pools.placement_policy.policy_name'
457471
- field: 'node_pool.placement_policy.tpu_topology'
@@ -480,12 +494,15 @@ fields:
480494
- field: 'node_pool_auto_config.network_tags.tags'
481495
- field: 'node_pool_auto_config.node_kubelet_config.insecure_kubelet_readonly_port_enabled'
482496
- field: 'node_pool_auto_config.resource_manager_tags'
497+
api_field: 'node_pool_auto_config.resource_manager_tags.tags'
483498
- field: 'node_pool_defaults.node_config_defaults.containerd_config.private_registry_access_config.certificate_authority_domain_config.fqdns'
484499
- field: 'node_pool_defaults.node_config_defaults.containerd_config.private_registry_access_config.certificate_authority_domain_config.gcp_secret_manager_certificate_config.secret_uri'
485500
- field: 'node_pool_defaults.node_config_defaults.containerd_config.private_registry_access_config.enabled'
486501
- field: 'node_pool_defaults.node_config_defaults.gcfs_config.enabled'
487502
- field: 'node_pool_defaults.node_config_defaults.insecure_kubelet_readonly_port_enabled'
503+
api_field: 'node_pool_defaults.node_config_defaults.node_kubelet_config.insecure_kubelet_readonly_port_enabled'
488504
- field: 'node_pool_defaults.node_config_defaults.logging_variant'
505+
api_field: 'node_pool_defaults.node_config_defaults.logging_config.variant_config.variant'
489506
- field: 'node_version'
490507
api_field: 'current_node_version'
491508
- field: 'notification_config.pubsub.enabled'

0 commit comments

Comments
 (0)