Merge pull request #5168 from jbartosik/roll-up-vpa-0-12

Pull in VPA changes to 0.12 release branch

builder/Dockerfile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.18.1
+FROM golang:1.19
 LABEL maintainer="Marcin Wielgus <[email protected]>"
 
 ENV GOPATH /gopath/

cluster-autoscaler/cloudprovider/alicloud/alicloud_auto_scaling.go

@@ -30,7 +30,7 @@ const (
 	defaultAdjustmentType   = "TotalCapacity"
 )
 
-//autoScaling define the interface usage in alibaba-cloud-sdk-go.
+// autoScaling define the interface usage in alibaba-cloud-sdk-go.
 type autoScaling interface {
 	DescribeScalingGroups(req *ess.DescribeScalingGroupsRequest) (*ess.DescribeScalingGroupsResponse, error)
 	DescribeScalingConfigurations(req *ess.DescribeScalingConfigurationsRequest) (*ess.DescribeScalingConfigurationsResponse, error)
@@ -95,7 +95,7 @@ func getEssClient(cfg *cloudConfig) (client *ess.Client, err error) {
 	return
 }
 
-//autoScalingWrapper will serve as the
+// autoScalingWrapper will serve as the
 type autoScalingWrapper struct {
 	autoScaling
 	cfg *cloudConfig

cluster-autoscaler/cloudprovider/aws/aws-sdk-go/aws/awserr/error.go

@@ -10,24 +10,23 @@ package awserr
 //
 // Example:
 //
-//     output, err := s3manage.Upload(svc, input, opts)
-//     if err != nil {
-//         if awsErr, ok := err.(awserr.Error); ok {
-//             // Get error details
-//             log.Println("Error:", awsErr.Code(), awsErr.Message())
-//
-//             // Prints out full error message, including original error if there was one.
-//             log.Println("Error:", awsErr.Error())
-//
-//             // Get original error
-//             if origErr := awsErr.OrigErr(); origErr != nil {
-//                 // operate on original error.
-//             }
-//         } else {
-//             fmt.Println(err.Error())
-//         }
-//     }
-//
+//	output, err := s3manage.Upload(svc, input, opts)
+//	if err != nil {
+//	    if awsErr, ok := err.(awserr.Error); ok {
+//	        // Get error details
+//	        log.Println("Error:", awsErr.Code(), awsErr.Message())
+//
+//	        // Prints out full error message, including original error if there was one.
+//	        log.Println("Error:", awsErr.Error())
+//
+//	        // Get original error
+//	        if origErr := awsErr.OrigErr(); origErr != nil {
+//	            // operate on original error.
+//	        }
+//	    } else {
+//	        fmt.Println(err.Error())
+//	    }
+//	}
 type Error interface {
 	// Satisfy the generic error interface.
 	error
@@ -100,32 +99,31 @@ func NewBatchError(code, message string, errs []error) BatchedErrors {
 //
 // Example:
 //
-//     output, err := s3manage.Upload(svc, input, opts)
-//     if err != nil {
-//         if reqerr, ok := err.(RequestFailure); ok {
-//             log.Println("Request failed", reqerr.Code(), reqerr.Message(), reqerr.RequestID())
-//         } else {
-//             log.Println("Error:", err.Error())
-//         }
-//     }
+//	output, err := s3manage.Upload(svc, input, opts)
+//	if err != nil {
+//	    if reqerr, ok := err.(RequestFailure); ok {
+//	        log.Println("Request failed", reqerr.Code(), reqerr.Message(), reqerr.RequestID())
+//	    } else {
+//	        log.Println("Error:", err.Error())
+//	    }
+//	}
 //
 // Combined with awserr.Error:
 //
-//    output, err := s3manage.Upload(svc, input, opts)
-//    if err != nil {
-//        if awsErr, ok := err.(awserr.Error); ok {
-//            // Generic AWS Error with Code, Message, and original error (if any)
-//            fmt.Println(awsErr.Code(), awsErr.Message(), awsErr.OrigErr())
-//
-//            if reqErr, ok := err.(awserr.RequestFailure); ok {
-//                // A service error occurred
-//                fmt.Println(reqErr.StatusCode(), reqErr.RequestID())
-//            }
-//        } else {
-//            fmt.Println(err.Error())
-//        }
-//    }
-//
+//	output, err := s3manage.Upload(svc, input, opts)
+//	if err != nil {
+//	    if awsErr, ok := err.(awserr.Error); ok {
+//	        // Generic AWS Error with Code, Message, and original error (if any)
+//	        fmt.Println(awsErr.Code(), awsErr.Message(), awsErr.OrigErr())
+//
+//	        if reqErr, ok := err.(awserr.RequestFailure); ok {
+//	            // A service error occurred
+//	            fmt.Println(reqErr.StatusCode(), reqErr.RequestID())
+//	        }
+//	    } else {
+//	        fmt.Println(err.Error())
+//	    }
+//	}
 type RequestFailure interface {
 	Error
 

cluster-autoscaler/cloudprovider/aws/aws-sdk-go/aws/client/default_retryer.go

@@ -12,7 +12,6 @@ import (
 // DefaultRetryer implements basic retry logic using exponential backoff for
 // most services. If you want to implement custom retry logic, you can implement the
 // request.Retryer interface.
-//
 type DefaultRetryer struct {
 	// Num max Retries is the number of max retries that will be performed.
 	// By default, this is zero.

cluster-autoscaler/cloudprovider/aws/aws-sdk-go/aws/config.go

@@ -20,16 +20,16 @@ type RequestRetryer interface{}
 // A Config provides service configuration for service clients. By default,
 // all clients will use the defaults.DefaultConfig structure.
 //
-//     // Create Session with MaxRetries configuration to be shared by multiple
-//     // service clients.
-//     sess := session.Must(session.NewSession(&aws.Config{
-//         MaxRetries: aws.Int(3),
-//     }))
+//	// Create Session with MaxRetries configuration to be shared by multiple
+//	// service clients.
+//	sess := session.Must(session.NewSession(&aws.Config{
+//	    MaxRetries: aws.Int(3),
+//	}))
 //
-//     // Create S3 service client with a specific Region.
-//     svc := s3.New(sess, &aws.Config{
-//         Region: aws.String("us-west-2"),
-//     })
+//	// Create S3 service client with a specific Region.
+//	svc := s3.New(sess, &aws.Config{
+//	    Region: aws.String("us-west-2"),
+//	})
 type Config struct {
 	// Enables verbose error printing of all credential chain errors.
 	// Should be used when wanting to see all errors while attempting to
@@ -283,16 +283,16 @@ type Config struct {
 // NewConfig returns a new Config pointer that can be chained with builder
 // methods to set multiple configuration values inline without using pointers.
 //
-//     // Create Session with MaxRetries configuration to be shared by multiple
-//     // service clients.
-//     sess := session.Must(session.NewSession(aws.NewConfig().
-//         WithMaxRetries(3),
-//     ))
+//	// Create Session with MaxRetries configuration to be shared by multiple
+//	// service clients.
+//	sess := session.Must(session.NewSession(aws.NewConfig().
+//	    WithMaxRetries(3),
+//	))
 //
-//     // Create S3 service client with a specific Region.
-//     svc := s3.New(sess, aws.NewConfig().
-//         WithRegion("us-west-2"),
-//     )
+//	// Create S3 service client with a specific Region.
+//	svc := s3.New(sess, aws.NewConfig().
+//	    WithRegion("us-west-2"),
+//	)
 func NewConfig() *Config {
 	return &Config{}
 }

cluster-autoscaler/cloudprovider/aws/aws-sdk-go/aws/credentials/chain_provider.go

@@ -37,19 +37,18 @@ var (
 // does not return any credentials ChainProvider will return the error
 // ErrNoValidProvidersFoundInChain
 //
-//     creds := credentials.NewChainCredentials(
-//         []credentials.Provider{
-//             &credentials.EnvProvider{},
-//             &ec2rolecreds.EC2RoleProvider{
-//                 Client: ec2metadata.New(sess),
-//             },
-//         })
-//
-//     // Usage of ChainCredentials with aws.Config
-//     svc := ec2.New(session.Must(session.NewSession(&aws.Config{
-//       Credentials: creds,
-//     })))
+//	creds := credentials.NewChainCredentials(
+//	    []credentials.Provider{
+//	        &credentials.EnvProvider{},
+//	        &ec2rolecreds.EC2RoleProvider{
+//	            Client: ec2metadata.New(sess),
+//	        },
+//	    })
 //
+//	// Usage of ChainCredentials with aws.Config
+//	svc := ec2.New(session.Must(session.NewSession(&aws.Config{
+//	  Credentials: creds,
+//	})))
 type ChainProvider struct {
 	Providers     []Provider
 	curr          Provider

cluster-autoscaler/cloudprovider/aws/aws-sdk-go/aws/credentials/credentials.go

@@ -14,38 +14,36 @@
 //
 // Example of using the environment variable credentials.
 //
-//     creds := credentials.NewEnvCredentials()
+//	creds := credentials.NewEnvCredentials()
 //
-//     // Retrieve the credentials value
-//     credValue, err := creds.Get()
-//     if err != nil {
-//         // handle error
-//     }
+//	// Retrieve the credentials value
+//	credValue, err := creds.Get()
+//	if err != nil {
+//	    // handle error
+//	}
 //
 // Example of forcing credentials to expire and be refreshed on the next Get().
 // This may be helpful to proactively expire credentials and refresh them sooner
 // than they would naturally expire on their own.
 //
-//     creds := credentials.NewCredentials(&ec2rolecreds.EC2RoleProvider{})
-//     creds.Expire()
-//     credsValue, err := creds.Get()
-//     // New credentials will be retrieved instead of from cache.
+//	creds := credentials.NewCredentials(&ec2rolecreds.EC2RoleProvider{})
+//	creds.Expire()
+//	credsValue, err := creds.Get()
+//	// New credentials will be retrieved instead of from cache.
 //
-//
-// Custom Provider
+// # Custom Provider
 //
 // Each Provider built into this package also provides a helper method to generate
 // a Credentials pointer setup with the provider. To use a custom Provider just
 // create a type which satisfies the Provider interface and pass it to the
 // NewCredentials method.
 //
-//     type MyProvider struct{}
-//     func (m *MyProvider) Retrieve() (Value, error) {...}
-//     func (m *MyProvider) IsExpired() bool {...}
-//
-//     creds := credentials.NewCredentials(&MyProvider{})
-//     credValue, err := creds.Get()
+//	type MyProvider struct{}
+//	func (m *MyProvider) Retrieve() (Value, error) {...}
+//	func (m *MyProvider) IsExpired() bool {...}
 //
+//	creds := credentials.NewCredentials(&MyProvider{})
+//	credValue, err := creds.Get()
 package credentials
 
 import (
@@ -64,10 +62,10 @@ import (
 // when making service API calls. For example, when accessing public
 // s3 buckets.
 //
-//     svc := s3.New(session.Must(session.NewSession(&aws.Config{
-//       Credentials: credentials.AnonymousCredentials,
-//     })))
-//     // Access public S3 buckets.
+//	svc := s3.New(session.Must(session.NewSession(&aws.Config{
+//	  Credentials: credentials.AnonymousCredentials,
+//	})))
+//	// Access public S3 buckets.
 var AnonymousCredentials = NewStaticCredentials("", "", "")
 
 // A Value is the AWS credentials value for individual credential fields.
@@ -150,10 +148,11 @@ func (p ErrorProvider) IsExpired() bool {
 // provider's struct.
 //
 // Example:
-//     type EC2RoleProvider struct {
-//         Expiry
-//         ...
-//     }
+//
+//	type EC2RoleProvider struct {
+//	    Expiry
+//	    ...
+//	}
 type Expiry struct {
 	// The date/time when to expire on
 	expiration time.Time

cluster-autoscaler/cloudprovider/aws/aws-sdk-go/aws/credentials/ec2rolecreds/ec2_role_provider.go

@@ -25,17 +25,17 @@ const ProviderName = "EC2RoleProvider"
 // Example how to configure the EC2RoleProvider with custom http Client, Endpoint
 // or ExpiryWindow
 //
-//     p := &ec2rolecreds.EC2RoleProvider{
-//         // Pass in a custom timeout to be used when requesting
-//         // IAM EC2 Role credentials.
-//         Client: ec2metadata.New(sess, aws.Config{
-//             HTTPClient: &http.Client{Timeout: 10 * time.Second},
-//         }),
+//	p := &ec2rolecreds.EC2RoleProvider{
+//	    // Pass in a custom timeout to be used when requesting
+//	    // IAM EC2 Role credentials.
+//	    Client: ec2metadata.New(sess, aws.Config{
+//	        HTTPClient: &http.Client{Timeout: 10 * time.Second},
+//	    }),
 //
-//         // Do not use early expiry of credentials. If a non zero value is
-//         // specified the credentials will be expired early
-//         ExpiryWindow: 0,
-//     }
+//	    // Do not use early expiry of credentials. If a non zero value is
+//	    // specified the credentials will be expired early
+//	    ExpiryWindow: 0,
+//	}
 type EC2RoleProvider struct {
 	credentials.Expiry
 

cluster-autoscaler/cloudprovider/aws/aws-sdk-go/aws/credentials/endpointcreds/provider.go

@@ -7,26 +7,29 @@
 //
 // Static credentials will never expire once they have been retrieved. The format
 // of the static credentials response:
-//    {
-//        "AccessKeyId" : "MUA...",
-//        "SecretAccessKey" : "/7PC5om....",
-//    }
+//
+//	{
+//	    "AccessKeyId" : "MUA...",
+//	    "SecretAccessKey" : "/7PC5om....",
+//	}
 //
 // Refreshable credentials will expire within the "ExpiryWindow" of the Expiration
 // value in the response. The format of the refreshable credentials response:
-//    {
-//        "AccessKeyId" : "MUA...",
-//        "SecretAccessKey" : "/7PC5om....",
-//        "Token" : "AQoDY....=",
-//        "Expiration" : "2016-02-25T06:03:31Z"
-//    }
+//
+//	{
+//	    "AccessKeyId" : "MUA...",
+//	    "SecretAccessKey" : "/7PC5om....",
+//	    "Token" : "AQoDY....=",
+//	    "Expiration" : "2016-02-25T06:03:31Z"
+//	}
 //
 // Errors should be returned in the following format and only returned with 400
 // or 500 HTTP status codes.
-//    {
-//        "code": "ErrorCode",
-//        "message": "Helpful error message."
-//    }
+//
+//	{
+//	    "code": "ErrorCode",
+//	    "message": "Helpful error message."
+//	}
 package endpointcreds
 
 import (