From ab72c04c2f75c00f7aa25604d2ac909f10c8cd2f Mon Sep 17 00:00:00 2001 From: Anton Donskoy Date: Sat, 17 Sep 2022 17:44:38 +0300 Subject: [PATCH 1/3] Adding quotes for datacenter field --- pkg/providers/vsphere/config/template-cp.yaml | 4 ++-- pkg/providers/vsphere/config/template-md.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/providers/vsphere/config/template-cp.yaml b/pkg/providers/vsphere/config/template-cp.yaml index e78e38af3a6b..b7243103ae8b 100644 --- a/pkg/providers/vsphere/config/template-cp.yaml +++ b/pkg/providers/vsphere/config/template-cp.yaml @@ -50,7 +50,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: {{.vsphereDatacenter}} + datacenter: '{{.vsphereDatacenter}}' datastore: {{.controlPlaneVsphereDatastore}} diskGiB: {{.controlPlaneDiskGiB}} folder: '{{.controlPlaneVsphereFolder}}' @@ -514,7 +514,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: {{.vsphereDatacenter}} + datacenter: '{{.vsphereDatacenter}}' datastore: {{.etcdVsphereDatastore}} diskGiB: {{.etcdDiskGiB}} folder: '{{.etcdVsphereFolder}}' diff --git a/pkg/providers/vsphere/config/template-md.yaml b/pkg/providers/vsphere/config/template-md.yaml index 450cb77ffc54..5a7c6a9049f0 100644 --- a/pkg/providers/vsphere/config/template-md.yaml +++ b/pkg/providers/vsphere/config/template-md.yaml @@ -145,7 +145,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: {{.vsphereDatacenter}} + datacenter: '{{.vsphereDatacenter}}' datastore: {{.workerVsphereDatastore}} diskGiB: {{.workloadDiskGiB}} folder: '{{.workerVsphereFolder}}' From 39eed0f53857ac1f3cb9c3d3b9d230b37507d025 Mon Sep 17 00:00:00 2001 From: Anton Donskoy Date: Mon, 19 Sep 2022 14:54:00 +0300 Subject: [PATCH 2/3] update test data --- .../expected_results_bottlerocket_external_etcd_cp.yaml | 4 ++-- .../expected_results_bottlerocket_external_etcd_md.yaml | 2 +- .../expected_results_bottlerocket_mirror_config_cp.yaml | 4 ++-- .../expected_results_bottlerocket_mirror_config_md.yaml | 2 +- ...ted_results_bottlerocket_mirror_config_with_cert_cp.yaml | 4 ++-- ...ted_results_bottlerocket_mirror_config_with_cert_md.yaml | 2 +- .../testdata/expected_results_custom_resolv_conf.yaml | 4 ++-- .../vsphere/testdata/expected_results_full_oidc_cp.yaml | 2 +- .../testdata/expected_results_main_121_controller_md.yaml | 2 +- .../vsphere/testdata/expected_results_main_121_cp.yaml | 4 ++-- .../vsphere/testdata/expected_results_main_121_md.yaml | 2 +- .../vsphere/testdata/expected_results_main_cp.yaml | 4 ++-- ...ts_main_cp_cloud_provder_and_csi_driver_credentials.yaml | 4 ++-- ...expected_results_main_cp_cloud_provider_credentials.yaml | 4 ++-- .../expected_results_main_cp_csi_driver_credentials.yaml | 4 ++-- .../vsphere/testdata/expected_results_main_md.yaml | 2 +- .../expected_results_main_multiple_worker_node_groups.yaml | 4 ++-- .../expected_results_main_no_machinetemplate_update_cp.yaml | 4 ++-- .../expected_results_main_no_machinetemplate_update_md.yaml | 2 +- .../testdata/expected_results_main_node_labels_cp.yaml | 4 ++-- .../testdata/expected_results_main_node_labels_md.yaml | 2 +- .../testdata/expected_results_main_with_taints_cp.yaml | 4 ++-- .../testdata/expected_results_main_with_taints_md.yaml | 2 +- .../expected_results_minimal_add_worker_node_group.yaml | 6 +++--- .../vsphere/testdata/expected_results_minimal_cp.yaml | 2 +- .../vsphere/testdata/expected_results_minimal_md.yaml | 2 +- .../vsphere/testdata/expected_results_minimal_oidc_cp.yaml | 2 +- .../vsphere/testdata/expected_results_mirror_config_cp.yaml | 4 ++-- .../vsphere/testdata/expected_results_mirror_config_md.yaml | 2 +- .../expected_results_mirror_config_with_cert_cp.yaml | 4 ++-- .../expected_results_mirror_config_with_cert_md.yaml | 2 +- .../vsphere/testdata/expected_results_pod_iam_config.yaml | 4 ++-- pkg/providers/vsphere/testdata/original_077.yaml | 4 ++-- 33 files changed, 52 insertions(+), 52 deletions(-) diff --git a/pkg/providers/vsphere/testdata/expected_results_bottlerocket_external_etcd_cp.yaml b/pkg/providers/vsphere/testdata/expected_results_bottlerocket_external_etcd_cp.yaml index acaab0bc6a0d..071b54eee097 100644 --- a/pkg/providers/vsphere/testdata/expected_results_bottlerocket_external_etcd_cp.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_bottlerocket_external_etcd_cp.yaml @@ -48,7 +48,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' @@ -465,7 +465,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' diff --git a/pkg/providers/vsphere/testdata/expected_results_bottlerocket_external_etcd_md.yaml b/pkg/providers/vsphere/testdata/expected_results_bottlerocket_external_etcd_md.yaml index 09014920451e..bcd56d359837 100644 --- a/pkg/providers/vsphere/testdata/expected_results_bottlerocket_external_etcd_md.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_bottlerocket_external_etcd_md.yaml @@ -73,7 +73,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' diff --git a/pkg/providers/vsphere/testdata/expected_results_bottlerocket_mirror_config_cp.yaml b/pkg/providers/vsphere/testdata/expected_results_bottlerocket_mirror_config_cp.yaml index 90b3031c0826..7638a9a760e6 100644 --- a/pkg/providers/vsphere/testdata/expected_results_bottlerocket_mirror_config_cp.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_bottlerocket_mirror_config_cp.yaml @@ -48,7 +48,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' @@ -464,7 +464,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' diff --git a/pkg/providers/vsphere/testdata/expected_results_bottlerocket_mirror_config_md.yaml b/pkg/providers/vsphere/testdata/expected_results_bottlerocket_mirror_config_md.yaml index 4edbbc628029..9e4eb0155ac5 100644 --- a/pkg/providers/vsphere/testdata/expected_results_bottlerocket_mirror_config_md.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_bottlerocket_mirror_config_md.yaml @@ -75,7 +75,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' diff --git a/pkg/providers/vsphere/testdata/expected_results_bottlerocket_mirror_config_with_cert_cp.yaml b/pkg/providers/vsphere/testdata/expected_results_bottlerocket_mirror_config_with_cert_cp.yaml index bd3aeacc9a37..247d096b3980 100644 --- a/pkg/providers/vsphere/testdata/expected_results_bottlerocket_mirror_config_with_cert_cp.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_bottlerocket_mirror_config_with_cert_cp.yaml @@ -48,7 +48,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' @@ -518,7 +518,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' diff --git a/pkg/providers/vsphere/testdata/expected_results_bottlerocket_mirror_config_with_cert_md.yaml b/pkg/providers/vsphere/testdata/expected_results_bottlerocket_mirror_config_with_cert_md.yaml index 170213e476ec..857615c2c56d 100644 --- a/pkg/providers/vsphere/testdata/expected_results_bottlerocket_mirror_config_with_cert_md.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_bottlerocket_mirror_config_with_cert_md.yaml @@ -93,7 +93,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' diff --git a/pkg/providers/vsphere/testdata/expected_results_custom_resolv_conf.yaml b/pkg/providers/vsphere/testdata/expected_results_custom_resolv_conf.yaml index 9bb6883f3008..22470b357987 100644 --- a/pkg/providers/vsphere/testdata/expected_results_custom_resolv_conf.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_custom_resolv_conf.yaml @@ -48,7 +48,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' @@ -440,7 +440,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' diff --git a/pkg/providers/vsphere/testdata/expected_results_full_oidc_cp.yaml b/pkg/providers/vsphere/testdata/expected_results_full_oidc_cp.yaml index 83870d60d1fb..729fa67d4c25 100644 --- a/pkg/providers/vsphere/testdata/expected_results_full_oidc_cp.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_full_oidc_cp.yaml @@ -44,7 +44,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' diff --git a/pkg/providers/vsphere/testdata/expected_results_main_121_controller_md.yaml b/pkg/providers/vsphere/testdata/expected_results_main_121_controller_md.yaml index b7c0808e1ea9..9a9d9c84ac32 100644 --- a/pkg/providers/vsphere/testdata/expected_results_main_121_controller_md.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_main_121_controller_md.yaml @@ -68,7 +68,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' diff --git a/pkg/providers/vsphere/testdata/expected_results_main_121_cp.yaml b/pkg/providers/vsphere/testdata/expected_results_main_121_cp.yaml index 180d7bb88af3..ed4270e967c0 100644 --- a/pkg/providers/vsphere/testdata/expected_results_main_121_cp.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_main_121_cp.yaml @@ -48,7 +48,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' @@ -438,7 +438,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' diff --git a/pkg/providers/vsphere/testdata/expected_results_main_121_md.yaml b/pkg/providers/vsphere/testdata/expected_results_main_121_md.yaml index 7761fc2bc50f..80ef4d97ddcb 100644 --- a/pkg/providers/vsphere/testdata/expected_results_main_121_md.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_main_121_md.yaml @@ -67,7 +67,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' diff --git a/pkg/providers/vsphere/testdata/expected_results_main_cp.yaml b/pkg/providers/vsphere/testdata/expected_results_main_cp.yaml index cb8188f193c6..1643330099dd 100644 --- a/pkg/providers/vsphere/testdata/expected_results_main_cp.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_main_cp.yaml @@ -48,7 +48,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' @@ -438,7 +438,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' diff --git a/pkg/providers/vsphere/testdata/expected_results_main_cp_cloud_provder_and_csi_driver_credentials.yaml b/pkg/providers/vsphere/testdata/expected_results_main_cp_cloud_provder_and_csi_driver_credentials.yaml index c9167ffe0242..e29bd2fdd6fc 100644 --- a/pkg/providers/vsphere/testdata/expected_results_main_cp_cloud_provder_and_csi_driver_credentials.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_main_cp_cloud_provder_and_csi_driver_credentials.yaml @@ -48,7 +48,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' @@ -438,7 +438,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' diff --git a/pkg/providers/vsphere/testdata/expected_results_main_cp_cloud_provider_credentials.yaml b/pkg/providers/vsphere/testdata/expected_results_main_cp_cloud_provider_credentials.yaml index ec93dd7e2f9a..d6c49542998c 100644 --- a/pkg/providers/vsphere/testdata/expected_results_main_cp_cloud_provider_credentials.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_main_cp_cloud_provider_credentials.yaml @@ -48,7 +48,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' @@ -438,7 +438,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' diff --git a/pkg/providers/vsphere/testdata/expected_results_main_cp_csi_driver_credentials.yaml b/pkg/providers/vsphere/testdata/expected_results_main_cp_csi_driver_credentials.yaml index aa986b55bfae..02b38c36762f 100644 --- a/pkg/providers/vsphere/testdata/expected_results_main_cp_csi_driver_credentials.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_main_cp_csi_driver_credentials.yaml @@ -48,7 +48,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' @@ -438,7 +438,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' diff --git a/pkg/providers/vsphere/testdata/expected_results_main_md.yaml b/pkg/providers/vsphere/testdata/expected_results_main_md.yaml index ffcd3613282e..6e2d797f4496 100644 --- a/pkg/providers/vsphere/testdata/expected_results_main_md.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_main_md.yaml @@ -67,7 +67,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' diff --git a/pkg/providers/vsphere/testdata/expected_results_main_multiple_worker_node_groups.yaml b/pkg/providers/vsphere/testdata/expected_results_main_multiple_worker_node_groups.yaml index 14b733c2edb7..208bf8ef8cd3 100644 --- a/pkg/providers/vsphere/testdata/expected_results_main_multiple_worker_node_groups.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_main_multiple_worker_node_groups.yaml @@ -70,7 +70,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' @@ -159,7 +159,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' diff --git a/pkg/providers/vsphere/testdata/expected_results_main_no_machinetemplate_update_cp.yaml b/pkg/providers/vsphere/testdata/expected_results_main_no_machinetemplate_update_cp.yaml index 64458674bf7a..c6323f033677 100644 --- a/pkg/providers/vsphere/testdata/expected_results_main_no_machinetemplate_update_cp.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_main_no_machinetemplate_update_cp.yaml @@ -48,7 +48,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' @@ -438,7 +438,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' diff --git a/pkg/providers/vsphere/testdata/expected_results_main_no_machinetemplate_update_md.yaml b/pkg/providers/vsphere/testdata/expected_results_main_no_machinetemplate_update_md.yaml index c75c7f3f02f4..2d1064387100 100644 --- a/pkg/providers/vsphere/testdata/expected_results_main_no_machinetemplate_update_md.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_main_no_machinetemplate_update_md.yaml @@ -67,7 +67,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' diff --git a/pkg/providers/vsphere/testdata/expected_results_main_node_labels_cp.yaml b/pkg/providers/vsphere/testdata/expected_results_main_node_labels_cp.yaml index f1aa8d0cafb3..3a6310830d8f 100644 --- a/pkg/providers/vsphere/testdata/expected_results_main_node_labels_cp.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_main_node_labels_cp.yaml @@ -48,7 +48,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' @@ -440,7 +440,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' diff --git a/pkg/providers/vsphere/testdata/expected_results_main_node_labels_md.yaml b/pkg/providers/vsphere/testdata/expected_results_main_node_labels_md.yaml index 1080584fd251..da253689c3a2 100644 --- a/pkg/providers/vsphere/testdata/expected_results_main_node_labels_md.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_main_node_labels_md.yaml @@ -68,7 +68,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' diff --git a/pkg/providers/vsphere/testdata/expected_results_main_with_taints_cp.yaml b/pkg/providers/vsphere/testdata/expected_results_main_with_taints_cp.yaml index a3238f84085a..1cb681d00c83 100644 --- a/pkg/providers/vsphere/testdata/expected_results_main_with_taints_cp.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_main_with_taints_cp.yaml @@ -48,7 +48,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' @@ -456,7 +456,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' diff --git a/pkg/providers/vsphere/testdata/expected_results_main_with_taints_md.yaml b/pkg/providers/vsphere/testdata/expected_results_main_with_taints_md.yaml index a85fb90b17f6..90ce9e7b4dce 100644 --- a/pkg/providers/vsphere/testdata/expected_results_main_with_taints_md.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_main_with_taints_md.yaml @@ -70,7 +70,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' diff --git a/pkg/providers/vsphere/testdata/expected_results_minimal_add_worker_node_group.yaml b/pkg/providers/vsphere/testdata/expected_results_minimal_add_worker_node_group.yaml index 05bec8e75f52..b75c1f7240c4 100644 --- a/pkg/providers/vsphere/testdata/expected_results_minimal_add_worker_node_group.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_minimal_add_worker_node_group.yaml @@ -70,7 +70,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' @@ -159,7 +159,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' @@ -245,7 +245,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' diff --git a/pkg/providers/vsphere/testdata/expected_results_minimal_cp.yaml b/pkg/providers/vsphere/testdata/expected_results_minimal_cp.yaml index 26c2620cdcc6..4f1c95ba1c89 100644 --- a/pkg/providers/vsphere/testdata/expected_results_minimal_cp.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_minimal_cp.yaml @@ -44,7 +44,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' diff --git a/pkg/providers/vsphere/testdata/expected_results_minimal_md.yaml b/pkg/providers/vsphere/testdata/expected_results_minimal_md.yaml index 228695348a58..a4772762441c 100644 --- a/pkg/providers/vsphere/testdata/expected_results_minimal_md.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_minimal_md.yaml @@ -67,7 +67,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' diff --git a/pkg/providers/vsphere/testdata/expected_results_minimal_oidc_cp.yaml b/pkg/providers/vsphere/testdata/expected_results_minimal_oidc_cp.yaml index 9537ce4508d2..25affc997acc 100644 --- a/pkg/providers/vsphere/testdata/expected_results_minimal_oidc_cp.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_minimal_oidc_cp.yaml @@ -44,7 +44,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' diff --git a/pkg/providers/vsphere/testdata/expected_results_mirror_config_cp.yaml b/pkg/providers/vsphere/testdata/expected_results_mirror_config_cp.yaml index 8cd8dce5f42e..9492035bd8ec 100644 --- a/pkg/providers/vsphere/testdata/expected_results_mirror_config_cp.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_mirror_config_cp.yaml @@ -48,7 +48,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' @@ -449,7 +449,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' diff --git a/pkg/providers/vsphere/testdata/expected_results_mirror_config_md.yaml b/pkg/providers/vsphere/testdata/expected_results_mirror_config_md.yaml index 62dd0d4c111f..381ce8980f4b 100644 --- a/pkg/providers/vsphere/testdata/expected_results_mirror_config_md.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_mirror_config_md.yaml @@ -77,7 +77,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' diff --git a/pkg/providers/vsphere/testdata/expected_results_mirror_config_with_cert_cp.yaml b/pkg/providers/vsphere/testdata/expected_results_mirror_config_with_cert_cp.yaml index 30cf9dce327a..5b2c255f9c75 100644 --- a/pkg/providers/vsphere/testdata/expected_results_mirror_config_with_cert_cp.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_mirror_config_with_cert_cp.yaml @@ -48,7 +48,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' @@ -489,7 +489,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' diff --git a/pkg/providers/vsphere/testdata/expected_results_mirror_config_with_cert_md.yaml b/pkg/providers/vsphere/testdata/expected_results_mirror_config_with_cert_md.yaml index 733a0cbe7d41..2216d0dd8a38 100644 --- a/pkg/providers/vsphere/testdata/expected_results_mirror_config_with_cert_md.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_mirror_config_with_cert_md.yaml @@ -99,7 +99,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' diff --git a/pkg/providers/vsphere/testdata/expected_results_pod_iam_config.yaml b/pkg/providers/vsphere/testdata/expected_results_pod_iam_config.yaml index bf8b2d22b53a..afce1400cf33 100644 --- a/pkg/providers/vsphere/testdata/expected_results_pod_iam_config.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_pod_iam_config.yaml @@ -48,7 +48,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' @@ -439,7 +439,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm' diff --git a/pkg/providers/vsphere/testdata/original_077.yaml b/pkg/providers/vsphere/testdata/original_077.yaml index 1147424ee40c..58c57e0f8680 100644 --- a/pkg/providers/vsphere/testdata/original_077.yaml +++ b/pkg/providers/vsphere/testdata/original_077.yaml @@ -40,7 +40,7 @@ spec: datacenters: SDDC-Datacenter thumbprint: ABCDEFG workspace: - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore folder: /SDDC-Datacenter/vm resourcePool: '*/Resources' @@ -60,7 +60,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: /SDDC-Datacenter/vm From 894e646c91990de8f435b3c33acc79ae0441e1fd Mon Sep 17 00:00:00 2001 From: Anton Donskoy Date: Wed, 21 Sep 2022 09:53:43 +0300 Subject: [PATCH 3/3] Add quotes in new testdata --- .../testdata/expected_results_minimal_autoscaling_md.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/providers/vsphere/testdata/expected_results_minimal_autoscaling_md.yaml b/pkg/providers/vsphere/testdata/expected_results_minimal_autoscaling_md.yaml index 20c1403d56ca..0d8968d4bc8d 100644 --- a/pkg/providers/vsphere/testdata/expected_results_minimal_autoscaling_md.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_minimal_autoscaling_md.yaml @@ -70,7 +70,7 @@ spec: template: spec: cloneMode: linkedClone - datacenter: SDDC-Datacenter + datacenter: 'SDDC-Datacenter' datastore: /SDDC-Datacenter/datastore/WorkloadDatastore diskGiB: 25 folder: '/SDDC-Datacenter/vm'