Merge pull request #2799 from 2uasimojo/HIVE-3017/trimspace-vsphere-creds

openshift-merge-bot[bot] · web-flow · commit 140ebadd42e6 · 2025-11-27T01:43:25.000Z
HIVE-3017: Trim whitespace from vsphere credentials
diff --git a/pkg/controller/utils/credentials.go b/pkg/controller/utils/credentials.go
@@ -61,8 +61,8 @@ func ValidateCredentialsForClusterDeployment(kubeClient client.Client, cd *hivev
 		}
 
 		return validateVSphereCredentials(cd.Spec.Platform.VSphere.VCenter,
-			string(secret.Data[constants.UsernameSecretKey]),
-			string(secret.Data[constants.PasswordSecretKey]),
+			strings.TrimSpace(string(secret.Data[constants.UsernameSecretKey])),
+			strings.TrimSpace(string(secret.Data[constants.PasswordSecretKey])),
 			rootCAFiles,
 			logger)
 	default:
diff --git a/pkg/creds/vsphere/vsphere.go b/pkg/creds/vsphere/vsphere.go
@@ -2,6 +2,7 @@ package vsphere
 
 import (
 	"os"
+	"strings"
 
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
@@ -26,10 +27,10 @@ func ConfigureCreds(c client.Client, metadata *installertypes.ClusterMetadata) {
 	}
 	if credsSecret := utils.LoadSecretOrDie(c, "CREDS_SECRET_NAME"); credsSecret != nil {
 		var username, password string
-		if username = string(credsSecret.Data[constants.UsernameSecretKey]); username != "" {
+		if username = strings.TrimSpace(string(credsSecret.Data[constants.UsernameSecretKey])); username != "" {
 			os.Setenv(constants.VSphereUsernameEnvVar, username)
 		}
-		if password = string(credsSecret.Data[constants.PasswordSecretKey]); password != "" {
+		if password = strings.TrimSpace(string(credsSecret.Data[constants.PasswordSecretKey])); password != "" {
 			os.Setenv(constants.VSpherePasswordEnvVar, password)
 		}
 		// Snowflake! We need to (re)inject the creds into the metadata.

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ package vsphere`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"os"`
	`5`	`+ "strings"`
`5`	`6`
`6`	`7`	`"sigs.k8s.io/controller-runtime/pkg/client"`
`7`	`8`
`@@ -26,10 +27,10 @@ func ConfigureCreds(c client.Client, metadata *installertypes.ClusterMetadata) {`
`26`	`27`	`}`
`27`	`28`	`if credsSecret := utils.LoadSecretOrDie(c, "CREDS_SECRET_NAME"); credsSecret != nil {`
`28`	`29`	`var username, password string`
`29`		`- if username = string(credsSecret.Data[constants.UsernameSecretKey]); username != "" {`
	`30`	`+ if username = strings.TrimSpace(string(credsSecret.Data[constants.UsernameSecretKey])); username != "" {`
`30`	`31`	`os.Setenv(constants.VSphereUsernameEnvVar, username)`
`31`	`32`	`}`
`32`		`- if password = string(credsSecret.Data[constants.PasswordSecretKey]); password != "" {`
	`33`	`+ if password = strings.TrimSpace(string(credsSecret.Data[constants.PasswordSecretKey])); password != "" {`
`33`	`34`	`os.Setenv(constants.VSpherePasswordEnvVar, password)`
`34`	`35`	`}`
`35`	`36`	`// Snowflake! We need to (re)inject the creds into the metadata.`