@@ -17,10 +17,10 @@ import (
17
17
"github.com/edgelesssys/constellation/v2/internal/cloud/metadata"
18
18
"github.com/edgelesssys/constellation/v2/internal/constants"
19
19
"github.com/edgelesssys/constellation/v2/internal/role"
20
- "github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
21
- "github.com/gophercloud/gophercloud/openstack/networking/v2/networks"
22
- "github.com/gophercloud/gophercloud/openstack/networking/v2/subnets"
23
- "github.com/gophercloud/utils/openstack/clientconfig"
20
+ "github.com/gophercloud/gophercloud/v2/ openstack/compute/v2/servers"
21
+ "github.com/gophercloud/gophercloud/v2/ openstack/networking/v2/networks"
22
+ "github.com/gophercloud/gophercloud/v2/ openstack/networking/v2/subnets"
23
+ "github.com/gophercloud/utils/v2/ openstack/clientconfig"
24
24
)
25
25
26
26
const (
@@ -65,13 +65,13 @@ func New(ctx context.Context) (*MetadataClient, error) {
65
65
},
66
66
}
67
67
68
- serversClient , err := clientconfig .NewServiceClient ("compute" , clientOpts )
68
+ serversClient , err := clientconfig .NewServiceClient (ctx , "compute" , clientOpts )
69
69
if err != nil {
70
70
return nil , fmt .Errorf ("creating compute client: %w" , err )
71
71
}
72
72
serversClient .Microversion = microversion
73
73
74
- networksClient , err := clientconfig .NewServiceClient ("network" , clientOpts )
74
+ networksClient , err := clientconfig .NewServiceClient (ctx , "network" , clientOpts )
75
75
if err != nil {
76
76
return nil , fmt .Errorf ("creating network client: %w" , err )
77
77
}
@@ -122,12 +122,12 @@ func (c *MetadataClient) List(ctx context.Context) ([]metadata.InstanceMetadata,
122
122
123
123
uidTag := fmt .Sprintf ("constellation-uid-%s" , uid )
124
124
125
- subnet , err := c .getSubnetCIDR (uidTag )
125
+ subnet , err := c .getSubnetCIDR (ctx , uidTag )
126
126
if err != nil {
127
127
return nil , err
128
128
}
129
129
130
- srvs , err := c .getServers (uidTag )
130
+ srvs , err := c .getServers (ctx , uidTag )
131
131
if err != nil {
132
132
return nil , err
133
133
}
@@ -240,9 +240,9 @@ func (c *MetadataClient) GetLoadBalancerEndpoint(ctx context.Context) (host, por
240
240
return host , strconv .FormatInt (constants .KubernetesPort , 10 ), nil
241
241
}
242
242
243
- func (c * MetadataClient ) getSubnetCIDR (uidTag string ) (netip.Prefix , error ) {
243
+ func (c * MetadataClient ) getSubnetCIDR (ctx context. Context , uidTag string ) (netip.Prefix , error ) {
244
244
listNetworksOpts := networks.ListOpts {Tags : uidTag }
245
- networksPage , err := c .api .ListNetworks (listNetworksOpts ).AllPages ()
245
+ networksPage , err := c .api .ListNetworks (listNetworksOpts ).AllPages (ctx )
246
246
if err != nil {
247
247
return netip.Prefix {}, fmt .Errorf ("listing networks: %w" , err )
248
248
}
@@ -255,7 +255,7 @@ func (c *MetadataClient) getSubnetCIDR(uidTag string) (netip.Prefix, error) {
255
255
}
256
256
257
257
listSubnetsOpts := subnets.ListOpts {Tags : uidTag }
258
- subnetsPage , err := c .api .ListSubnets (listSubnetsOpts ).AllPages ()
258
+ subnetsPage , err := c .api .ListSubnets (listSubnetsOpts ).AllPages (ctx )
259
259
if err != nil {
260
260
return netip.Prefix {}, fmt .Errorf ("listing subnets: %w" , err )
261
261
}
@@ -285,9 +285,9 @@ func (c *MetadataClient) getSubnetCIDR(uidTag string) (netip.Prefix, error) {
285
285
return cidr , nil
286
286
}
287
287
288
- func (c * MetadataClient ) getServers (uidTag string ) ([]servers.Server , error ) {
288
+ func (c * MetadataClient ) getServers (ctx context. Context , uidTag string ) ([]servers.Server , error ) {
289
289
listServersOpts := servers.ListOpts {Tags : uidTag }
290
- serversPage , err := c .api .ListServers (listServersOpts ).AllPages ()
290
+ serversPage , err := c .api .ListServers (listServersOpts ).AllPages (ctx )
291
291
if err != nil {
292
292
return nil , fmt .Errorf ("listing servers: %w" , err )
293
293
}
0 commit comments