From 6ff939a32c6958eadddf80695bfc316b635ca8cf Mon Sep 17 00:00:00 2001 From: Abhay Krishna Arunachalam Date: Mon, 11 Mar 2024 15:22:25 -0700 Subject: [PATCH] Encode username and password in Kubernetes secrets --- pkg/clustermanager/cluster_manager.go | 12 +++++++++--- pkg/clustermanager/cluster_manager_test.go | 6 +++--- pkg/providers/docker/config/template-cp.yaml | 6 +++--- ...ted_results_mirror_with_auth_config_cp.yaml | 6 +++--- pkg/providers/nutanix/config/cp-template.yaml | 6 +++--- .../expected_results_registry_mirror.yaml | 6 +++--- .../tinkerbell/config/template-cp.yaml | 6 +++--- pkg/providers/tinkerbell/controlplane_test.go | 6 +++--- ...tlerocket_cp_registry_mirror_with_auth.yaml | 6 +++--- ...inkerbell_cp_registry_mirror_with_auth.yaml | 6 +++--- pkg/providers/vsphere/config/secret.yaml | 4 ++-- pkg/providers/vsphere/config/template-cp.yaml | 18 +++++++++--------- pkg/providers/vsphere/template_test.go | 10 +++++++--- ...luster_api_server_cert_san_domain_name.yaml | 12 ++++++------ ...xpected_cluster_api_server_cert_san_ip.yaml | 12 ++++++------ ...s_bottlerocket_boot_settings_config_cp.yaml | 12 ++++++------ ...ts_bottlerocket_cert_bundles_config_cp.yaml | 12 ++++++------ ..._results_bottlerocket_external_etcd_cp.yaml | 12 ++++++------ ..._results_bottlerocket_kernel_config_cp.yaml | 12 ++++++------ ..._results_bottlerocket_mirror_config_cp.yaml | 12 ++++++------ ...ottlerocket_mirror_config_with_auth_cp.yaml | 18 +++++++++--------- ...ottlerocket_mirror_config_with_cert_cp.yaml | 12 ++++++------ ...ted_results_bottlerocket_ntp_config_cp.yaml | 12 ++++++------ ...esults_bottlerocket_settings_config_cp.yaml | 12 ++++++------ .../expected_results_custom_resolv_conf.yaml | 12 ++++++------ .../expected_results_diff_template_cp.yaml | 12 ++++++------ .../expected_results_full_oidc_cp.yaml | 12 ++++++------ .../testdata/expected_results_main_121_cp.yaml | 12 ++++++------ .../testdata/expected_results_main_cp.yaml | 12 ++++++------ ...lts_main_cp_cloud_provider_credentials.yaml | 12 ++++++------ ...ults_main_no_machinetemplate_update_cp.yaml | 12 ++++++------ .../expected_results_main_node_labels_cp.yaml | 12 ++++++------ .../expected_results_main_with_taints_cp.yaml | 12 ++++++------ .../testdata/expected_results_minimal_cp.yaml | 12 ++++++------ .../expected_results_minimal_oidc_cp.yaml | 12 ++++++------ .../expected_results_mirror_config_cp.yaml | 12 ++++++------ ...ted_results_mirror_config_with_cert_cp.yaml | 12 ++++++------ ...ted_results_mirror_with_auth_config_cp.yaml | 18 +++++++++--------- .../expected_results_pod_iam_config.yaml | 12 ++++++------ ...cted_results_ubuntu_etcd_encryption_cp.yaml | 12 ++++++------ ...results_ubuntu_etcd_encryption_cp_1_29.yaml | 12 ++++++------ .../expected_results_ubuntu_ntp_config_cp.yaml | 12 ++++++------ 42 files changed, 234 insertions(+), 224 deletions(-) diff --git a/pkg/clustermanager/cluster_manager.go b/pkg/clustermanager/cluster_manager.go index dec32100aa96..5acb9f00f6a7 100644 --- a/pkg/clustermanager/cluster_manager.go +++ b/pkg/clustermanager/cluster_manager.go @@ -4,6 +4,7 @@ import ( "bytes" "context" _ "embed" + "encoding/base64" "errors" "fmt" "io" @@ -743,6 +744,11 @@ func compareEKSAClusterSpec(ctx context.Context, currentClusterSpec, newClusterS // CreateRegistryCredSecret creates the registry-credentials secret on a managment cluster. func (c *ClusterManager) CreateRegistryCredSecret(ctx context.Context, mgmt *types.Cluster) error { + registryUsername := os.Getenv("REGISTRY_USERNAME") + encodedRegistryUsername := base64.StdEncoding.EncodeToString([]byte(registryUsername)) + registryPassword := os.Getenv("REGISTRY_PASSWORD") + encodedRegistryPassword := base64.StdEncoding.EncodeToString([]byte(registryPassword)) + secret := &corev1.Secret{ TypeMeta: metav1.TypeMeta{ Kind: "Secret", @@ -752,9 +758,9 @@ func (c *ClusterManager) CreateRegistryCredSecret(ctx context.Context, mgmt *typ Namespace: constants.EksaSystemNamespace, Name: "registry-credentials", }, - StringData: map[string]string{ - "username": os.Getenv("REGISTRY_USERNAME"), - "password": os.Getenv("REGISTRY_PASSWORD"), + Data: map[string][]byte{ + "username": []byte(encodedRegistryUsername), + "password": []byte(encodedRegistryPassword), }, } diff --git a/pkg/clustermanager/cluster_manager_test.go b/pkg/clustermanager/cluster_manager_test.go index fb5a1e399973..fcf0797d64a3 100644 --- a/pkg/clustermanager/cluster_manager_test.go +++ b/pkg/clustermanager/cluster_manager_test.go @@ -2955,9 +2955,9 @@ func TestCreateRegistryCredSecretSuccess(t *testing.T) { Namespace: constants.EksaSystemNamespace, Name: "registry-credentials", }, - StringData: map[string]string{ - "username": "", - "password": "", + Data: map[string][]byte{ + "username": []byte(""), + "password": []byte(""), }, } diff --git a/pkg/providers/docker/config/template-cp.yaml b/pkg/providers/docker/config/template-cp.yaml index 5f7ba56fab51..2cb630b6f527 100644 --- a/pkg/providers/docker/config/template-cp.yaml +++ b/pkg/providers/docker/config/template-cp.yaml @@ -318,8 +318,8 @@ metadata: namespace: {{.eksaSystemNamespace}} labels: clusterctl.cluster.x-k8s.io/move: "true" -stringData: - username: "{{.registryUsername}}" - password: "{{.registryPassword}}" +data: + username: {{.registryUsername | b64enc}} + password: {{.registryPassword | b64enc}} --- {{- end }} diff --git a/pkg/providers/docker/testdata/expected_results_mirror_with_auth_config_cp.yaml b/pkg/providers/docker/testdata/expected_results_mirror_with_auth_config_cp.yaml index 80a129a6e83c..1f758b3b9ca7 100644 --- a/pkg/providers/docker/testdata/expected_results_mirror_with_auth_config_cp.yaml +++ b/pkg/providers/docker/testdata/expected_results_mirror_with_auth_config_cp.yaml @@ -377,7 +377,7 @@ metadata: namespace: eksa-system labels: clusterctl.cluster.x-k8s.io/move: "true" -stringData: - username: "username" - password: "password" +data: + username: dXNlcm5hbWU= + password: cGFzc3dvcmQ= --- diff --git a/pkg/providers/nutanix/config/cp-template.yaml b/pkg/providers/nutanix/config/cp-template.yaml index ab9af7618816..c9d7694166f8 100644 --- a/pkg/providers/nutanix/config/cp-template.yaml +++ b/pkg/providers/nutanix/config/cp-template.yaml @@ -540,9 +540,9 @@ metadata: namespace: {{.eksaSystemNamespace}} labels: clusterctl.cluster.x-k8s.io/move: "true" -stringData: - username: "{{.registryUsername}}" - password: "{{.registryPassword}}" +data: + username: {{.registryUsername | b64enc}} + password: {{.registryPassword | b64enc}} --- {{- end }} apiVersion: v1 diff --git a/pkg/providers/nutanix/testdata/expected_results_registry_mirror.yaml b/pkg/providers/nutanix/testdata/expected_results_registry_mirror.yaml index 6e0c4508d75c..eedffb23ace0 100644 --- a/pkg/providers/nutanix/testdata/expected_results_registry_mirror.yaml +++ b/pkg/providers/nutanix/testdata/expected_results_registry_mirror.yaml @@ -411,9 +411,9 @@ metadata: namespace: eksa-system labels: clusterctl.cluster.x-k8s.io/move: "true" -stringData: - username: "username" - password: "password" +data: + username: dXNlcm5hbWU= + password: cGFzc3dvcmQ= --- apiVersion: v1 kind: ConfigMap diff --git a/pkg/providers/tinkerbell/config/template-cp.yaml b/pkg/providers/tinkerbell/config/template-cp.yaml index e82be40b8f92..838deae8b863 100644 --- a/pkg/providers/tinkerbell/config/template-cp.yaml +++ b/pkg/providers/tinkerbell/config/template-cp.yaml @@ -557,7 +557,7 @@ metadata: namespace: {{.eksaSystemNamespace}} labels: clusterctl.cluster.x-k8s.io/move: "true" -stringData: - username: "{{.registryUsername}}" - password: "{{.registryPassword}}" +data: + username: {{.registryUsername | b64enc}} + password: {{.registryPassword | b64enc}} {{- end }} \ No newline at end of file diff --git a/pkg/providers/tinkerbell/controlplane_test.go b/pkg/providers/tinkerbell/controlplane_test.go index 284f27c2f934..bf56eabe16a7 100644 --- a/pkg/providers/tinkerbell/controlplane_test.go +++ b/pkg/providers/tinkerbell/controlplane_test.go @@ -1005,9 +1005,9 @@ func secret() *corev1.Secret { "clusterctl.cluster.x-k8s.io/move": "true", }, }, - StringData: map[string]string{ - "username": "username", - "password": "password", + Data: map[string][]byte{ + "username": []byte("username"), + "password": []byte("password"), }, } } diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_bottlerocket_cp_registry_mirror_with_auth.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_bottlerocket_cp_registry_mirror_with_auth.yaml index b1f890829731..bac0bf74db56 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_bottlerocket_cp_registry_mirror_with_auth.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_bottlerocket_cp_registry_mirror_with_auth.yaml @@ -480,6 +480,6 @@ metadata: namespace: eksa-system labels: clusterctl.cluster.x-k8s.io/move: "true" -stringData: - username: "username" - password: "password" \ No newline at end of file +data: + username: dXNlcm5hbWU= + password: cGFzc3dvcmQ= \ No newline at end of file diff --git a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_registry_mirror_with_auth.yaml b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_registry_mirror_with_auth.yaml index cefe77616ecf..01aa2ff681a7 100644 --- a/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_registry_mirror_with_auth.yaml +++ b/pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_registry_mirror_with_auth.yaml @@ -464,6 +464,6 @@ metadata: namespace: eksa-system labels: clusterctl.cluster.x-k8s.io/move: "true" -stringData: - username: "username" - password: "password" \ No newline at end of file +data: + username: dXNlcm5hbWU= + password: cGFzc3dvcmQ= \ No newline at end of file diff --git a/pkg/providers/vsphere/config/secret.yaml b/pkg/providers/vsphere/config/secret.yaml index 53c1dea16670..d67ce6f990b1 100644 --- a/pkg/providers/vsphere/config/secret.yaml +++ b/pkg/providers/vsphere/config/secret.yaml @@ -7,8 +7,8 @@ type: kubernetes.io/basic-auth data: username: {{.vsphereUsername | b64enc}} password: {{.vspherePassword | b64enc}} - usernameCP: "{{.eksaCloudProviderUsername | b64enc}}" - passwordCP: "{{.eksaCloudProviderPassword | b64enc}}" + usernameCP: {{.eksaCloudProviderUsername | b64enc}} + passwordCP: {{.eksaCloudProviderPassword | b64enc}} --- apiVersion: v1 kind: Secret diff --git a/pkg/providers/vsphere/config/template-cp.yaml b/pkg/providers/vsphere/config/template-cp.yaml index 058a2bb244ae..70165168d331 100644 --- a/pkg/providers/vsphere/config/template-cp.yaml +++ b/pkg/providers/vsphere/config/template-cp.yaml @@ -651,9 +651,9 @@ metadata: namespace: {{.eksaSystemNamespace}} labels: clusterctl.cluster.x-k8s.io/move: "true" -stringData: - username: "{{.eksaVsphereUsername}}" - password: "{{.eksaVspherePassword}}" +data: + username: {{.eksaVsphereUsername | b64enc}} + password: {{.eksaVspherePassword | b64enc}} --- {{- if .registryAuth }} apiVersion: v1 @@ -663,9 +663,9 @@ metadata: namespace: {{.eksaSystemNamespace}} labels: clusterctl.cluster.x-k8s.io/move: "true" -stringData: - username: "{{.registryUsername}}" - password: "{{.registryPassword}}" +data: + username: {{.registryUsername | b64enc}} + password: {{.registryPassword | b64enc}} --- {{- end }} apiVersion: v1 @@ -694,9 +694,9 @@ stringData: metadata: name: cloud-provider-vsphere-credentials namespace: kube-system - stringData: - {{.vsphereServer}}.password: "{{.eksaCloudProviderPassword}}" - {{.vsphereServer}}.username: "{{.eksaCloudProviderUsername}}" + data: + {{.vsphereServer}}.password: {{.eksaCloudProviderPassword | b64enc}} + {{.vsphereServer}}.username: {{.eksaCloudProviderUsername | b64enc}} type: Opaque type: addons.cluster.x-k8s.io/resource-set --- diff --git a/pkg/providers/vsphere/template_test.go b/pkg/providers/vsphere/template_test.go index 26724b67976a..56af1c73f4e4 100644 --- a/pkg/providers/vsphere/template_test.go +++ b/pkg/providers/vsphere/template_test.go @@ -1,7 +1,6 @@ package vsphere_test import ( - "os" "testing" "time" @@ -12,6 +11,11 @@ import ( "github.com/aws/eks-anywhere/pkg/providers/vsphere" ) +const ( + expectedVSphereUsername = "vsphere_username" + expectedVSpherePassword = "vsphere_password" +) + func TestVsphereTemplateBuilderGenerateCAPISpecWorkersInvalidSSHKey(t *testing.T) { g := NewWithT(t) spec := test.NewFullClusterSpec(t, "testdata/cluster_main.yaml") @@ -52,8 +56,8 @@ func TestVsphereTemplateBuilderGenerateCAPISpecControlPlaneInvalidEtcdSSHKey(t * } func TestTemplateBuilder_CertSANs(t *testing.T) { - os.Unsetenv(config.EksavSphereUsernameKey) - os.Unsetenv(config.EksavSpherePasswordKey) + t.Setenv(config.EksavSphereUsernameKey, expectedVSphereUsername) + t.Setenv(config.EksavSpherePasswordKey, expectedVSpherePassword) for _, tc := range []struct { Input string diff --git a/pkg/providers/vsphere/testdata/expected_cluster_api_server_cert_san_domain_name.yaml b/pkg/providers/vsphere/testdata/expected_cluster_api_server_cert_san_domain_name.yaml index 2bc454912b0e..ed3dfc618368 100644 --- a/pkg/providers/vsphere/testdata/expected_cluster_api_server_cert_san_domain_name.yaml +++ b/pkg/providers/vsphere/testdata/expected_cluster_api_server_cert_san_domain_name.yaml @@ -388,9 +388,9 @@ metadata: namespace: eksa-system labels: clusterctl.cluster.x-k8s.io/move: "true" -stringData: - username: "" - password: "" +data: + username: dnNwaGVyZV91c2VybmFtZQ== + password: dnNwaGVyZV9wYXNzd29yZA== --- apiVersion: v1 kind: Secret @@ -418,9 +418,9 @@ stringData: metadata: name: cloud-provider-vsphere-credentials namespace: kube-system - stringData: - vsphere_server.password: "" - vsphere_server.username: "" + data: + vsphere_server.password: dnNwaGVyZV9wYXNzd29yZA== + vsphere_server.username: dnNwaGVyZV91c2VybmFtZQ== type: Opaque type: addons.cluster.x-k8s.io/resource-set --- diff --git a/pkg/providers/vsphere/testdata/expected_cluster_api_server_cert_san_ip.yaml b/pkg/providers/vsphere/testdata/expected_cluster_api_server_cert_san_ip.yaml index 58004602c476..5110642ef776 100644 --- a/pkg/providers/vsphere/testdata/expected_cluster_api_server_cert_san_ip.yaml +++ b/pkg/providers/vsphere/testdata/expected_cluster_api_server_cert_san_ip.yaml @@ -388,9 +388,9 @@ metadata: namespace: eksa-system labels: clusterctl.cluster.x-k8s.io/move: "true" -stringData: - username: "" - password: "" +data: + username: dnNwaGVyZV91c2VybmFtZQ== + password: dnNwaGVyZV9wYXNzd29yZA== --- apiVersion: v1 kind: Secret @@ -418,9 +418,9 @@ stringData: metadata: name: cloud-provider-vsphere-credentials namespace: kube-system - stringData: - vsphere_server.password: "" - vsphere_server.username: "" + data: + vsphere_server.password: dnNwaGVyZV9wYXNzd29yZA== + vsphere_server.username: dnNwaGVyZV91c2VybmFtZQ== type: Opaque type: addons.cluster.x-k8s.io/resource-set --- diff --git a/pkg/providers/vsphere/testdata/expected_results_bottlerocket_boot_settings_config_cp.yaml b/pkg/providers/vsphere/testdata/expected_results_bottlerocket_boot_settings_config_cp.yaml index 0f953e00da4e..dfa5e56821f0 100644 --- a/pkg/providers/vsphere/testdata/expected_results_bottlerocket_boot_settings_config_cp.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_bottlerocket_boot_settings_config_cp.yaml @@ -502,9 +502,9 @@ metadata: namespace: eksa-system labels: clusterctl.cluster.x-k8s.io/move: "true" -stringData: - username: "vsphere_username" - password: "vsphere_password" +data: + username: dnNwaGVyZV91c2VybmFtZQ== + password: dnNwaGVyZV9wYXNzd29yZA== --- apiVersion: v1 kind: Secret @@ -532,9 +532,9 @@ stringData: metadata: name: cloud-provider-vsphere-credentials namespace: kube-system - stringData: - vsphere_server.password: "vsphere_password" - vsphere_server.username: "vsphere_username" + data: + vsphere_server.password: dnNwaGVyZV9wYXNzd29yZA== + vsphere_server.username: dnNwaGVyZV91c2VybmFtZQ== type: Opaque type: addons.cluster.x-k8s.io/resource-set --- diff --git a/pkg/providers/vsphere/testdata/expected_results_bottlerocket_cert_bundles_config_cp.yaml b/pkg/providers/vsphere/testdata/expected_results_bottlerocket_cert_bundles_config_cp.yaml index bf5d21c78083..ebf6ea58d1ab 100644 --- a/pkg/providers/vsphere/testdata/expected_results_bottlerocket_cert_bundles_config_cp.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_bottlerocket_cert_bundles_config_cp.yaml @@ -530,9 +530,9 @@ metadata: namespace: eksa-system labels: clusterctl.cluster.x-k8s.io/move: "true" -stringData: - username: "vsphere_username" - password: "vsphere_password" +data: + username: dnNwaGVyZV91c2VybmFtZQ== + password: dnNwaGVyZV9wYXNzd29yZA== --- apiVersion: v1 kind: Secret @@ -560,9 +560,9 @@ stringData: metadata: name: cloud-provider-vsphere-credentials namespace: kube-system - stringData: - vsphere_server.password: "vsphere_password" - vsphere_server.username: "vsphere_username" + data: + vsphere_server.password: dnNwaGVyZV9wYXNzd29yZA== + vsphere_server.username: dnNwaGVyZV91c2VybmFtZQ== 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 49cb5fb08112..5a1fd4e2ae27 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 @@ -474,9 +474,9 @@ metadata: namespace: eksa-system labels: clusterctl.cluster.x-k8s.io/move: "true" -stringData: - username: "vsphere_username" - password: "vsphere_password" +data: + username: dnNwaGVyZV91c2VybmFtZQ== + password: dnNwaGVyZV9wYXNzd29yZA== --- apiVersion: v1 kind: Secret @@ -504,9 +504,9 @@ stringData: metadata: name: cloud-provider-vsphere-credentials namespace: kube-system - stringData: - vsphere_server.password: "vsphere_password" - vsphere_server.username: "vsphere_username" + data: + vsphere_server.password: dnNwaGVyZV9wYXNzd29yZA== + vsphere_server.username: dnNwaGVyZV91c2VybmFtZQ== type: Opaque type: addons.cluster.x-k8s.io/resource-set --- diff --git a/pkg/providers/vsphere/testdata/expected_results_bottlerocket_kernel_config_cp.yaml b/pkg/providers/vsphere/testdata/expected_results_bottlerocket_kernel_config_cp.yaml index d661923d68d9..6c74802664dd 100644 --- a/pkg/providers/vsphere/testdata/expected_results_bottlerocket_kernel_config_cp.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_bottlerocket_kernel_config_cp.yaml @@ -481,9 +481,9 @@ metadata: namespace: eksa-system labels: clusterctl.cluster.x-k8s.io/move: "true" -stringData: - username: "vsphere_username" - password: "vsphere_password" +data: + username: dnNwaGVyZV91c2VybmFtZQ== + password: dnNwaGVyZV9wYXNzd29yZA== --- apiVersion: v1 kind: Secret @@ -511,9 +511,9 @@ stringData: metadata: name: cloud-provider-vsphere-credentials namespace: kube-system - stringData: - vsphere_server.password: "vsphere_password" - vsphere_server.username: "vsphere_username" + data: + vsphere_server.password: dnNwaGVyZV9wYXNzd29yZA== + vsphere_server.username: dnNwaGVyZV91c2VybmFtZQ== 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 605e23f9a9d0..360c7f642635 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 @@ -473,9 +473,9 @@ metadata: namespace: eksa-system labels: clusterctl.cluster.x-k8s.io/move: "true" -stringData: - username: "vsphere_username" - password: "vsphere_password" +data: + username: dnNwaGVyZV91c2VybmFtZQ== + password: dnNwaGVyZV9wYXNzd29yZA== --- apiVersion: v1 kind: Secret @@ -503,9 +503,9 @@ stringData: metadata: name: cloud-provider-vsphere-credentials namespace: kube-system - stringData: - vsphere_server.password: "vsphere_password" - vsphere_server.username: "vsphere_username" + data: + vsphere_server.password: dnNwaGVyZV9wYXNzd29yZA== + vsphere_server.username: dnNwaGVyZV91c2VybmFtZQ== type: Opaque type: addons.cluster.x-k8s.io/resource-set --- diff --git a/pkg/providers/vsphere/testdata/expected_results_bottlerocket_mirror_config_with_auth_cp.yaml b/pkg/providers/vsphere/testdata/expected_results_bottlerocket_mirror_config_with_auth_cp.yaml index ab55a262c2a1..163ca21818e5 100644 --- a/pkg/providers/vsphere/testdata/expected_results_bottlerocket_mirror_config_with_auth_cp.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_bottlerocket_mirror_config_with_auth_cp.yaml @@ -527,9 +527,9 @@ metadata: namespace: eksa-system labels: clusterctl.cluster.x-k8s.io/move: "true" -stringData: - username: "vsphere_username" - password: "vsphere_password" +data: + username: dnNwaGVyZV91c2VybmFtZQ== + password: dnNwaGVyZV9wYXNzd29yZA== --- apiVersion: v1 kind: Secret @@ -538,9 +538,9 @@ metadata: namespace: eksa-system labels: clusterctl.cluster.x-k8s.io/move: "true" -stringData: - username: "username" - password: "password" +data: + username: dXNlcm5hbWU= + password: cGFzc3dvcmQ= --- apiVersion: v1 kind: Secret @@ -568,9 +568,9 @@ stringData: metadata: name: cloud-provider-vsphere-credentials namespace: kube-system - stringData: - vsphere_server.password: "vsphere_password" - vsphere_server.username: "vsphere_username" + data: + vsphere_server.password: dnNwaGVyZV9wYXNzd29yZA== + vsphere_server.username: dnNwaGVyZV91c2VybmFtZQ== 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 7e5e6bda6ec7..a8b4864aa5c3 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 @@ -527,9 +527,9 @@ metadata: namespace: eksa-system labels: clusterctl.cluster.x-k8s.io/move: "true" -stringData: - username: "vsphere_username" - password: "vsphere_password" +data: + username: dnNwaGVyZV91c2VybmFtZQ== + password: dnNwaGVyZV9wYXNzd29yZA== --- apiVersion: v1 kind: Secret @@ -557,9 +557,9 @@ stringData: metadata: name: cloud-provider-vsphere-credentials namespace: kube-system - stringData: - vsphere_server.password: "vsphere_password" - vsphere_server.username: "vsphere_username" + data: + vsphere_server.password: dnNwaGVyZV9wYXNzd29yZA== + vsphere_server.username: dnNwaGVyZV91c2VybmFtZQ== type: Opaque type: addons.cluster.x-k8s.io/resource-set --- diff --git a/pkg/providers/vsphere/testdata/expected_results_bottlerocket_ntp_config_cp.yaml b/pkg/providers/vsphere/testdata/expected_results_bottlerocket_ntp_config_cp.yaml index 9e63ac1e9bdc..1408276c60f1 100755 --- a/pkg/providers/vsphere/testdata/expected_results_bottlerocket_ntp_config_cp.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_bottlerocket_ntp_config_cp.yaml @@ -479,9 +479,9 @@ metadata: namespace: eksa-system labels: clusterctl.cluster.x-k8s.io/move: "true" -stringData: - username: "vsphere_username" - password: "vsphere_password" +data: + username: dnNwaGVyZV91c2VybmFtZQ== + password: dnNwaGVyZV9wYXNzd29yZA== --- apiVersion: v1 kind: Secret @@ -509,9 +509,9 @@ stringData: metadata: name: cloud-provider-vsphere-credentials namespace: kube-system - stringData: - vsphere_server.password: "vsphere_password" - vsphere_server.username: "vsphere_username" + data: + vsphere_server.password: dnNwaGVyZV9wYXNzd29yZA== + vsphere_server.username: dnNwaGVyZV91c2VybmFtZQ== type: Opaque type: addons.cluster.x-k8s.io/resource-set --- diff --git a/pkg/providers/vsphere/testdata/expected_results_bottlerocket_settings_config_cp.yaml b/pkg/providers/vsphere/testdata/expected_results_bottlerocket_settings_config_cp.yaml index de36a85cca25..a5626e55486b 100644 --- a/pkg/providers/vsphere/testdata/expected_results_bottlerocket_settings_config_cp.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_bottlerocket_settings_config_cp.yaml @@ -485,9 +485,9 @@ metadata: namespace: eksa-system labels: clusterctl.cluster.x-k8s.io/move: "true" -stringData: - username: "vsphere_username" - password: "vsphere_password" +data: + username: dnNwaGVyZV91c2VybmFtZQ== + password: dnNwaGVyZV9wYXNzd29yZA== --- apiVersion: v1 kind: Secret @@ -515,9 +515,9 @@ stringData: metadata: name: cloud-provider-vsphere-credentials namespace: kube-system - stringData: - vsphere_server.password: "vsphere_password" - vsphere_server.username: "vsphere_username" + data: + vsphere_server.password: dnNwaGVyZV9wYXNzd29yZA== + vsphere_server.username: dnNwaGVyZV91c2VybmFtZQ== 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 bafca1c04e6f..497fd33e2d5b 100644 --- a/pkg/providers/vsphere/testdata/expected_results_custom_resolv_conf.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_custom_resolv_conf.yaml @@ -450,9 +450,9 @@ metadata: namespace: eksa-system labels: clusterctl.cluster.x-k8s.io/move: "true" -stringData: - username: "vsphere_username" - password: "vsphere_password" +data: + username: dnNwaGVyZV91c2VybmFtZQ== + password: dnNwaGVyZV9wYXNzd29yZA== --- apiVersion: v1 kind: Secret @@ -480,9 +480,9 @@ stringData: metadata: name: cloud-provider-vsphere-credentials namespace: kube-system - stringData: - vsphere_server.password: "vsphere_password" - vsphere_server.username: "vsphere_username" + data: + vsphere_server.password: dnNwaGVyZV9wYXNzd29yZA== + vsphere_server.username: dnNwaGVyZV91c2VybmFtZQ== type: Opaque type: addons.cluster.x-k8s.io/resource-set --- diff --git a/pkg/providers/vsphere/testdata/expected_results_diff_template_cp.yaml b/pkg/providers/vsphere/testdata/expected_results_diff_template_cp.yaml index bc198cafaf31..e2864e41b63e 100644 --- a/pkg/providers/vsphere/testdata/expected_results_diff_template_cp.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_diff_template_cp.yaml @@ -448,9 +448,9 @@ metadata: namespace: eksa-system labels: clusterctl.cluster.x-k8s.io/move: "true" -stringData: - username: "vsphere_username" - password: "vsphere_password" +data: + username: dnNwaGVyZV91c2VybmFtZQ== + password: dnNwaGVyZV9wYXNzd29yZA== --- apiVersion: v1 kind: Secret @@ -478,9 +478,9 @@ stringData: metadata: name: cloud-provider-vsphere-credentials namespace: kube-system - stringData: - vsphere_server.password: "vsphere_password" - vsphere_server.username: "vsphere_username" + data: + vsphere_server.password: dnNwaGVyZV9wYXNzd29yZA== + vsphere_server.username: dnNwaGVyZV91c2VybmFtZQ== 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 d5754a0208e6..4684b48be891 100644 --- a/pkg/providers/vsphere/testdata/expected_results_full_oidc_cp.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_full_oidc_cp.yaml @@ -394,9 +394,9 @@ metadata: namespace: eksa-system labels: clusterctl.cluster.x-k8s.io/move: "true" -stringData: - username: "vsphere_username" - password: "vsphere_password" +data: + username: dnNwaGVyZV91c2VybmFtZQ== + password: dnNwaGVyZV9wYXNzd29yZA== --- apiVersion: v1 kind: Secret @@ -424,9 +424,9 @@ stringData: metadata: name: cloud-provider-vsphere-credentials namespace: kube-system - stringData: - vsphere_server.password: "vsphere_password" - vsphere_server.username: "vsphere_username" + data: + vsphere_server.password: dnNwaGVyZV9wYXNzd29yZA== + vsphere_server.username: dnNwaGVyZV91c2VybmFtZQ== 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 1f75a2701d55..198e4e9109a7 100644 --- a/pkg/providers/vsphere/testdata/expected_results_main_121_cp.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_main_121_cp.yaml @@ -448,9 +448,9 @@ metadata: namespace: eksa-system labels: clusterctl.cluster.x-k8s.io/move: "true" -stringData: - username: "vsphere_username" - password: "vsphere_password" +data: + username: dnNwaGVyZV91c2VybmFtZQ== + password: dnNwaGVyZV9wYXNzd29yZA== --- apiVersion: v1 kind: Secret @@ -478,9 +478,9 @@ stringData: metadata: name: cloud-provider-vsphere-credentials namespace: kube-system - stringData: - vsphere_server.password: "vsphere_password" - vsphere_server.username: "vsphere_username" + data: + vsphere_server.password: dnNwaGVyZV9wYXNzd29yZA== + vsphere_server.username: dnNwaGVyZV91c2VybmFtZQ== 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 fc315ea2a60d..e9ab42e58573 100644 --- a/pkg/providers/vsphere/testdata/expected_results_main_cp.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_main_cp.yaml @@ -448,9 +448,9 @@ metadata: namespace: eksa-system labels: clusterctl.cluster.x-k8s.io/move: "true" -stringData: - username: "vsphere_username" - password: "vsphere_password" +data: + username: dnNwaGVyZV91c2VybmFtZQ== + password: dnNwaGVyZV9wYXNzd29yZA== --- apiVersion: v1 kind: Secret @@ -478,9 +478,9 @@ stringData: metadata: name: cloud-provider-vsphere-credentials namespace: kube-system - stringData: - vsphere_server.password: "vsphere_password" - vsphere_server.username: "vsphere_username" + data: + vsphere_server.password: dnNwaGVyZV9wYXNzd29yZA== + vsphere_server.username: dnNwaGVyZV91c2VybmFtZQ== 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 9eb52dc95e2f..628ed024b0b7 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 @@ -448,9 +448,9 @@ metadata: namespace: eksa-system labels: clusterctl.cluster.x-k8s.io/move: "true" -stringData: - username: "vsphere_username" - password: "vsphere_password" +data: + username: dnNwaGVyZV91c2VybmFtZQ== + password: dnNwaGVyZV9wYXNzd29yZA== --- apiVersion: v1 kind: Secret @@ -478,9 +478,9 @@ stringData: metadata: name: cloud-provider-vsphere-credentials namespace: kube-system - stringData: - vsphere_server.password: "EksavSphereCPPassword" - vsphere_server.username: "EksavSphereCPUsername" + data: + vsphere_server.password: RWtzYXZTcGhlcmVDUFBhc3N3b3Jk + vsphere_server.username: RWtzYXZTcGhlcmVDUFVzZXJuYW1l 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 622cbb64ee23..dd3bc1a3959f 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 @@ -448,9 +448,9 @@ metadata: namespace: eksa-system labels: clusterctl.cluster.x-k8s.io/move: "true" -stringData: - username: "vsphere_username" - password: "vsphere_password" +data: + username: dnNwaGVyZV91c2VybmFtZQ== + password: dnNwaGVyZV9wYXNzd29yZA== --- apiVersion: v1 kind: Secret @@ -478,9 +478,9 @@ stringData: metadata: name: cloud-provider-vsphere-credentials namespace: kube-system - stringData: - vsphere_server.password: "vsphere_password" - vsphere_server.username: "vsphere_username" + data: + vsphere_server.password: dnNwaGVyZV9wYXNzd29yZA== + vsphere_server.username: dnNwaGVyZV91c2VybmFtZQ== 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 a4183598e5f7..0d1e6f40e802 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 @@ -450,9 +450,9 @@ metadata: namespace: eksa-system labels: clusterctl.cluster.x-k8s.io/move: "true" -stringData: - username: "vsphere_username" - password: "vsphere_password" +data: + username: dnNwaGVyZV91c2VybmFtZQ== + password: dnNwaGVyZV9wYXNzd29yZA== --- apiVersion: v1 kind: Secret @@ -480,9 +480,9 @@ stringData: metadata: name: cloud-provider-vsphere-credentials namespace: kube-system - stringData: - vsphere_server.password: "vsphere_password" - vsphere_server.username: "vsphere_username" + data: + vsphere_server.password: dnNwaGVyZV9wYXNzd29yZA== + vsphere_server.username: dnNwaGVyZV91c2VybmFtZQ== 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 b1b55b73a4f5..60b50fff1225 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 @@ -468,9 +468,9 @@ metadata: namespace: eksa-system labels: clusterctl.cluster.x-k8s.io/move: "true" -stringData: - username: "vsphere_username" - password: "vsphere_password" +data: + username: dnNwaGVyZV91c2VybmFtZQ== + password: dnNwaGVyZV9wYXNzd29yZA== --- apiVersion: v1 kind: Secret @@ -498,9 +498,9 @@ stringData: metadata: name: cloud-provider-vsphere-credentials namespace: kube-system - stringData: - vsphere_server.password: "vsphere_password" - vsphere_server.username: "vsphere_username" + data: + vsphere_server.password: dnNwaGVyZV9wYXNzd29yZA== + vsphere_server.username: dnNwaGVyZV91c2VybmFtZQ== 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 d3da83b23cb6..4e2f9571b2ea 100644 --- a/pkg/providers/vsphere/testdata/expected_results_minimal_cp.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_minimal_cp.yaml @@ -386,9 +386,9 @@ metadata: namespace: eksa-system labels: clusterctl.cluster.x-k8s.io/move: "true" -stringData: - username: "vsphere_username" - password: "vsphere_password" +data: + username: dnNwaGVyZV91c2VybmFtZQ== + password: dnNwaGVyZV9wYXNzd29yZA== --- apiVersion: v1 kind: Secret @@ -416,9 +416,9 @@ stringData: metadata: name: cloud-provider-vsphere-credentials namespace: kube-system - stringData: - vsphere_server.password: "vsphere_password" - vsphere_server.username: "vsphere_username" + data: + vsphere_server.password: dnNwaGVyZV9wYXNzd29yZA== + vsphere_server.username: dnNwaGVyZV91c2VybmFtZQ== 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 ca6f724ad9f2..ed79f743399e 100644 --- a/pkg/providers/vsphere/testdata/expected_results_minimal_oidc_cp.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_minimal_oidc_cp.yaml @@ -389,9 +389,9 @@ metadata: namespace: eksa-system labels: clusterctl.cluster.x-k8s.io/move: "true" -stringData: - username: "vsphere_username" - password: "vsphere_password" +data: + username: dnNwaGVyZV91c2VybmFtZQ== + password: dnNwaGVyZV9wYXNzd29yZA== --- apiVersion: v1 kind: Secret @@ -419,9 +419,9 @@ stringData: metadata: name: cloud-provider-vsphere-credentials namespace: kube-system - stringData: - vsphere_server.password: "vsphere_password" - vsphere_server.username: "vsphere_username" + data: + vsphere_server.password: dnNwaGVyZV9wYXNzd29yZA== + vsphere_server.username: dnNwaGVyZV91c2VybmFtZQ== 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 f2d1d4f71ed8..23b9783a894c 100644 --- a/pkg/providers/vsphere/testdata/expected_results_mirror_config_cp.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_mirror_config_cp.yaml @@ -459,9 +459,9 @@ metadata: namespace: eksa-system labels: clusterctl.cluster.x-k8s.io/move: "true" -stringData: - username: "vsphere_username" - password: "vsphere_password" +data: + username: dnNwaGVyZV91c2VybmFtZQ== + password: dnNwaGVyZV9wYXNzd29yZA== --- apiVersion: v1 kind: Secret @@ -489,9 +489,9 @@ stringData: metadata: name: cloud-provider-vsphere-credentials namespace: kube-system - stringData: - vsphere_server.password: "vsphere_password" - vsphere_server.username: "vsphere_username" + data: + vsphere_server.password: dnNwaGVyZV9wYXNzd29yZA== + vsphere_server.username: dnNwaGVyZV91c2VybmFtZQ== 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 7db9533cb503..f19b74f49db9 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 @@ -501,9 +501,9 @@ metadata: namespace: eksa-system labels: clusterctl.cluster.x-k8s.io/move: "true" -stringData: - username: "vsphere_username" - password: "vsphere_password" +data: + username: dnNwaGVyZV91c2VybmFtZQ== + password: dnNwaGVyZV9wYXNzd29yZA== --- apiVersion: v1 kind: Secret @@ -531,9 +531,9 @@ stringData: metadata: name: cloud-provider-vsphere-credentials namespace: kube-system - stringData: - vsphere_server.password: "vsphere_password" - vsphere_server.username: "vsphere_username" + data: + vsphere_server.password: dnNwaGVyZV9wYXNzd29yZA== + vsphere_server.username: dnNwaGVyZV91c2VybmFtZQ== type: Opaque type: addons.cluster.x-k8s.io/resource-set --- diff --git a/pkg/providers/vsphere/testdata/expected_results_mirror_with_auth_config_cp.yaml b/pkg/providers/vsphere/testdata/expected_results_mirror_with_auth_config_cp.yaml index 4f47429836de..fed86bab076d 100644 --- a/pkg/providers/vsphere/testdata/expected_results_mirror_with_auth_config_cp.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_mirror_with_auth_config_cp.yaml @@ -502,9 +502,9 @@ metadata: namespace: eksa-system labels: clusterctl.cluster.x-k8s.io/move: "true" -stringData: - username: "vsphere_username" - password: "vsphere_password" +data: + username: dnNwaGVyZV91c2VybmFtZQ== + password: dnNwaGVyZV9wYXNzd29yZA== --- apiVersion: v1 kind: Secret @@ -513,9 +513,9 @@ metadata: namespace: eksa-system labels: clusterctl.cluster.x-k8s.io/move: "true" -stringData: - username: "username" - password: "password" +data: + username: dXNlcm5hbWU= + password: cGFzc3dvcmQ= --- apiVersion: v1 kind: Secret @@ -543,9 +543,9 @@ stringData: metadata: name: cloud-provider-vsphere-credentials namespace: kube-system - stringData: - vsphere_server.password: "vsphere_password" - vsphere_server.username: "vsphere_username" + data: + vsphere_server.password: dnNwaGVyZV9wYXNzd29yZA== + vsphere_server.username: dnNwaGVyZV91c2VybmFtZQ== 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 b088b2c5b6ff..e270edd997a0 100644 --- a/pkg/providers/vsphere/testdata/expected_results_pod_iam_config.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_pod_iam_config.yaml @@ -449,9 +449,9 @@ metadata: namespace: eksa-system labels: clusterctl.cluster.x-k8s.io/move: "true" -stringData: - username: "vsphere_username" - password: "vsphere_password" +data: + username: dnNwaGVyZV91c2VybmFtZQ== + password: dnNwaGVyZV9wYXNzd29yZA== --- apiVersion: v1 kind: Secret @@ -479,9 +479,9 @@ stringData: metadata: name: cloud-provider-vsphere-credentials namespace: kube-system - stringData: - vsphere_server.password: "vsphere_password" - vsphere_server.username: "vsphere_username" + data: + vsphere_server.password: dnNwaGVyZV9wYXNzd29yZA== + vsphere_server.username: dnNwaGVyZV91c2VybmFtZQ== type: Opaque type: addons.cluster.x-k8s.io/resource-set --- diff --git a/pkg/providers/vsphere/testdata/expected_results_ubuntu_etcd_encryption_cp.yaml b/pkg/providers/vsphere/testdata/expected_results_ubuntu_etcd_encryption_cp.yaml index 81bd4d0f74b4..83eba013d6f8 100644 --- a/pkg/providers/vsphere/testdata/expected_results_ubuntu_etcd_encryption_cp.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_ubuntu_etcd_encryption_cp.yaml @@ -498,9 +498,9 @@ metadata: namespace: eksa-system labels: clusterctl.cluster.x-k8s.io/move: "true" -stringData: - username: "vsphere_username" - password: "vsphere_password" +data: + username: dnNwaGVyZV91c2VybmFtZQ== + password: dnNwaGVyZV9wYXNzd29yZA== --- apiVersion: v1 kind: Secret @@ -528,9 +528,9 @@ stringData: metadata: name: cloud-provider-vsphere-credentials namespace: kube-system - stringData: - vsphere_server.password: "vsphere_password" - vsphere_server.username: "vsphere_username" + data: + vsphere_server.password: dnNwaGVyZV9wYXNzd29yZA== + vsphere_server.username: dnNwaGVyZV91c2VybmFtZQ== type: Opaque type: addons.cluster.x-k8s.io/resource-set --- diff --git a/pkg/providers/vsphere/testdata/expected_results_ubuntu_etcd_encryption_cp_1_29.yaml b/pkg/providers/vsphere/testdata/expected_results_ubuntu_etcd_encryption_cp_1_29.yaml index dba6a5f93759..dd7dc930b2c5 100644 --- a/pkg/providers/vsphere/testdata/expected_results_ubuntu_etcd_encryption_cp_1_29.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_ubuntu_etcd_encryption_cp_1_29.yaml @@ -530,9 +530,9 @@ metadata: namespace: eksa-system labels: clusterctl.cluster.x-k8s.io/move: "true" -stringData: - username: "vsphere_username" - password: "vsphere_password" +data: + username: dnNwaGVyZV91c2VybmFtZQ== + password: dnNwaGVyZV9wYXNzd29yZA== --- apiVersion: v1 kind: Secret @@ -560,9 +560,9 @@ stringData: metadata: name: cloud-provider-vsphere-credentials namespace: kube-system - stringData: - vsphere_server.password: "vsphere_password" - vsphere_server.username: "vsphere_username" + data: + vsphere_server.password: dnNwaGVyZV9wYXNzd29yZA== + vsphere_server.username: dnNwaGVyZV91c2VybmFtZQ== type: Opaque type: addons.cluster.x-k8s.io/resource-set --- diff --git a/pkg/providers/vsphere/testdata/expected_results_ubuntu_ntp_config_cp.yaml b/pkg/providers/vsphere/testdata/expected_results_ubuntu_ntp_config_cp.yaml index 6ac60d074e82..52c88f4fefa3 100644 --- a/pkg/providers/vsphere/testdata/expected_results_ubuntu_ntp_config_cp.yaml +++ b/pkg/providers/vsphere/testdata/expected_results_ubuntu_ntp_config_cp.yaml @@ -460,9 +460,9 @@ metadata: namespace: eksa-system labels: clusterctl.cluster.x-k8s.io/move: "true" -stringData: - username: "vsphere_username" - password: "vsphere_password" +data: + username: dnNwaGVyZV91c2VybmFtZQ== + password: dnNwaGVyZV9wYXNzd29yZA== --- apiVersion: v1 kind: Secret @@ -490,9 +490,9 @@ stringData: metadata: name: cloud-provider-vsphere-credentials namespace: kube-system - stringData: - vsphere_server.password: "vsphere_password" - vsphere_server.username: "vsphere_username" + data: + vsphere_server.password: dnNwaGVyZV9wYXNzd29yZA== + vsphere_server.username: dnNwaGVyZV91c2VybmFtZQ== type: Opaque type: addons.cluster.x-k8s.io/resource-set ---