From 47df4d1d00b09099c4531d150a4f71f90e90f672 Mon Sep 17 00:00:00 2001 From: Furkat Gofurov Date: Thu, 27 Feb 2025 11:21:36 +0200 Subject: [PATCH] Use Rancher secret key names for vSphere in secret mapper Signed-off-by: Furkat Gofurov --- internal/sync/secret_mapper_sync.go | 4 ++-- internal/sync/secret_mapper_sync_test.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/sync/secret_mapper_sync.go b/internal/sync/secret_mapper_sync.go index 5164aece..2f441c7b 100644 --- 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 index f8bb061a..dd577dec 100644 --- 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": "",