aws · eks-distro-bot · Mar 12, 2024 · Mar 11, 2024
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 }}
diff --git 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/...stdata/expected_results_cluster_tinkerbell_bottlerocket_cp_registry_mirror_with_auth.yaml b/...stdata/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"
+data:
+  username: dXNlcm5hbWU=
+  password: cGFzc3dvcmQ=
diff --git a/...tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_registry_mirror_with_auth.yaml b/...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"
+data:
+  username: dXNlcm5hbWU=
+  password: cGFzc3dvcmQ=
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
 ---