Use cache.SetDefault instead of Set since we're always using default

aws · Nov 16, 2021 · 1193302 · 1193302
1 parent 287aa20
commit 1193302
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/pkg/cloudprovider/aws/ami.go b/pkg/cloudprovider/aws/ami.go
@@ -78,7 +78,7 @@ func (p *AMIProvider) getAMIID(ctx context.Context, query string) (string, error
 		return "", fmt.Errorf("getting ssm parameter, %w", err)
 	}
 	ami := aws.StringValue(output.Parameter.Value)
-	p.cache.Set(query, ami, CacheTTL)
+	p.cache.SetDefault(query, ami)
 	logging.FromContext(ctx).Debugf("Discovered ami %s for query %s", ami, query)
 	return ami, nil
 }
@@ -102,7 +102,7 @@ func (p *AMIProvider) kubeServerVersion(ctx context.Context) (string, error) {
 		return "", err
 	}
 	version := fmt.Sprintf("%s.%s", serverVersion.Major, strings.TrimSuffix(serverVersion.Minor, "+"))
-	p.cache.Set(kubernetesVersionCacheKey, version, CacheTTL)
+	p.cache.SetDefault(kubernetesVersionCacheKey, version)
 	logging.FromContext(ctx).Debugf("Discovered kubernetes version %s", version)
 	return version, nil
 }
diff --git a/pkg/cloudprovider/aws/launchtemplate.go b/pkg/cloudprovider/aws/launchtemplate.go
@@ -153,7 +153,7 @@ func (p *LaunchTemplateProvider) ensureLaunchTemplate(ctx context.Context, optio
 		launchTemplate = output.LaunchTemplates[0]
 	}
 	// 4. Save in cache to reduce API calls
-	p.cache.Set(name, launchTemplate, CacheTTL)
+	p.cache.SetDefault(name, launchTemplate)
 	return launchTemplate, nil
 }
 

diff --git a/pkg/cloudprovider/aws/securitygroups.go b/pkg/cloudprovider/aws/securitygroups.go
@@ -87,7 +87,7 @@ func (s *SecurityGroupProvider) getSecurityGroups(ctx context.Context, filters [
 	if err != nil {
 		return nil, fmt.Errorf("describing security groups %+v, %w", filters, err)
 	}
-	s.cache.Set(fmt.Sprint(hash), output.SecurityGroups, CacheTTL)
+	s.cache.SetDefault(fmt.Sprint(hash), output.SecurityGroups)
 	logging.FromContext(ctx).Debugf("Discovered security groups: %s", s.securityGroupIds(output.SecurityGroups))
 	return output.SecurityGroups, nil
 }

diff --git a/pkg/cloudprovider/aws/subnets.go b/pkg/cloudprovider/aws/subnets.go
@@ -56,7 +56,7 @@ func (s *SubnetProvider) Get(ctx context.Context, constraints *v1alpha1.Constrai
 	if len(output.Subnets) == 0 {
 		return nil, fmt.Errorf("no subnets matched selector %v", constraints.SubnetSelector)
 	}
-	s.cache.Set(fmt.Sprint(hash), output.Subnets, CacheTTL)
+	s.cache.SetDefault(fmt.Sprint(hash), output.Subnets)
 	logging.FromContext(ctx).Debugf("Discovered subnets: %s", prettySubnets(output.Subnets))
 	return output.Subnets, nil
 }

diff --git a/pkg/controllers/allocation/scheduling/preferences.go b/pkg/controllers/allocation/scheduling/preferences.go
@@ -52,13 +52,13 @@ func (p *Preferences) Relax(ctx context.Context, pods []*v1.Pod) {
 		affinity, ok := p.cache.Get(string(pod.UID))
 		// Add to cache if we've never seen it before
 		if !ok {
-			p.cache.Set(string(pod.UID), pod.Spec.Affinity, ExpirationTTL)
+			p.cache.SetDefault(string(pod.UID), pod.Spec.Affinity)
 			continue
 		}
 		// Attempt to relax the pod and update the cache
 		pod.Spec.Affinity = affinity.(*v1.Affinity)
 		if relaxed := p.relax(ctx, pod); relaxed {
-			p.cache.Set(string(pod.UID), pod.Spec.Affinity, ExpirationTTL)
+			p.cache.SetDefault(string(pod.UID), pod.Spec.Affinity)
 		}
 	}
 }