From dd09d59ddd7a2d70c783ff34c17e50dd3c02c2ba Mon Sep 17 00:00:00 2001 From: Mathieu Bruneau Date: Wed, 29 Nov 2023 18:38:26 +0000 Subject: [PATCH] + Added SDK version in the log + Update version in README + command --- cluster-autoscaler/cloudprovider/aws/README.md | 7 ++++--- cluster-autoscaler/cloudprovider/aws/aws_manager.go | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cluster-autoscaler/cloudprovider/aws/README.md b/cluster-autoscaler/cloudprovider/aws/README.md index 0c8c6d7a0e87..8f12fc0a05a5 100644 --- a/cluster-autoscaler/cloudprovider/aws/README.md +++ b/cluster-autoscaler/cloudprovider/aws/README.md @@ -429,13 +429,14 @@ To refresh static list, please run `go run ec2_instance_types/gen.go` under If you want to use a newer version of the AWS SDK than the version currently vendored as a direct dependency by Cluster Autoscaler, then you can use the version vendored under this AWS cloudprovider. -The current version vendored is `v1.44.24`. +The current version vendored is `v1.48.7`. If you want to update the vendored AWS SDK to a newer version, please make sure of the following: 1. Place the copy of the new desired version of the AWS SDK under the `aws-sdk-go` directory. -2. Update the import statements within the newly-copied AWS SDK to reference the new paths (e.g., `github.com/aws/aws-sdk-go/aws/awsutil` -> `k8s.io/autoscaler/cluster-autoscaler/cloudprovider/aws/aws-sdk-go/aws/awsutil`). -3. Update the version number above to indicate the new vendored version. +2. Remove folders : models and examples. Remove _test.go file `find . -name '*_test.go' -exec rm {}+` +3. Update the import statements within the newly-copied AWS SDK to reference the new paths (e.g., `github.com/aws/aws-sdk-go/aws/awsutil` -> `k8s.io/autoscaler/cluster-autoscaler/cloudprovider/aws/aws-sdk-go/aws/awsutil`). You can use this command from the aws-sdk-go folder `find . -type f -exec sed -i ‘s#github.com/aws/aws-sdk-go#k8s.io/autoscaler/cluster-autoscaler/cloudprovider/aws/aws-sdk-go#’ {} \;` +4. Update the version number above to indicate the new vendored version. ## Using cloud config with helm diff --git a/cluster-autoscaler/cloudprovider/aws/aws_manager.go b/cluster-autoscaler/cloudprovider/aws/aws_manager.go index 15c81fc06476..ff96312f1886 100644 --- a/cluster-autoscaler/cloudprovider/aws/aws_manager.go +++ b/cluster-autoscaler/cloudprovider/aws/aws_manager.go @@ -76,6 +76,8 @@ func createAWSManagerInternal( awsService *awsWrapper, instanceTypes map[string]*InstanceType, ) (*AwsManager, error) { + klog.Infof("AWS SDK Version: %s", aws.SDKVersion) + if awsService == nil { sess := awsSDKProvider.session awsService = &awsWrapper{autoscaling.New(sess), ec2.New(sess), eks.New(sess)}