Change VPC cache duration to 10m

Also switched cache value to be time.Duration from int.

Signed-off-by: Stephen Hoekstra <[email protected]>

Author: shoekstra

docs/deploy/configurations.md

@@ -71,7 +71,7 @@ Currently, you can set only 1 namespace to watch in this flag. See [this Kuberne
 |aws-api-throttle                       | AWS Throttle Config             | [default value](#default-throttle-config ) | throttle settings for AWS APIs, format: serviceID1:operationRegex1=rate:burst,serviceID2:operationRegex2=rate:burst |
 |aws-max-retries                        | int                             | 10              | Maximum retries for AWS APIs |
 |aws-region                             | string                          | [instance metadata](#instance-metadata)    | AWS Region for the kubernetes cluster |
-|aws-vpc-cache-duration                 | string                          | 5               | Length of time in minutes to cache VPC info |
+|aws-vpc-cache-duration                 | string                          | 10m             | Length of time in minutes to cache VPC info |
 |aws-vpc-id                             | string                          | [instance metadata](#instance-metadata)    | ID of the AWS VPC where Load Balancer resources will be created |
 |cluster-name                           | string                          |                 | Kubernetes cluster name|
 |default-tags                           | stringMap                       |                 | AWS Tags that will be applied to all AWS resources managed by this controller. Specified Tags takes highest priority |

pkg/aws/cloud.go

@@ -1,6 +1,8 @@
 package aws
 
 import (
+	"time"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/endpoints"
 	"github.com/aws/aws-sdk-go/aws/session"
@@ -42,7 +44,7 @@ type Cloud interface {
 	VpcID() string
 
 	// VPC cache duration in minutes
-	VpcCacheDuration() int
+	VpcCacheDuration() time.Duration
 }
 
 // NewCloud constructs new Cloud implementation.
@@ -153,6 +155,6 @@ func (c *defaultCloud) VpcID() string {
 	return c.cfg.VpcID
 }
 
-func (c *defaultCloud) VpcCacheDuration() int {
+func (c *defaultCloud) VpcCacheDuration() time.Duration {
 	return c.cfg.VpcCacheDuration
 }

pkg/aws/cloud_config.go

@@ -1,6 +1,8 @@
 package aws
 
 import (
+	"time"
+
 	"github.com/spf13/pflag"
 	"sigs.k8s.io/aws-load-balancer-controller/pkg/aws/throttle"
 )
@@ -15,7 +17,7 @@ const (
 	defaultVpcID            = ""
 	defaultRegion           = ""
 	defaultAPIMaxRetries    = 10
-	defaultVpcCacheDuration = 5
+	defaultVpcCacheDuration = time.Minute * 10
 )
 
 type CloudConfig struct {
@@ -29,7 +31,7 @@ type CloudConfig struct {
 	VpcID string
 
 	// VPC cache duration in minutes
-	VpcCacheDuration int
+	VpcCacheDuration time.Duration
 
 	// Max retries configuration for AWS APIs
 	MaxRetries int
@@ -42,7 +44,7 @@ func (cfg *CloudConfig) BindFlags(fs *pflag.FlagSet) {
 	fs.StringVar(&cfg.Region, flagAWSRegion, defaultRegion, "AWS Region for the kubernetes cluster")
 	fs.Var(cfg.ThrottleConfig, flagAWSAPIThrottle, "throttle settings for AWS APIs, format: serviceID1:operationRegex1=rate:burst,serviceID2:operationRegex2=rate:burst")
 	fs.StringVar(&cfg.VpcID, flagAWSVpcID, defaultVpcID, "AWS ID of VPC to create load balancers in")
-	fs.IntVar(&cfg.VpcCacheDuration, flagAWSVpcCacheDuration, defaultVpcCacheDuration, "VPC cache duration in minutes")
+	fs.DurationVar(&cfg.VpcCacheDuration, flagAWSVpcCacheDuration, defaultVpcCacheDuration, "VPC cache duration in minutes")
 	fs.IntVar(&cfg.MaxRetries, flagAWSMaxRetries, defaultAPIMaxRetries, "Maximum retries for AWS APIs")
 	fs.StringToStringVar(&cfg.AWSEndpoints, flagAWSAPIEndpoints, nil, "Custom AWS endpoint configuration, format: serviceID1=URL1,serviceID2=URL2")
 }

pkg/networking/vpc_info_provider.go

@@ -18,7 +18,7 @@ type VPCInfoProvider interface {
 }
 
 // NewDefaultVPCInfoProvider constructs new defaultVPCInfoProvider.
-func NewDefaultVPCInfoProvider(cacheDuration int, ec2Client services.EC2, logger logr.Logger) *defaultVPCInfoProvider {
+func NewDefaultVPCInfoProvider(cacheDuration time.Duration, ec2Client services.EC2, logger logr.Logger) *defaultVPCInfoProvider {
 	return &defaultVPCInfoProvider{
 		ec2Client:         ec2Client,
 		vpcInfoCache:      cache.New(time.Duration(cacheDuration)*time.Minute, 10*time.Minute),

pkg/networking/vpc_info_provider_test.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"reflect"
 	"testing"
+	"time"
 
 	awssdk "github.com/aws/aws-sdk-go/aws"
 	ec2sdk "github.com/aws/aws-sdk-go/service/ec2"
@@ -62,7 +63,7 @@ func Test_defaultVPCInfoProvider_FetchVPCInfo(t *testing.T) {
 	defer ctrl.Finish()
 
 	ec2Client := services.NewMockEC2(ctrl)
-	p := NewDefaultVPCInfoProvider(5, ec2Client, &log.NullLogger{})
+	p := NewDefaultVPCInfoProvider(10*time.Minute, ec2Client, &log.NullLogger{})
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {