kubernetes
/
autoscaler
mirror of https://github.com/kubernetes/autoscaler.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 3e037ebb4f into a9292351c3

This commit is contained in:
mxmtr 2025-09-18 04:45:44 -07:00 committed by GitHub
parent a9292351c3 3e037ebb4f
commit d2adf70f0e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 301 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
cluster-autoscaler/cloudprovider/ovhcloud/ovh_cloud_manager.go
View File

@ -22,7 +22,7 @@ import (
"errors"
"fmt"
"io"
"io/ioutil"
"slices"
"sync"
"time"
@ -62,7 +62,7 @@ type OvhCloudManager struct {
ClusterID string
ProjectID string
NodePools []sdk.NodePool
NodePoolsPerID map[string]*sdk.NodePool
NodeGroupPerProviderID map[string]*NodeGroup
NodeGroupPerProviderIDLock sync.RWMutex
@ -88,6 +88,10 @@ type Config struct {
OpenStackPassword string `json:"openstack_password"`
OpenStackDomain string `json:"openstack_domain"`
// OpenStack application credentials if authentication type is set to openstack_application.
OpenStackApplicationCredentialID string `json:"openstack_application_credential_id"`
OpenStackApplicationCredentialSecret string `json:"openstack_application_credential_secret"`
// Application credentials if CA is run as API consumer without using OpenStack keystone.
// Tokens can be created here: https://api.ovh.com/createToken/
ApplicationEndpoint string `json:"application_endpoint"`
@ -101,6 +105,9 @@ const (
// OpenStackAuthenticationType to request a keystone token credentials.
OpenStackAuthenticationType = "openstack"
// OpenStackApplicationCredentialsAuthenticationType to request a keystone token credentials using keystone application credentials.
OpenStackApplicationCredentialsAuthenticationType = "openstack_application"
// ApplicationConsumerAuthenticationType to consume an application key credentials.
ApplicationConsumerAuthenticationType = "consumer"
)
@ -130,6 +137,13 @@ func NewManager(configFile io.Reader) (*OvhCloudManager, error) {
return nil, fmt.Errorf("failed to create OpenStack provider: %w", err)
}
client, err = sdk.NewDefaultClientWithToken(openStackProvider.AuthUrl, openStackProvider.Token)
case OpenStackApplicationCredentialsAuthenticationType:
openStackProvider, err = sdk.NewOpenstackApplicationProvider(cfg.OpenStackAuthUrl, cfg.OpenStackApplicationCredentialID, cfg.OpenStackApplicationCredentialSecret, cfg.OpenStackDomain)
if err != nil {
return nil, fmt.Errorf("failed to create OpenStack provider: %w", err)
}
client, err = sdk.NewDefaultClientWithToken(openStackProvider.AuthUrl, openStackProvider.Token)
case ApplicationConsumerAuthenticationType:
client, err = sdk.NewClient(cfg.ApplicationEndpoint, cfg.ApplicationKey, cfg.ApplicationSecret, cfg.ApplicationConsumerKey)
@ -148,7 +162,7 @@ func NewManager(configFile io.Reader) (*OvhCloudManager, error) {
ProjectID: cfg.ProjectID,
ClusterID: cfg.ClusterID,
NodePools: make([]sdk.NodePool, 0),
NodePoolsPerID: make(map[string]*sdk.NodePool),
NodeGroupPerProviderID: make(map[string]*NodeGroup),
NodeGroupPerProviderIDLock: sync.RWMutex{},
@ -232,11 +246,45 @@ func (m *OvhCloudManager) ReAuthenticate() error {
return nil
}
// setNodePoolsState updates nodepool local informations based on given list
// Updates NodePoolsPerID by modifying data so the reference in NodeGroupPerProviderID can access refreshed data
//
// - Updates fields on already referenced nodepool
// - Adds nodepool if not referenced yet
// - Deletes from map if nodepool is not in the given list (it doesn't exist anymore)
func (m *OvhCloudManager) setNodePoolsState(pools []sdk.NodePool) {
m.NodeGroupPerProviderIDLock.Lock()
defer m.NodeGroupPerProviderIDLock.Unlock()
poolIDsToKeep := []string{}
for _, pool := range pools {
poolIDsToKeep = append(poolIDsToKeep, pool.ID)
}
// Update nodepools state
for _, pool := range pools {
poolRef, ok := m.NodePoolsPerID[pool.ID]
if ok {
*poolRef = pool // Update existing value
} else {
poolCopy := pool
m.NodePoolsPerID[pool.ID] = &poolCopy
}
}
// Remove nodepools that doesn't exist anymore
for poolID := range m.NodePoolsPerID {
if !slices.Contains(poolIDsToKeep, poolID) {
delete(m.NodePoolsPerID, poolID)
}
}
}
// readConfig read cloud provider configuration file into a struct
func readConfig(configFile io.Reader) (*Config, error) {
cfg := &Config{}
if configFile != nil {
body, err := ioutil.ReadAll(configFile)
body, err := io.ReadAll(configFile)
if err != nil {
return nil, fmt.Errorf("failed to read content: %w", err)
}
@ -260,8 +308,8 @@ func validatePayload(cfg *Config) error {
return fmt.Errorf("`project_id` not found in config file")
}
if cfg.AuthenticationType != OpenStackAuthenticationType && cfg.AuthenticationType != ApplicationConsumerAuthenticationType {
return fmt.Errorf("`authentication_type` should only be `openstack` or `consumer`")
if cfg.AuthenticationType != OpenStackAuthenticationType && cfg.AuthenticationType != OpenStackApplicationCredentialsAuthenticationType && cfg.AuthenticationType != ApplicationConsumerAuthenticationType {
return fmt.Errorf("`authentication_type` should only be `openstack`, `openstack_application` or `consumer`")
}
if cfg.AuthenticationType == OpenStackAuthenticationType {
@ -282,6 +330,20 @@ func validatePayload(cfg *Config) error {
}
}
if cfg.AuthenticationType == OpenStackApplicationCredentialsAuthenticationType {
if cfg.OpenStackAuthUrl == "" {
return fmt.Errorf("`openstack_auth_url` not found in config file")
}
if cfg.OpenStackApplicationCredentialID == "" {
return fmt.Errorf("`openstack_application_credential_id` not found in config file")
}
if cfg.OpenStackApplicationCredentialSecret == "" {
return fmt.Errorf("`openstack_application_credential_secret` not found in config file")
}
}
if cfg.AuthenticationType == ApplicationConsumerAuthenticationType {
if cfg.ApplicationEndpoint == "" {
return fmt.Errorf("`application_endpoint` not found in config file")

116
cluster-autoscaler/cloudprovider/ovhcloud/ovh_cloud_manager_test.go
View File

@ -78,6 +78,26 @@ func newTestManager(t *testing.T) *OvhCloudManager {
return manager
}
func TestOvhCloudManager_validateConfig(t *testing.T) {
tests := []struct {
name string
configContent string
expectedErrorMessage string
}{
{
name: "New entry",
configContent: "{}",
expectedErrorMessage: "config content validation failed: `cluster_id` not found in config file",
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
_, err := NewManager(bytes.NewBufferString(tt.configContent))
assert.ErrorContains(t, err, tt.expectedErrorMessage)
})
}
}
func TestOvhCloudManager_getFlavorsByName(t *testing.T) {
expectedFlavorsByNameFromAPICall := map[string]sdk.Flavor{
"b2-7": {
@ -290,3 +310,99 @@ func TestOvhCloudManager_cacheConcurrency(t *testing.T) {
manager.getNodeGroupPerProviderID("")
})
}
func TestOvhCloudManager_setNodePoolsState(t *testing.T) {
manager := newTestManager(t)
np1 := sdk.NodePool{ID: "np1", DesiredNodes: 1}
np2 := sdk.NodePool{ID: "np2", DesiredNodes: 2}
np3 := sdk.NodePool{ID: "np3", DesiredNodes: 3}
type fields struct {
NodePoolsPerID map[string]*sdk.NodePool
NodeGroupPerProviderID map[string]*NodeGroup
}
type args struct {
poolsList []sdk.NodePool
nodePoolsPerID map[string]*sdk.NodePool
nodeGroupPerProviderID map[string]*NodeGroup
}
tests := []struct {
name string
fields fields
args args
wantNodePoolsPerID map[string]uint32 // ID => desired nodes
wantNodeGroupPerProviderID map[string]uint32 // ID => desired nodes
}{
{
name: "NodePoolsPerID and NodeGroupPerProviderID empty",
fields: fields{
NodePoolsPerID: map[string]*sdk.NodePool{},
NodeGroupPerProviderID: map[string]*NodeGroup{},
},
args: args{
poolsList: []sdk.NodePool{
np1,
},
nodePoolsPerID: map[string]*sdk.NodePool{},
nodeGroupPerProviderID: map[string]*NodeGroup{},
},
wantNodePoolsPerID: map[string]uint32{"np1": 1},
wantNodeGroupPerProviderID: map[string]uint32{},
},
{
name: "NodePoolsPerID and NodeGroupPerProviderID empty",
fields: fields{
NodePoolsPerID: map[string]*sdk.NodePool{
"np2": &np2,
"np3": &np3,
},
NodeGroupPerProviderID: map[string]*NodeGroup{
"np2-node-id": {NodePool: &np2},
"np3-node-id": {NodePool: &np3},
},
},
args: args{
poolsList: []sdk.NodePool{
{
ID: "np1",
DesiredNodes: 1,
},
{
ID: "np2",
DesiredNodes: 20,
},
},
nodePoolsPerID: map[string]*sdk.NodePool{},
nodeGroupPerProviderID: map[string]*NodeGroup{},
},
wantNodePoolsPerID: map[string]uint32{
"np1": 1, // np1 added
"np2": 20, // np2 updated
// np3 removed
},
wantNodeGroupPerProviderID: map[string]uint32{
"np2-node-id": 20,
"np3-node-id": 3, // Node reference that eventually stays in cache must not crash
},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
manager.NodePoolsPerID = tt.fields.NodePoolsPerID
manager.NodeGroupPerProviderID = tt.fields.NodeGroupPerProviderID
manager.setNodePoolsState(tt.args.poolsList)
assert.Len(t, manager.NodePoolsPerID, len(tt.wantNodePoolsPerID))
for id, desiredNodes := range tt.wantNodePoolsPerID {
assert.Equal(t, desiredNodes, manager.NodePoolsPerID[id].DesiredNodes)
}
assert.Len(t, manager.NodeGroupPerProviderID, len(tt.wantNodeGroupPerProviderID))
for nodeID, desiredNodes := range tt.wantNodeGroupPerProviderID {
assert.Equal(t, desiredNodes, manager.NodeGroupPerProviderID[nodeID].DesiredNodes)
}
})
}
}

10
cluster-autoscaler/cloudprovider/ovhcloud/ovh_cloud_node_group.go
View File

@ -41,7 +41,7 @@ const providerIDPrefix = "openstack:///"
// NodeGroup implements cloudprovider.NodeGroup interface.
type NodeGroup struct {
sdk.NodePool
*sdk.NodePool
Manager *OvhCloudManager
CurrentSize int
@ -294,7 +294,7 @@ func (ng *NodeGroup) Create() (cloudprovider.NodeGroup, error) {
// Forge a node group interface given the API response
return &NodeGroup{
NodePool: *np,
NodePool: np,
Manager: ng.Manager,
CurrentSize: int(ng.DesiredNodes),
}, nil
@ -352,7 +352,11 @@ func (ng *NodeGroup) isGpu() bool {
if err != nil {
// Fallback when we are unable to get the flavor: refer to the only category
// known to be a GPU flavor category
return strings.HasPrefix(ng.Flavor, GPUMachineCategory)
for _, gpuCategoryPrefix := range GPUMachineCategoryPrefixes {
if strings.HasPrefix(ng.Flavor, gpuCategoryPrefix) {
return true
}
}
}
return flavor.GPUs > 0

14
cluster-autoscaler/cloudprovider/ovhcloud/ovh_cloud_node_group_test.go
View File

@ -85,7 +85,7 @@ func newTestNodeGroup(t *testing.T, flavor string) *NodeGroup {
ng := &NodeGroup{
Manager: manager,
NodePool: sdk.NodePool{
NodePool: &sdk.NodePool{
ID: "id",
Name: fmt.Sprintf("pool-%s", flavor),
Flavor: flavor,
@ -522,9 +522,19 @@ func TestOVHCloudNodeGroup_IsGpu(t *testing.T) {
})
t.Run("not found but belong to GPU category", func(t *testing.T) {
ng := newTestNodeGroup(t, GPUMachineCategory+"1-123")
ng := newTestNodeGroup(t, "t1-123")
assert.True(t, ng.isGpu())
})
t.Run("not found but belong to GPU category", func(t *testing.T) {
ng := newTestNodeGroup(t, "h1-123")
assert.True(t, ng.isGpu())
})
t.Run("not found and does not belong to GPU category", func(t *testing.T) {
ng := newTestNodeGroup(t, "n1-123")
assert.False(t, ng.isGpu())
})
}
func TestOVHCloudNodeGroup_GetOptions(t *testing.T) {

12
cluster-autoscaler/cloudprovider/ovhcloud/ovh_cloud_provider.go
View File

@ -44,11 +44,11 @@ const (
// MachineAvailableState defines the state for available flavors for node resources.
MachineAvailableState = "available"
// GPUMachineCategory defines the default instance category for GPU resources.
GPUMachineCategory = "t"
)
// GPUMachineCategoryPrefixes defines the flavors prefixes for GPU resources.
var GPUMachineCategoryPrefixes = [4]string{"t", "h", "a", "l"}
// OVHCloudProvider implements CloudProvider interface.
type OVHCloudProvider struct {
manager *OvhCloudManager
@ -100,7 +100,7 @@ func (provider *OVHCloudProvider) NodeGroups() []cloudprovider.NodeGroup {
groups := make([]cloudprovider.NodeGroup, 0)
// Cast API node pools into CA node groups
for _, pool := range provider.manager.NodePools {
for _, pool := range provider.manager.NodePoolsPerID {
// Node pools without autoscaling are equivalent to node pools with autoscaling but no scale possible
if !pool.Autoscale {
pool.MaxNodes = pool.DesiredNodes
@ -238,7 +238,7 @@ func (provider *OVHCloudProvider) GetAvailableMachineTypes() ([]string, error) {
// Implementation optional.
func (provider *OVHCloudProvider) NewNodeGroup(machineType string, labels map[string]string, systemLabels map[string]string, taints []apiv1.Taint, extraResources map[string]resource.Quantity) (cloudprovider.NodeGroup, error) {
ng := &NodeGroup{
NodePool: sdk.NodePool{
NodePool: &sdk.NodePool{
Name: fmt.Sprintf("%s-%d", machineType, rand.Int63()),
Flavor: machineType,
MinNodes: 0,
@ -314,7 +314,7 @@ func (provider *OVHCloudProvider) Refresh() error {
}
// Update the node pools cache
provider.manager.NodePools = pools
provider.manager.setNodePoolsState(pools)
return nil
}

87
cluster-autoscaler/cloudprovider/ovhcloud/ovh_cloud_provider_test.go
View File

@ -28,8 +28,8 @@ import (
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/ovhcloud/sdk"
)
func newTestProvider(t *testing.T) *OVHCloudProvider {
cfg := `{
const (
ovhConsumerConfiguration = `{
"project_id": "projectID",
"cluster_id": "clusterID",
"authentication_type": "consumer",
@ -38,10 +38,30 @@ func newTestProvider(t *testing.T) *OVHCloudProvider {
"application_secret": "secret",
"application_consumer_key": "consumer_key"
}`
openstackUserPasswordConfiguration = `{
"project_id": "projectID",
"cluster_id": "clusterID",
"authentication_type": "openstack",
"openstack_auth_url": "https://auth.local",
"openstack_domain": "Default",
"openstack_username": "user",
"openstack_password": "password"
}`
openstackApplicationCredentialsConfiguration = `{
"project_id": "projectID",
"cluster_id": "clusterID",
"authentication_type": "openstack_application",
"openstack_auth_url": "https://auth.local",
"openstack_domain": "Default",
"openstack_application_credential_id": "credential_id",
"openstack_application_credential_secret": "credential_secret"
}`
)
func newTestProvider(t *testing.T, cfg string) (*OVHCloudProvider, error) {
manager, err := NewManager(bytes.NewBufferString(cfg))
if err != nil {
assert.FailNow(t, "failed to create manager", err)
return nil, err
}
client := &sdk.ClientMock{}
@ -110,19 +130,38 @@ func newTestProvider(t *testing.T) *OVHCloudProvider {
}
err = provider.Refresh()
assert.NoError(t, err)
if err != nil {
return provider, err
}
return provider
return provider, nil
}
func TestOVHCloudProvider_BuildOVHcloud(t *testing.T) {
t.Run("create new OVHcloud provider", func(t *testing.T) {
_ = newTestProvider(t)
_, err := newTestProvider(t, ovhConsumerConfiguration)
assert.NoError(t, err)
})
}
// TestOVHCloudProvider_BuildOVHcloudOpenstackConfig validates that the configuration file is correct and the auth server is being resolved.
func TestOVHCloudProvider_BuildOVHcloudOpenstackConfig(t *testing.T) {
t.Run("create new OVHcloud provider", func(t *testing.T) {
_, err := newTestProvider(t, openstackUserPasswordConfiguration)
assert.ErrorContains(t, err, "lookup auth.local")
})
}
func TestOVHCloudProvider_BuildOVHcloudOpenstackApplicationConfig(t *testing.T) {
t.Run("create new OVHcloud provider", func(t *testing.T) {
_, err := newTestProvider(t, openstackApplicationCredentialsConfiguration)
assert.ErrorContains(t, err, "lookup auth.local")
})
}
func TestOVHCloudProvider_Name(t *testing.T) {
provider := newTestProvider(t)
provider, err := newTestProvider(t, ovhConsumerConfiguration)
assert.NoError(t, err)
t.Run("check OVHcloud provider name", func(t *testing.T) {
name := provider.Name()
@ -132,7 +171,8 @@ func TestOVHCloudProvider_Name(t *testing.T) {
}
func TestOVHCloudProvider_NodeGroups(t *testing.T) {
provider := newTestProvider(t)
provider, err := newTestProvider(t, ovhConsumerConfiguration)
assert.NoError(t, err)
t.Run("check default node groups length", func(t *testing.T) {
groups := provider.NodeGroups()
@ -141,7 +181,7 @@ func TestOVHCloudProvider_NodeGroups(t *testing.T) {
})
t.Run("check empty node groups length after reset", func(t *testing.T) {
provider.manager.NodePools = []sdk.NodePool{}
provider.manager.NodePoolsPerID = map[string]*sdk.NodePool{}
groups := provider.NodeGroups()
assert.Equal(t, 0, len(groups))
@ -149,7 +189,8 @@ func TestOVHCloudProvider_NodeGroups(t *testing.T) {
}
func TestOVHCloudProvider_NodeGroupForNode(t *testing.T) {
provider := newTestProvider(t)
provider, err := newTestProvider(t, ovhConsumerConfiguration)
assert.NoError(t, err)
ListNodePoolNodesCall1 := provider.manager.Client.(*sdk.ClientMock).On(
"ListNodePoolNodes",
@ -317,7 +358,8 @@ func TestOVHCloudProvider_NodeGroupForNode(t *testing.T) {
}
func TestOVHCloudProvider_Pricing(t *testing.T) {
provider := newTestProvider(t)
provider, err := newTestProvider(t, ovhConsumerConfiguration)
assert.NoError(t, err)
t.Run("not implemented", func(t *testing.T) {
_, err := provider.Pricing()
@ -326,7 +368,8 @@ func TestOVHCloudProvider_Pricing(t *testing.T) {
}
func TestOVHCloudProvider_GetAvailableMachineTypes(t *testing.T) {
provider := newTestProvider(t)
provider, err := newTestProvider(t, ovhConsumerConfiguration)
assert.NoError(t, err)
t.Run("check available machine types", func(t *testing.T) {
flavors, err := provider.GetAvailableMachineTypes()
@ -337,7 +380,8 @@ func TestOVHCloudProvider_GetAvailableMachineTypes(t *testing.T) {
}
func TestOVHCloudProvider_NewNodeGroup(t *testing.T) {
provider := newTestProvider(t)
provider, err := newTestProvider(t, ovhConsumerConfiguration)
assert.NoError(t, err)
t.Run("check new node group default values", func(t *testing.T) {
group, err := provider.NewNodeGroup("b2-7", nil, nil, nil, nil)
@ -350,7 +394,8 @@ func TestOVHCloudProvider_NewNodeGroup(t *testing.T) {
}
func TestOVHCloudProvider_GetResourceLimiter(t *testing.T) {
provider := newTestProvider(t)
provider, err := newTestProvider(t, ovhConsumerConfiguration)
assert.NoError(t, err)
t.Run("check default resource limiter values", func(t *testing.T) {
rl, err := provider.GetResourceLimiter()
@ -370,7 +415,8 @@ func TestOVHCloudProvider_GetResourceLimiter(t *testing.T) {
}
func TestOVHCloudProvider_GPULabel(t *testing.T) {
provider := newTestProvider(t)
provider, err := newTestProvider(t, ovhConsumerConfiguration)
assert.NoError(t, err)
t.Run("check gpu label annotation", func(t *testing.T) {
label := provider.GPULabel()
@ -380,7 +426,8 @@ func TestOVHCloudProvider_GPULabel(t *testing.T) {
}
func TestOVHCloudProvider_GetAvailableGPUTypes(t *testing.T) {
provider := newTestProvider(t)
provider, err := newTestProvider(t, ovhConsumerConfiguration)
assert.NoError(t, err)
t.Run("check available gpu machine types", func(t *testing.T) {
flavors := provider.GetAvailableGPUTypes()
@ -391,7 +438,8 @@ func TestOVHCloudProvider_GetAvailableGPUTypes(t *testing.T) {
}
func TestOVHCloudProvider_Cleanup(t *testing.T) {
provider := newTestProvider(t)
provider, err := newTestProvider(t, ovhConsumerConfiguration)
assert.NoError(t, err)
t.Run("check return nil", func(t *testing.T) {
err := provider.Cleanup()
@ -400,10 +448,11 @@ func TestOVHCloudProvider_Cleanup(t *testing.T) {
}
func TestOVHCloudProvider_Refresh(t *testing.T) {
provider := newTestProvider(t)
provider, err := newTestProvider(t, ovhConsumerConfiguration)
assert.NoError(t, err)
t.Run("check refresh reset node groups correctly", func(t *testing.T) {
provider.manager.NodePools = []sdk.NodePool{}
provider.manager.NodePoolsPerID = map[string]*sdk.NodePool{}
groups := provider.NodeGroups()
assert.Equal(t, 0, len(groups))

23
cluster-autoscaler/cloudprovider/ovhcloud/sdk/openstack.go
View File

@ -36,7 +36,7 @@ type OpenStackProvider struct {
tokenExpirationTime time.Time
}
// NewOpenStackProvider initializes a client/token pair to interact with OpenStack
// NewOpenStackProvider initializes a client/token pair to interact with OpenStack from a user/password.
func NewOpenStackProvider(authUrl string, username string, password string, domain string, tenant string) (*OpenStackProvider, error) {
provider, err := openstack.AuthenticatedClient(gophercloud.AuthOptions{
IdentityEndpoint: authUrl,
@ -58,6 +58,27 @@ func NewOpenStackProvider(authUrl string, username string, password string, doma
}, nil
}
// NewOpenstackApplicationProvider initializes a client/token pair to interact with OpenStack from application credentials.
func NewOpenstackApplicationProvider(authUrl string, applicationCredentialID string, applicationCredentialSecret string, domain string) (*OpenStackProvider, error) {
provider, err := openstack.AuthenticatedClient(gophercloud.AuthOptions{
IdentityEndpoint: authUrl,
ApplicationCredentialID: applicationCredentialID,
ApplicationCredentialSecret: applicationCredentialSecret,
DomainName: domain,
AllowReauth: true,
})
if err != nil {
return nil, fmt.Errorf("failed to create OpenStack authenticated client: %w", err)
}
return &OpenStackProvider{
provider: provider,
AuthUrl: authUrl,
Token: provider.Token(),
tokenExpirationTime: time.Now().Add(DefaultExpirationTime),
}, nil
}
// ReauthenticateToken revoke the current provider token and re-create a new one
func (p *OpenStackProvider) ReauthenticateToken() error {
err := p.provider.Reauthenticate(p.Token)

4
cluster-autoscaler/cloudprovider/ovhcloud/sdk/ovh.go
View File

@ -23,7 +23,7 @@ import (
"encoding/json"
"errors"
"fmt"
"io/ioutil"
"io"
"net/http"
"net/url"
"strconv"
@ -469,7 +469,7 @@ func (c *Client) CallAPIWithContext(ctx context.Context, method, path string, re
func (c *Client) UnmarshalResponse(response *http.Response, result interface{}) error {
// Read all the response body
defer response.Body.Close()
body, err := ioutil.ReadAll(response.Body)
body, err := io.ReadAll(response.Body)
if err != nil {
return err
}