From baac31a2b301fb708a1cc63a0270596f9668f89a Mon Sep 17 00:00:00 2001 From: Gabriel Mendes da Silva Date: Mon, 11 Apr 2022 17:34:39 -0700 Subject: [PATCH] Use single quotes for user/pass --- pkg/providers/vsphere/config/template-cp.yaml | 8 ++++---- .../expected_results_bottlerocket_external_etcd_cp.yaml | 8 ++++---- .../expected_results_bottlerocket_mirror_config_cp.yaml | 8 ++++---- ...d_results_bottlerocket_mirror_config_with_cert_cp.yaml | 8 ++++---- .../testdata/expected_results_custom_resolv_conf.yaml | 8 ++++---- .../vsphere/testdata/expected_results_full_oidc_cp.yaml | 8 ++++---- .../vsphere/testdata/expected_results_main_121_cp.yaml | 8 ++++---- .../vsphere/testdata/expected_results_main_cp.yaml | 8 ++++---- ..._main_cp_cloud_provder_and_csi_driver_credentials.yaml | 8 ++++---- ...pected_results_main_cp_cloud_provider_credentials.yaml | 8 ++++---- .../expected_results_main_cp_csi_driver_credentials.yaml | 8 ++++---- ...xpected_results_main_no_machinetemplate_update_cp.yaml | 8 ++++---- .../testdata/expected_results_main_node_labels_cp.yaml | 8 ++++---- .../testdata/expected_results_main_with_taints_cp.yaml | 8 ++++---- .../vsphere/testdata/expected_results_minimal_cp.yaml | 8 ++++---- .../testdata/expected_results_minimal_oidc_cp.yaml | 8 ++++---- .../testdata/expected_results_mirror_config_cp.yaml | 8 ++++---- .../expected_results_mirror_config_with_cert_cp.yaml | 8 ++++---- .../vsphere/testdata/expected_results_pod_iam_config.yaml | 8 ++++---- 19 files changed, 76 insertions(+), 76 deletions(-) diff --git a/pkg/providers/vsphere/config/template-cp.yaml b/pkg/providers/vsphere/config/template-cp.yaml index 3586022f3b276..e8f2f33be9aec 100644 --- a/pkg/providers/vsphere/config/template-cp.yaml +++ b/pkg/providers/vsphere/config/template-cp.yaml @@ -541,8 +541,8 @@ metadata: labels: clusterctl.cluster.x-k8s.io/move: "true" stringData: - username: "{{.eksaVsphereUsername}}" - password: "{{.eksaVspherePassword}}" + username: '{{.eksaVsphereUsername}}' + password: '{{.eksaVspherePassword}}' --- apiVersion: v1 kind: Secret @@ -1043,8 +1043,8 @@ stringData: name: cloud-provider-vsphere-credentials namespace: kube-system stringData: - {{.vsphereServer}}.password: "{{.eksaCloudProviderPassword}}" - {{.vsphereServer}}.username: "{{.eksaCloudProviderUsername}}" + {{.vsphereServer}}.password: '{{.eksaCloudProviderPassword}}' + {{.vsphereServer}}.username: '{{.eksaCloudProviderUsername}}' type: Opaque type: addons.cluster.x-k8s.io/resource-set --- 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 070b7a10248bb..8fff8c3d0f381 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 @@ -489,8 +489,8 @@ metadata: labels: clusterctl.cluster.x-k8s.io/move: "true" stringData: - username: "vsphere_username" - password: "vsphere_password" + username: 'vsphere_username' + password: 'vsphere_password' --- apiVersion: v1 kind: Secret @@ -981,8 +981,8 @@ stringData: name: cloud-provider-vsphere-credentials namespace: kube-system stringData: - vsphere_server.password: "vsphere_password" - vsphere_server.username: "vsphere_username" + vsphere_server.password: 'vsphere_password' + vsphere_server.username: 'vsphere_username' type: Opaque type: addons.cluster.x-k8s.io/resource-set --- 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 b858c2ea2d2a2..68b287908105b 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 @@ -488,8 +488,8 @@ metadata: labels: clusterctl.cluster.x-k8s.io/move: "true" stringData: - username: "vsphere_username" - password: "vsphere_password" + username: 'vsphere_username' + password: 'vsphere_password' --- apiVersion: v1 kind: Secret @@ -980,8 +980,8 @@ stringData: name: cloud-provider-vsphere-credentials namespace: kube-system stringData: - vsphere_server.password: "vsphere_password" - vsphere_server.username: "vsphere_username" + vsphere_server.password: 'vsphere_password' + vsphere_server.username: 'vsphere_username' type: Opaque type: addons.cluster.x-k8s.io/resource-set --- 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 077c6a6081085..6a31122f88b3a 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 @@ -542,8 +542,8 @@ metadata: labels: clusterctl.cluster.x-k8s.io/move: "true" stringData: - username: "vsphere_username" - password: "vsphere_password" + username: 'vsphere_username' + password: 'vsphere_password' --- apiVersion: v1 kind: Secret @@ -1034,8 +1034,8 @@ stringData: name: cloud-provider-vsphere-credentials namespace: kube-system stringData: - vsphere_server.password: "vsphere_password" - vsphere_server.username: "vsphere_username" + vsphere_server.password: 'vsphere_password' + vsphere_server.username: 'vsphere_username' type: Opaque type: addons.cluster.x-k8s.io/resource-set --- 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 7b0dbe7d9af63..98e1f13f3a07b 100644 --- a/pkg/providers/vsphere/testdata/expected_results_custom_resolv_conf.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_custom_resolv_conf.yaml @@ -464,8 +464,8 @@ metadata: labels: clusterctl.cluster.x-k8s.io/move: "true" stringData: - username: "vsphere_username" - password: "vsphere_password" + username: 'vsphere_username' + password: 'vsphere_password' --- apiVersion: v1 kind: Secret @@ -956,8 +956,8 @@ stringData: name: cloud-provider-vsphere-credentials namespace: kube-system stringData: - vsphere_server.password: "vsphere_password" - vsphere_server.username: "vsphere_username" + vsphere_server.password: 'vsphere_password' + vsphere_server.username: 'vsphere_username' type: Opaque type: addons.cluster.x-k8s.io/resource-set --- 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 c8c7ccdb172fb..c452e641739d0 100644 --- a/pkg/providers/vsphere/testdata/expected_results_full_oidc_cp.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_full_oidc_cp.yaml @@ -410,8 +410,8 @@ metadata: labels: clusterctl.cluster.x-k8s.io/move: "true" stringData: - username: "vsphere_username" - password: "vsphere_password" + username: 'vsphere_username' + password: 'vsphere_password' --- apiVersion: v1 kind: Secret @@ -902,8 +902,8 @@ stringData: name: cloud-provider-vsphere-credentials namespace: kube-system stringData: - vsphere_server.password: "vsphere_password" - vsphere_server.username: "vsphere_username" + vsphere_server.password: 'vsphere_password' + vsphere_server.username: 'vsphere_username' type: Opaque type: addons.cluster.x-k8s.io/resource-set --- 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 f881a0846b7d3..565552ea123fe 100644 --- a/pkg/providers/vsphere/testdata/expected_results_main_121_cp.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_main_121_cp.yaml @@ -462,8 +462,8 @@ metadata: labels: clusterctl.cluster.x-k8s.io/move: "true" stringData: - username: "vsphere_username" - password: "vsphere_password" + username: 'vsphere_username' + password: 'vsphere_password' --- apiVersion: v1 kind: Secret @@ -954,8 +954,8 @@ stringData: name: cloud-provider-vsphere-credentials namespace: kube-system stringData: - vsphere_server.password: "vsphere_password" - vsphere_server.username: "vsphere_username" + vsphere_server.password: 'vsphere_password' + vsphere_server.username: 'vsphere_username' type: Opaque type: addons.cluster.x-k8s.io/resource-set --- diff --git a/pkg/providers/vsphere/testdata/expected_results_main_cp.yaml b/pkg/providers/vsphere/testdata/expected_results_main_cp.yaml index 2f3682c5976c6..b134dbd037459 100644 --- a/pkg/providers/vsphere/testdata/expected_results_main_cp.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_main_cp.yaml @@ -462,8 +462,8 @@ metadata: labels: clusterctl.cluster.x-k8s.io/move: "true" stringData: - username: "vsphere_username" - password: "vsphere_password" + username: 'vsphere_username' + password: 'vsphere_password' --- apiVersion: v1 kind: Secret @@ -954,8 +954,8 @@ stringData: name: cloud-provider-vsphere-credentials namespace: kube-system stringData: - vsphere_server.password: "vsphere_password" - vsphere_server.username: "vsphere_username" + vsphere_server.password: 'vsphere_password' + vsphere_server.username: 'vsphere_username' type: Opaque type: addons.cluster.x-k8s.io/resource-set --- 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 64ec4c3549994..00024e3826467 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 @@ -462,8 +462,8 @@ metadata: labels: clusterctl.cluster.x-k8s.io/move: "true" stringData: - username: "vsphere_username" - password: "vsphere_password" + username: 'vsphere_username' + password: 'vsphere_password' --- apiVersion: v1 kind: Secret @@ -954,8 +954,8 @@ stringData: name: cloud-provider-vsphere-credentials namespace: kube-system stringData: - vsphere_server.password: "EksavSphereCPPassword" - vsphere_server.username: "EksavSphereCPUsername" + vsphere_server.password: 'EksavSphereCPPassword' + vsphere_server.username: 'EksavSphereCPUsername' type: Opaque type: addons.cluster.x-k8s.io/resource-set --- 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 6df7b5aa29509..6da4f474e7a37 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 @@ -462,8 +462,8 @@ metadata: labels: clusterctl.cluster.x-k8s.io/move: "true" stringData: - username: "vsphere_username" - password: "vsphere_password" + username: 'vsphere_username' + password: 'vsphere_password' --- apiVersion: v1 kind: Secret @@ -954,8 +954,8 @@ stringData: name: cloud-provider-vsphere-credentials namespace: kube-system stringData: - vsphere_server.password: "EksavSphereCPPassword" - vsphere_server.username: "EksavSphereCPUsername" + vsphere_server.password: 'EksavSphereCPPassword' + vsphere_server.username: 'EksavSphereCPUsername' type: Opaque type: addons.cluster.x-k8s.io/resource-set --- 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 8fc3ab1a6561d..4eea95c44326a 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 @@ -462,8 +462,8 @@ metadata: labels: clusterctl.cluster.x-k8s.io/move: "true" stringData: - username: "vsphere_username" - password: "vsphere_password" + username: 'vsphere_username' + password: 'vsphere_password' --- apiVersion: v1 kind: Secret @@ -954,8 +954,8 @@ stringData: name: cloud-provider-vsphere-credentials namespace: kube-system stringData: - vsphere_server.password: "vsphere_password" - vsphere_server.username: "vsphere_username" + vsphere_server.password: 'vsphere_password' + vsphere_server.username: 'vsphere_username' type: Opaque type: addons.cluster.x-k8s.io/resource-set --- 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 0688162940d72..3220f67c8301c 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 @@ -462,8 +462,8 @@ metadata: labels: clusterctl.cluster.x-k8s.io/move: "true" stringData: - username: "vsphere_username" - password: "vsphere_password" + username: 'vsphere_username' + password: 'vsphere_password' --- apiVersion: v1 kind: Secret @@ -954,8 +954,8 @@ stringData: name: cloud-provider-vsphere-credentials namespace: kube-system stringData: - vsphere_server.password: "vsphere_password" - vsphere_server.username: "vsphere_username" + vsphere_server.password: 'vsphere_password' + vsphere_server.username: 'vsphere_username' type: Opaque type: addons.cluster.x-k8s.io/resource-set --- 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 4d5bd68ced129..c7b4b2f7b4ceb 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 @@ -464,8 +464,8 @@ metadata: labels: clusterctl.cluster.x-k8s.io/move: "true" stringData: - username: "vsphere_username" - password: "vsphere_password" + username: 'vsphere_username' + password: 'vsphere_password' --- apiVersion: v1 kind: Secret @@ -956,8 +956,8 @@ stringData: name: cloud-provider-vsphere-credentials namespace: kube-system stringData: - vsphere_server.password: "vsphere_password" - vsphere_server.username: "vsphere_username" + vsphere_server.password: 'vsphere_password' + vsphere_server.username: 'vsphere_username' type: Opaque type: addons.cluster.x-k8s.io/resource-set --- 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 63d190a48b0fe..9e8b0279947ea 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 @@ -480,8 +480,8 @@ metadata: labels: clusterctl.cluster.x-k8s.io/move: "true" stringData: - username: "vsphere_username" - password: "vsphere_password" + username: 'vsphere_username' + password: 'vsphere_password' --- apiVersion: v1 kind: Secret @@ -981,8 +981,8 @@ stringData: name: cloud-provider-vsphere-credentials namespace: kube-system stringData: - vsphere_server.password: "vsphere_password" - vsphere_server.username: "vsphere_username" + vsphere_server.password: 'vsphere_password' + vsphere_server.username: 'vsphere_username' type: Opaque type: addons.cluster.x-k8s.io/resource-set --- diff --git a/pkg/providers/vsphere/testdata/expected_results_minimal_cp.yaml b/pkg/providers/vsphere/testdata/expected_results_minimal_cp.yaml index 287e5655286ca..c7d8b0b28ed17 100644 --- a/pkg/providers/vsphere/testdata/expected_results_minimal_cp.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_minimal_cp.yaml @@ -402,8 +402,8 @@ metadata: labels: clusterctl.cluster.x-k8s.io/move: "true" stringData: - username: "vsphere_username" - password: "vsphere_password" + username: 'vsphere_username' + password: 'vsphere_password' --- apiVersion: v1 kind: Secret @@ -894,8 +894,8 @@ stringData: name: cloud-provider-vsphere-credentials namespace: kube-system stringData: - vsphere_server.password: "vsphere_password" - vsphere_server.username: "vsphere_username" + vsphere_server.password: 'vsphere_password' + vsphere_server.username: 'vsphere_username' type: Opaque type: addons.cluster.x-k8s.io/resource-set --- 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 efd4623db25ec..7ad95277efdc0 100644 --- a/pkg/providers/vsphere/testdata/expected_results_minimal_oidc_cp.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_minimal_oidc_cp.yaml @@ -405,8 +405,8 @@ metadata: labels: clusterctl.cluster.x-k8s.io/move: "true" stringData: - username: "vsphere_username" - password: "vsphere_password" + username: 'vsphere_username' + password: 'vsphere_password' --- apiVersion: v1 kind: Secret @@ -897,8 +897,8 @@ stringData: name: cloud-provider-vsphere-credentials namespace: kube-system stringData: - vsphere_server.password: "vsphere_password" - vsphere_server.username: "vsphere_username" + vsphere_server.password: 'vsphere_password' + vsphere_server.username: 'vsphere_username' type: Opaque type: addons.cluster.x-k8s.io/resource-set --- 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 f969c3c622b3b..949240aa01935 100644 --- a/pkg/providers/vsphere/testdata/expected_results_mirror_config_cp.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_mirror_config_cp.yaml @@ -473,8 +473,8 @@ metadata: labels: clusterctl.cluster.x-k8s.io/move: "true" stringData: - username: "vsphere_username" - password: "vsphere_password" + username: 'vsphere_username' + password: 'vsphere_password' --- apiVersion: v1 kind: Secret @@ -965,8 +965,8 @@ stringData: name: cloud-provider-vsphere-credentials namespace: kube-system stringData: - vsphere_server.password: "vsphere_password" - vsphere_server.username: "vsphere_username" + vsphere_server.password: 'vsphere_password' + vsphere_server.username: 'vsphere_username' type: Opaque type: addons.cluster.x-k8s.io/resource-set --- 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 b4f825e364f9e..c2714c26b4e7a 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 @@ -513,8 +513,8 @@ metadata: labels: clusterctl.cluster.x-k8s.io/move: "true" stringData: - username: "vsphere_username" - password: "vsphere_password" + username: 'vsphere_username' + password: 'vsphere_password' --- apiVersion: v1 kind: Secret @@ -1005,8 +1005,8 @@ stringData: name: cloud-provider-vsphere-credentials namespace: kube-system stringData: - vsphere_server.password: "vsphere_password" - vsphere_server.username: "vsphere_username" + vsphere_server.password: 'vsphere_password' + vsphere_server.username: 'vsphere_username' type: Opaque type: addons.cluster.x-k8s.io/resource-set --- 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 e76c20fabae20..9f9a37d120b73 100644 --- a/pkg/providers/vsphere/testdata/expected_results_pod_iam_config.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_pod_iam_config.yaml @@ -463,8 +463,8 @@ metadata: labels: clusterctl.cluster.x-k8s.io/move: "true" stringData: - username: "vsphere_username" - password: "vsphere_password" + username: 'vsphere_username' + password: 'vsphere_password' --- apiVersion: v1 kind: Secret @@ -955,8 +955,8 @@ stringData: name: cloud-provider-vsphere-credentials namespace: kube-system stringData: - vsphere_server.password: "vsphere_password" - vsphere_server.username: "vsphere_username" + vsphere_server.password: 'vsphere_password' + vsphere_server.username: 'vsphere_username' type: Opaque type: addons.cluster.x-k8s.io/resource-set ---