Skip to content
This repository was archived by the owner on Sep 9, 2026. It is now read-only.

OSAC-1550: rename sshKey to sshPublicKey in AAP template parameters #744

Merged
openshift-merge-bot merged 1 commit into from
Jun 25, 2026
Merged

OSAC-1550: rename sshKey to sshPublicKey in AAP template parameters #744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/controllers/baremetalinstance/baremetalinstance_reconciler_function.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ func (t *task) mutateBMI(ctx context.Context, object *bmfov1alpha1.BareMetalInst

params := map[string]string{}
if t.bareMetalInstance.GetSpec().HasSshPublicKey() {
params["sshKey"] = t.bareMetalInstance.GetSpec().GetSshPublicKey()
params["sshPublicKey"] = t.bareMetalInstance.GetSpec().GetSshPublicKey()
}
if t.userDataSecretName != "" {
params["userDataSecret"] = t.userDataSecretName
Expand Down
14 changes: 7 additions & 7 deletions internal/controllers/baremetalinstance/baremetalinstance_reconciler_function_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ var _ = Describe("mutateBMI", func() {
Expect(obj.Spec.RunStrategy).To(Equal(bmfov1alpha1.RunStrategyUnspecified))
})

It("should include sshKey and userDataSecret in templateParameters", func() {
It("should include sshPublicKey and userDataSecret in templateParameters", func() {
catalogItemsClient := defaultFakeCatalogItemsClient()

t := &task{
Expand All @@ -221,13 +221,13 @@ var _ = Describe("mutateBMI", func() {

var params map[string]string
Expect(json.Unmarshal([]byte(obj.Spec.TemplateParameters), &params)).To(Succeed())
Expect(params["sshKey"]).To(Equal("ssh-ed25519 AAAA... test@example.com"))
Expect(params["sshPublicKey"]).To(Equal("ssh-ed25519 AAAA... test@example.com"))
Expect(params["userDataSecret"]).To(Equal("bmi-test-user-data"))
Comment thread
coderabbitai[bot] marked this conversation as resolved.
})

It("should include only sshKey when no user data", func() {
It("should include only sshPublicKey when no user data", func() {
catalogItemsClient := defaultFakeCatalogItemsClient()
sshKey := "ssh-ed25519 AAAA... test@example.com"
sshPublicKey := "ssh-ed25519 AAAA... test@example.com"

t := &task{
r: &function{
Expand All @@ -238,7 +238,7 @@ var _ = Describe("mutateBMI", func() {
Id: "bmi-test",
Spec: privatev1.BareMetalInstanceSpec_builder{
CatalogItem: "catalog-1",
SshPublicKey: new(sshKey),
SshPublicKey: new(sshPublicKey),
}.Build(),
}.Build(),
}
Expand All @@ -249,8 +249,8 @@ var _ = Describe("mutateBMI", func() {

var params map[string]string
Expect(json.Unmarshal([]byte(obj.Spec.TemplateParameters), &params)).To(Succeed())
Expect(params).To(HaveKey("sshKey"))
Expect(params["sshKey"]).To(Equal(sshKey))
Expect(params).To(HaveKey("sshPublicKey"))
Expect(params["sshPublicKey"]).To(Equal(sshPublicKey))
Expect(params).ToNot(HaveKey("userDataSecret"))
})

Expand Down
Loading