Merge branch 'master' into dependabot/go_modules/test/agent/golang.or…

…g/x/sys-0.29.0

.go-version

@@ -1 +1 @@
-1.22.5
+1.22.12

pkg/awsutils/awssession/session.go

@@ -16,14 +16,15 @@ package awssession
 import (
 	"context"
 	"fmt"
-	"net/http"
 	"os"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/aws/retry"
 	"github.com/aws/aws-sdk-go-v2/config"
 	"github.com/aws/aws-sdk-go-v2/service/ec2"
 	"github.com/aws/smithy-go"
+
+	awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http"
 	smithymiddleware "github.com/aws/smithy-go/middleware"
 	smithyhttp "github.com/aws/smithy-go/transport/http"
 
@@ -64,10 +65,9 @@ func getHTTPTimeout() time.Duration {
 
 // New will return aws.Config to be used by Service Clients.
 func New(ctx context.Context) (aws.Config, error) {
-	customHTTPClient := &http.Client{
-		Timeout: getHTTPTimeout()}
+	httpClient := awshttp.NewBuildableClient().WithTimeout(getHTTPTimeout())
 	optFns := []func(*config.LoadOptions) error{
-		config.WithHTTPClient(customHTTPClient),
+		config.WithHTTPClient(httpClient),
 		config.WithRetryMaxAttempts(maxRetries),
 		config.WithRetryer(func() aws.Retryer {
 			return retry.NewStandard()

pkg/ipamd/ipamd.go

@@ -2001,6 +2001,11 @@ func (c *IPAMContext) AnnotatePod(podName string, podNamespace string, key strin
 			if err == nil && pod == nil {
 				log.Warnf("get a nil pod for pod name %s and namespace %s", podName, podNamespace)
 			}
+			// since the GetPod() error has been decorated, we have to check key words
+			// releasedIP is not empty meaning del path
+			if releasedIP != "" && err != nil && strings.Contains(err.Error(), "not found") {
+				return nil
+			}
 			return err
 		}
 

pkg/ipamd/ipamd_test.go

@@ -2295,8 +2295,7 @@ func TestAnnotatePod(t *testing.T) {
 
 	// Test that delete on a non-existant pod fails without crashing
 	err = mockContext.AnnotatePod("no-exist-name", "no-exist-namespace", "ip-address", "", ipTwo)
-	assert.Error(t, err)
-	assert.Equal(t, fmt.Errorf("error while trying to retrieve pod info: pods \"no-exist-name\" not found"), err)
+	assert.NoError(t, err)
 }
 
 func TestAddFeatureToCNINode(t *testing.T) {