fixup: rebase changes

Signed-off-by: Max Cao <[email protected]>

go.mod

@@ -197,7 +197,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.3 // indirect
 	github.com/aws/aws-sdk-go-v2/service/sso v1.24.3 // indirect
 	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.3 // indirect
-	github.com/aws/smithy-go v1.22.0 // indirect
+	github.com/aws/smithy-go v1.22.0
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/blang/semver/v4 v4.0.0 // indirect
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect

pkg/scaling/resolver/scale_resolvers.go

@@ -621,7 +621,6 @@ func resolveBoundServiceAccountToken(ctx context.Context, client client.Client,
 			logger.Error(err, "error trying to parse expiry duration", "expiry", expiry)
 			return ""
 		}
-		// convert duration to seconds
 		expirySeconds = ptr.Int64(int64(duration.Seconds()))
 	}
 
@@ -636,7 +635,6 @@ func resolveBoundServiceAccountToken(ctx context.Context, client client.Client,
 }
 
 func generateToken(ctx context.Context, serviceAccountName, namespace string, expiry *int64, acs *authentication.AuthClientSet) string {
-	// create new token and embed it in the secret
 	token, err := acs.CoreV1Interface.ServiceAccounts(namespace).CreateToken(
 		ctx,
 		serviceAccountName,