Skip to content

Commit c969ce3

Browse files
authored
fix: remove wrong prealloc of nodeAddresses slice (#93)
* fix: remove wrong prealloc of nodeAddresses slice Signed-off-by: Niclas Schad <[email protected]> * add Details(true) to GetServer Signed-off-by: Niclas Schad <[email protected]> * add Details(true) to ListServer Signed-off-by: Niclas Schad <[email protected]> --------- Signed-off-by: Niclas Schad <[email protected]>
1 parent 2133f4f commit c969ce3

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

pkg/ccm/instances.go

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,12 @@ func (i *Instances) InstanceMetadata(ctx context.Context, node *corev1.Node) (*c
101101
return nil, fmt.Errorf("failed to get instance: %w", err)
102102
}
103103

104-
addresses := make([]corev1.NodeAddress, 0, len(server.GetNics()))
105-
for _, v := range server.GetNics() {
106-
if ipv4, ok := v.GetIpv4Ok(); ok {
104+
var addresses []corev1.NodeAddress
105+
if len(server.GetNics()) == 0 {
106+
return nil, fmt.Errorf("server has no network interfaces")
107+
}
108+
for _, nic := range server.GetNics() {
109+
if ipv4, ok := nic.GetIpv4Ok(); ok {
107110
addToNodeAddresses(&addresses,
108111
corev1.NodeAddress{
109112
Address: ipv4,
@@ -112,15 +115,15 @@ func (i *Instances) InstanceMetadata(ctx context.Context, node *corev1.Node) (*c
112115
}
113116

114117
// TODO: where to find IPv6SupportDisabled
115-
if ipv6, ok := v.GetIpv6Ok(); ok {
118+
if ipv6, ok := nic.GetIpv6Ok(); ok {
116119
addToNodeAddresses(&addresses,
117120
corev1.NodeAddress{
118121
Address: ipv6,
119122
Type: corev1.NodeInternalIP,
120123
})
121124
}
122125

123-
if publicIP, ok := v.GetPublicIpOk(); ok {
126+
if publicIP, ok := nic.GetPublicIpOk(); ok {
124127
addToNodeAddresses(&addresses,
125128
corev1.NodeAddress{
126129
Address: publicIP,

pkg/stackit/server.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
)
88

99
func (cl nodeClient) GetServer(ctx context.Context, projectID, region, serverID string) (*iaas.Server, error) {
10-
server, err := cl.client.GetServerExecute(ctx, projectID, region, serverID)
10+
server, err := cl.client.GetServer(ctx, projectID, region, serverID).Details(true).Execute()
1111
if isOpenAPINotFound(err) {
1212
return server, ErrorNotFound
1313
}
@@ -31,7 +31,7 @@ func (cl nodeClient) UpdateServer(ctx context.Context, projectID, region, server
3131
}
3232

3333
func (cl nodeClient) ListServers(ctx context.Context, projectID, region string) (*[]iaas.Server, error) {
34-
resp, err := cl.client.ListServersExecute(ctx, projectID, region)
34+
resp, err := cl.client.ListServers(ctx, projectID, region).Details(true).Execute()
3535
if err != nil {
3636
return nil, err
3737
}

0 commit comments

Comments
 (0)