Merge pull request #1110 from furkatgofurov7/sure-9775

Use Rancher secret key names for vSphere in secret mapper
rancher · Feb 27, 2025 · 15da041 · 15da041
2 parents 9a38d3c + 47df4d1
commit 15da041
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/internal/sync/secret_mapper_sync.go b/internal/sync/secret_mapper_sync.go
@@ -80,8 +80,8 @@ var (
 			{to: "AZURE_TENANT_ID_B64", from: B64{source: "azurecredentialConfig-tenantId"}},
 		},
 		"vsphere": {
-			{to: "VSPHERE_PASSWORD", from: Raw{source: "vmwarevsphere-password"}},
-			{to: "VSPHERE_USERNAME", from: Raw{source: "vmwarevsphere-username"}},
+			{to: "VSPHERE_PASSWORD", from: Raw{source: "vmwarevspherecredentialConfig-password"}},
+			{to: "VSPHERE_USERNAME", from: Raw{source: "vmwarevspherecredentialConfig-username"}},
 		},
 		"gcp": {
 			{to: "GCP_B64ENCODED_CREDENTIALS", from: B64{source: "googlecredentialConfig-authEncodedJson"}},

diff --git a/internal/sync/secret_mapper_sync_test.go b/internal/sync/secret_mapper_sync_test.go
@@ -399,7 +399,7 @@ var _ = Describe("SecretMapperSync get", func() {
 			g.Expect(conditions.Get(syncer.Source, turtlesv1.RancherCredentialsSecretCondition)).ToNot(BeNil())
 			g.Expect(conditions.IsFalse(syncer.Source, turtlesv1.RancherCredentialsSecretCondition)).To(BeTrue())
 			g.Expect(conditions.GetMessage(syncer.Source, turtlesv1.RancherCredentialsSecretCondition)).To(
-				ContainSubstring("key not found: vmwarevsphere-password, key not found: vmwarevsphere-username"))
+				ContainSubstring("key not found: vmwarevspherecredentialConfig-password, key not found: vmwarevspherecredentialConfig-username"))
 			g.Expect(syncer.Secret.StringData).To(Equal(map[string]string{
 				"VSPHERE_PASSWORD": "",
 				"VSPHERE_USERNAME": "",