From 2045ee27fe12c33119c0e643b8c3e955596d8e61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Deroide?= Date: Wed, 19 Aug 2026 09:51:45 +0200 Subject: [PATCH 1/3] fix compute instance show: display multiple ssh keys --- cmd/compute/instance/instance_show.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/cmd/compute/instance/instance_show.go b/cmd/compute/instance/instance_show.go index b17776577..8d8bd8688 100644 --- a/cmd/compute/instance/instance_show.go +++ b/cmd/compute/instance/instance_show.go @@ -33,7 +33,7 @@ type InstanceShowOutput struct { PublicIPAssignment v3.PublicIPAssignment `json:"public-ip" outputLabel:"Public IP"` IPAddress string `json:"ip_address"` IPv6Address string `json:"ipv6_address" outputLabel:"IPv6 Address"` - SSHKey string `json:"ssh_key"` + SSHKeys []string `json:"ssh_keys"` DiskSize string `json:"disk_size"` State v3.InstanceState `json:"state"` Labels map[string]string `json:"labels"` @@ -115,9 +115,9 @@ func (c *instanceShowCmd) CmdRun(cmd *cobra.Command, _ []string) error { ipV6 = &parsed // only assign pointer if it's a valid IP } - var sshKeyName *string + sshKeys := instance.SSHKeys if instance.SSHKey != nil { - sshKeyName = &instance.SSHKey.Name + sshKeys = append(sshKeys, *instance.SSHKey) } out := InstanceShowOutput{ @@ -137,7 +137,7 @@ func (c *instanceShowCmd) CmdRun(cmd *cobra.Command, _ []string) error { }(), Name: instance.Name, PrivateNetworks: make([]string, 0), - SSHKey: utils.DefaultString(sshKeyName, "-"), + SSHKeys: make([]string, 0), SecurityGroups: make([]string, 0), SecureBoot: *instance.SecurebootEnabled, Tpm: *instance.TpmEnabled, @@ -215,6 +215,10 @@ func (c *instanceShowCmd) CmdRun(cmd *cobra.Command, _ []string) error { } } + for _, k := range instance.SSHKeys { + out.SSHKeys = append(out.SSHKeys, k.Name) + } + if instance.SecurityGroups != nil { for _, sg := range instance.SecurityGroups { resp, err := client.ListSecurityGroups(ctx) From 616aea8d573c10dfcbec4ee341a53ec3f9207f09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Deroide?= Date: Wed, 19 Aug 2026 09:55:00 +0200 Subject: [PATCH 2/3] changelog update --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 86a777164..50044699f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,9 +8,11 @@ ### Bug fixes + - compute: allow instance and instance pool operations to use template IDs omitted from template lists (#888) - compute: honor the selected template's minimum disk size when creating instances and instance pools (#882) - instance create: apply delete protection in the instance's zone, fixing a wrong-zone "Not Found" error when creating protected instances outside the default zone (#879) +- instance show: correctly show multiple ssh keys - sks cluster update: fix oidc config drop (#881) ### ImprovementsāŽ From 5723f42c9515302ed6b4f27d0f05e2242b585de0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Deroide?= Date: Wed, 19 Aug 2026 09:56:32 +0200 Subject: [PATCH 3/3] fix lint --- cmd/compute/instance/instance_show.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/cmd/compute/instance/instance_show.go b/cmd/compute/instance/instance_show.go index 8d8bd8688..b5f0340e7 100644 --- a/cmd/compute/instance/instance_show.go +++ b/cmd/compute/instance/instance_show.go @@ -115,11 +115,6 @@ func (c *instanceShowCmd) CmdRun(cmd *cobra.Command, _ []string) error { ipV6 = &parsed // only assign pointer if it's a valid IP } - sshKeys := instance.SSHKeys - if instance.SSHKey != nil { - sshKeys = append(sshKeys, *instance.SSHKey) - } - out := InstanceShowOutput{ AntiAffinityGroups: make([]string, 0), CreationDate: instance.CreatedAT.String(),