github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 06:54:01 +00:00
Code Issues Projects Releases Wiki Activity

suffix InSeconds to cacheTTL for clearification

Browse Source
This commit is contained in:
Qingqing Zheng 2019-12-16 11:29:16 -08:00
parent 8953544b15
commit 287e3298fb
4 changed files with 107 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
staging/src/k8s.io/legacy-cloud-providers/azure/azure.go
View File

@ -175,21 +175,21 @@ type Config struct {
// with LoadBalancerName // with LoadBalancerName
LoadBalancerResourceGroup string `json:"loadBalancerResourceGroup,omitempty" yaml:"loadBalancerResourceGroup,omitempty"` LoadBalancerResourceGroup string `json:"loadBalancerResourceGroup,omitempty" yaml:"loadBalancerResourceGroup,omitempty"`
// AvailabilitySetNodesCacheTTL sets the Cache TTL for availabilitySetNodesCache // AvailabilitySetNodesCacheTTLInSeconds sets the Cache TTL for availabilitySetNodesCache
// if not set, will use default value // if not set, will use default value
AvailabilitySetNodesCacheTTL int `json:"availabilitySetNodesCacheTTL,omitempty" yaml:"availabilitySetNodesCacheTTL,omitempty"` AvailabilitySetNodesCacheTTLInSeconds int `json:"availabilitySetNodesCacheTTLInSeconds,omitempty" yaml:"availabilitySetNodesCacheTTLInSeconds,omitempty"`
// VmssCacheTTL sets the cache TTL for VMSS // VmssCacheTTLInSeconds sets the cache TTL for VMSS
VmssCacheTTL int `json:"vmssCacheTTL,omitempty" yaml:"vmssCacheTTL,omitempty"` VmssCacheTTLInSeconds int `json:"vmssCacheTTLInSeconds,omitempty" yaml:"vmssCacheTTLInSeconds,omitempty"`
// VmssVirtualMachinesCacheTTL sets the cache TTL for vmssVirtualMachines // VmssVirtualMachinesCacheTTLInSeconds sets the cache TTL for vmssVirtualMachines
VmssVirtualMachinesCacheTTL int `json:"vmssVirtualMachinesCacheTTL,omitempty" yaml:"vmssVirtualMachinesCacheTTL,omitempty"` VmssVirtualMachinesCacheTTLInSeconds int `json:"vmssVirtualMachinesCacheTTLInSeconds,omitempty" yaml:"vmssVirtualMachinesCacheTTLInSeconds,omitempty"`
// VmCacheTTL sets the cache TTL for vm // VmCacheTTLInSeconds sets the cache TTL for vm
VMCacheTTL int `json:"vmCacheTTL,omitempty" yaml:"vmCacheTTL,omitempty"` VMCacheTTLInSeconds int `json:"vmCacheTTLInSeconds,omitempty" yaml:"vmCacheTTLInSeconds,omitempty"`
// LbCacheTTL sets the cache TTL for load balancer // LoadBalancerCacheTTLInSeconds sets the cache TTL for load balancer
LbCacheTTL int `json:"lbCacheTTL,omitempty" yaml:"lbcacheTTL,omitempty"` LoadBalancerCacheTTLInSeconds int `json:"loadBalancerCacheTTLInSeconds,omitempty" yaml:"loadBalancerCacheTTLInSeconds,omitempty"`
// NsgCacheTTL sets the cache TTL for network security group // NsgCacheTTLInSeconds sets the cache TTL for network security group
NsgCacheTTL int `json:"nsgCacheTTL,omityempty" yaml:"nsgCacheTTL,omitempty"` NsgCacheTTLInSeconds int `json:"nsgCacheTTLInSeconds,omitempty" yaml:"nsgCacheTTLInSeconds,omitempty"`
// RtCacheTTL sets the cache TTL for route table // RouteTableCacheTTLInSeconds sets the cache TTL for route table
RtCacheTTL int `json:"rtCacheTTL,omitempty" yaml:"rtCacheTTL,omitempty"` RouteTableCacheTTLInSeconds int `json:"routeTableCacheTTLInSeconds,omitempty" yaml:"routeTableCacheTTLInSeconds,omitempty"`
} }
var _ cloudprovider.Interface = (*Cloud)(nil) var _ cloudprovider.Interface = (*Cloud)(nil)

130
staging/src/k8s.io/legacy-cloud-providers/azure/azure_test.go
View File

@ -59,13 +59,13 @@ func TestParseConfig(t *testing.T) {
"CloudProviderRateLimitBucketWrite": 1, "CloudProviderRateLimitBucketWrite": 1,
"cloudProviderRateLimitQPS": 1, "cloudProviderRateLimitQPS": 1,
"CloudProviderRateLimitQPSWrite": 1, "CloudProviderRateLimitQPSWrite": 1,
"availabilitySetNodesCacheTTL": 100, "availabilitySetNodesCacheTTLInSeconds": 100,
"vmssCacheTTL": 100, "vmssCacheTTLInSeconds": 100,
"vmssVirtualMachinesCacheTTL": 100, "vmssVirtualMachinesCacheTTLInSeconds": 100,
"vmCacheTTL": 100, "vmCacheTTLInSeconds": 100,
"lbCacheTTL": 100, "loadBalancerCacheTTLInSeconds": 100,
"nsgCacheTTL": 100, "nsgCacheTTLInSeconds": 100,
"rtCacheTTL": 100, "routeTableCacheTTLInSeconds": 100,
"location": "location", "location": "location",
"maximumLoadBalancerRuleCount": 1, "maximumLoadBalancerRuleCount": 1,
"primaryAvailabilitySetName": "primaryAvailabilitySetName", "primaryAvailabilitySetName": "primaryAvailabilitySetName",
@ -94,36 +94,36 @@ func TestParseConfig(t *testing.T) {
TenantID: "tenantId", TenantID: "tenantId",
UseManagedIdentityExtension: true, UseManagedIdentityExtension: true,
}, },
CloudProviderBackoff: true, CloudProviderBackoff: true,
CloudProviderBackoffDuration: 1, CloudProviderBackoffDuration: 1,
CloudProviderBackoffExponent: 1, CloudProviderBackoffExponent: 1,
CloudProviderBackoffJitter: 1, CloudProviderBackoffJitter: 1,
CloudProviderBackoffRetries: 1, CloudProviderBackoffRetries: 1,
CloudProviderRateLimit: true, CloudProviderRateLimit: true,
CloudProviderRateLimitBucket: 1, CloudProviderRateLimitBucket: 1,
CloudProviderRateLimitBucketWrite: 1, CloudProviderRateLimitBucketWrite: 1,
CloudProviderRateLimitQPS: 1, CloudProviderRateLimitQPS: 1,
CloudProviderRateLimitQPSWrite: 1, CloudProviderRateLimitQPSWrite: 1,
AvailabilitySetNodesCacheTTL: 100, AvailabilitySetNodesCacheTTLInSeconds: 100,
VmssCacheTTL: 100, VmssCacheTTLInSeconds: 100,
VmssVirtualMachinesCacheTTL: 100, VmssVirtualMachinesCacheTTLInSeconds: 100,
VMCacheTTL: 100, VMCacheTTLInSeconds: 100,
LbCacheTTL: 100, LoadBalancerCacheTTLInSeconds: 100,
NsgCacheTTL: 100, NsgCacheTTLInSeconds: 100,
RtCacheTTL: 100, RouteTableCacheTTLInSeconds: 100,
Location: "location", Location: "location",
MaximumLoadBalancerRuleCount: 1, MaximumLoadBalancerRuleCount: 1,
PrimaryAvailabilitySetName: "primaryAvailabilitySetName", PrimaryAvailabilitySetName: "primaryAvailabilitySetName",
PrimaryScaleSetName: "primaryScaleSetName", PrimaryScaleSetName: "primaryScaleSetName",
ResourceGroup: "resourcegroup", ResourceGroup: "resourcegroup",
RouteTableName: "routeTableName", RouteTableName: "routeTableName",
RouteTableResourceGroup: "routeTableResourceGroup", RouteTableResourceGroup: "routeTableResourceGroup",
SecurityGroupName: "securityGroupName", SecurityGroupName: "securityGroupName",
SubnetName: "subnetName", SubnetName: "subnetName",
UseInstanceMetadata: true, UseInstanceMetadata: true,
VMType: "standard", VMType: "standard",
VnetName: "vnetName", VnetName: "vnetName",
VnetResourceGroup: "vnetResourceGroup", VnetResourceGroup: "vnetResourceGroup",
} }
buffer := bytes.NewBufferString(azureConfig) buffer := bytes.NewBufferString(azureConfig)
@ -1587,13 +1587,13 @@ func TestNewCloudFromJSON(t *testing.T) {
"cloudProviderRatelimit": true, "cloudProviderRatelimit": true,
"cloudProviderRateLimitQPS": 0.5, "cloudProviderRateLimitQPS": 0.5,
"cloudProviderRateLimitBucket": 5, "cloudProviderRateLimitBucket": 5,
"availabilitySetNodesCacheTTL": 100, "availabilitySetNodesCacheTTLInSeconds": 100,
"vmssCacheTTL": 100, "vmssCacheTTLInSeconds": 100,
"vmssVirtualMachinesCacheTTL": 100, "vmssVirtualMachinesCacheTTLInSeconds": 100,
"vmCacheTTL": 100, "vmCacheTTLInSeconds": 100,
"lbCacheTTL": 100, "loadBalancerCacheTTLInSeconds": 100,
"nsgCacheTTL": 100, "nsgCacheTTLInSeconds": 100,
"rtCacheTTL": 100, "routeTableCacheTTLInSeconds": 100,
}` }`
validateConfig(t, config) validateConfig(t, config)
} }
@ -1643,13 +1643,13 @@ cloudProviderBackoffJitter: 1.0
cloudProviderRatelimit: true cloudProviderRatelimit: true
cloudProviderRateLimitQPS: 0.5 cloudProviderRateLimitQPS: 0.5
cloudProviderRateLimitBucket: 5 cloudProviderRateLimitBucket: 5
availabilitySetNodesCacheTTL: 100 availabilitySetNodesCacheTTLInSeconds: 100
vmssCacheTTL: 100 vmssCacheTTLInSeconds: 100
vmssVirtualMachinesCacheTTL: 100 vmssVirtualMachinesCacheTTLInSeconds: 100
vmCacheTTL: 100 vmCacheTTLInSeconds: 100
lbCacheTTL: 100 loadBalancerCacheTTLInSeconds: 100
nsgCacheTTL: 100 nsgCacheTTLInSeconds: 100
rtCacheTTL: 100 routeTableCacheTTLInSeconds: 100
` `
validateConfig(t, config) validateConfig(t, config)
} }
@ -1723,26 +1723,26 @@ func validateConfig(t *testing.T, config string) {
if azureCloud.CloudProviderRateLimitBucket != 5 { if azureCloud.CloudProviderRateLimitBucket != 5 {
t.Errorf("got incorrect value for CloudProviderRateLimitBucket") t.Errorf("got incorrect value for CloudProviderRateLimitBucket")
} }
if azureCloud.AvailabilitySetNodesCacheTTL != 100 { if azureCloud.AvailabilitySetNodesCacheTTLInSeconds != 100 {
t.Errorf("got incorrect value for availabilitySetNodesCacheTTL") t.Errorf("got incorrect value for availabilitySetNodesCacheTTLInSeconds")
} }
if azureCloud.VmssCacheTTL != 100 { if azureCloud.VmssCacheTTLInSeconds != 100 {
t.Errorf("got incorrect value for vmssCacheTTL") t.Errorf("got incorrect value for vmssCacheTTLInSeconds")
} }
if azureCloud.VmssVirtualMachinesCacheTTL != 100 { if azureCloud.VmssVirtualMachinesCacheTTLInSeconds != 100 {
t.Errorf("got incorrect value for vmssVirtualMachinesCacheTTL") t.Errorf("got incorrect value for vmssVirtualMachinesCacheTTLInSeconds")
} }
if azureCloud.VMCacheTTL != 100 { if azureCloud.VMCacheTTLInSeconds != 100 {
t.Errorf("got incorrect value for vmCacheTTL") t.Errorf("got incorrect value for vmCacheTTLInSeconds")
} }
if azureCloud.LbCacheTTL != 100 { if azureCloud.LoadBalancerCacheTTLInSeconds != 100 {
t.Errorf("got incorrect value for lbCacheTTL") t.Errorf("got incorrect value for loadBalancerCacheTTLInSeconds")
} }
if azureCloud.NsgCacheTTL != 100 { if azureCloud.NsgCacheTTLInSeconds != 100 {
t.Errorf("got incorrect value for nsgCacheTTL") t.Errorf("got incorrect value for nsgCacheTTLInSeconds")
} }
if azureCloud.RtCacheTTL != 100 { if azureCloud.RouteTableCacheTTLInSeconds != 100 {
t.Errorf("got incorrect value for rtCacheTTL") t.Errorf("got incorrect value for routeTableCacheTTLInSeconds")
} }
} }

24
staging/src/k8s.io/legacy-cloud-providers/azure/azure_vmss_cache.go
View File

@ -38,9 +38,9 @@ var (
vmssVirtualMachinesKey = "k8svmssVirtualMachinesKey" vmssVirtualMachinesKey = "k8svmssVirtualMachinesKey"
availabilitySetNodesKey = "k8sAvailabilitySetNodesKey" availabilitySetNodesKey = "k8sAvailabilitySetNodesKey"
availabilitySetNodesCacheTTLDefault = 900 // in seconds availabilitySetNodesCacheTTLDefaultInSeconds = 900
vmssCacheTTLDefault = 600 // in seconds vmssCacheTTLDefaultInSeconds = 600
vmssVirtualMachinesCacheTTLDefault = 600 // in seconds vmssVirtualMachinesCacheTTLDefaultInSeconds = 600
) )
type vmssVirtualMachinesEntry struct { type vmssVirtualMachinesEntry struct {
@ -87,10 +87,10 @@ func (ss *scaleSet) newVMSSCache() (*timedCache, error) {
return localCache, nil return localCache, nil
} }
if ss.Config.VmssCacheTTL == 0 { if ss.Config.VmssCacheTTLInSeconds == 0 {
return newTimedcache(time.Duration(vmssCacheTTLDefault)*time.Second, getter) ss.Config.VmssCacheTTLInSeconds = vmssCacheTTLDefaultInSeconds
} }
return newTimedcache(time.Duration(ss.Config.VmssCacheTTL)*time.Second, getter) return newTimedcache(time.Duration(ss.Config.VmssCacheTTLInSeconds)*time.Second, getter)
} }
func extractVmssVMName(name string) (string, string, error) { func extractVmssVMName(name string) (string, string, error) {
@ -150,10 +150,10 @@ func (ss *scaleSet) newVMSSVirtualMachinesCache() (*timedCache, error) {
return localCache, nil return localCache, nil
} }
if ss.Config.VmssVirtualMachinesCacheTTL == 0 { if ss.Config.VmssVirtualMachinesCacheTTLInSeconds == 0 {
return newTimedcache(time.Duration(vmssVirtualMachinesCacheTTLDefault)*time.Second, getter) ss.Config.VmssVirtualMachinesCacheTTLInSeconds = vmssVirtualMachinesCacheTTLDefaultInSeconds
} }
return newTimedcache(time.Duration(ss.Config.VmssVirtualMachinesCacheTTL)*time.Second, getter) return newTimedcache(time.Duration(ss.Config.VmssVirtualMachinesCacheTTLInSeconds)*time.Second, getter)
} }
func (ss *scaleSet) deleteCacheForNode(nodeName string) error { func (ss *scaleSet) deleteCacheForNode(nodeName string) error {
@ -192,10 +192,10 @@ func (ss *scaleSet) newAvailabilitySetNodesCache() (*timedCache, error) {
return localCache, nil return localCache, nil
} }
if ss.Config.AvailabilitySetNodesCacheTTL == 0 { if ss.Config.AvailabilitySetNodesCacheTTLInSeconds == 0 {
return newTimedcache(time.Duration(availabilitySetNodesCacheTTLDefault)*time.Second, getter) ss.Config.AvailabilitySetNodesCacheTTLInSeconds = availabilitySetNodesCacheTTLDefaultInSeconds
} }
return newTimedcache(time.Duration(ss.Config.AvailabilitySetNodesCacheTTL)*time.Second, getter) return newTimedcache(time.Duration(ss.Config.AvailabilitySetNodesCacheTTLInSeconds)*time.Second, getter)
} }
func (ss *scaleSet) isNodeManagedByAvailabilitySet(nodeName string, crt cacheReadType) (bool, error) { func (ss *scaleSet) isNodeManagedByAvailabilitySet(nodeName string, crt cacheReadType) (bool, error) {

32
staging/src/k8s.io/legacy-cloud-providers/azure/azure_wrap.go
View File

@ -35,10 +35,10 @@ import (
) )
var ( var (
vmCacheTTLDefault = 60 // in seconds vmCacheTTLDefaultInSeconds = 60
lbCacheTTLDefault = 120 // in seconds loadBalancerCacheTTLDefaultInSeconds = 120
nsgCacheTTLDefault = 120 // in seconds nsgCacheTTLDefaultInSeconds = 120
rtCacheTTLDefault = 120 // in seconds routeTableCacheTTLDefaultInSeconds = 120
azureNodeProviderIDRE = regexp.MustCompile(`^azure:///subscriptions/(?:.*)/resourceGroups/(?:.*)/providers/Microsoft.Compute/(?:.*)`) azureNodeProviderIDRE = regexp.MustCompile(`^azure:///subscriptions/(?:.*)/resourceGroups/(?:.*)/providers/Microsoft.Compute/(?:.*)`)
azureResourceGroupNameRE = regexp.MustCompile(`.*/subscriptions/(?:.*)/resourceGroups/(.+)/providers/(?:.*)`) azureResourceGroupNameRE = regexp.MustCompile(`.*/subscriptions/(?:.*)/resourceGroups/(.+)/providers/(?:.*)`)
@ -228,10 +228,10 @@ func (az *Cloud) newVMCache() (*timedCache, error) {
return &vm, nil return &vm, nil
} }
if az.VMCacheTTL == 0 { if az.VMCacheTTLInSeconds == 0 {
return newTimedcache(time.Duration(vmCacheTTLDefault)*time.Second, getter) az.VMCacheTTLInSeconds = vmCacheTTLDefaultInSeconds
} }
return newTimedcache(time.Duration(az.VMCacheTTL)*time.Second, getter) return newTimedcache(time.Duration(az.VMCacheTTLInSeconds)*time.Second, getter)
} }
func (az *Cloud) newLBCache() (*timedCache, error) { func (az *Cloud) newLBCache() (*timedCache, error) {
@ -253,10 +253,10 @@ func (az *Cloud) newLBCache() (*timedCache, error) {
return &lb, nil return &lb, nil
} }
if az.LbCacheTTL == 0 { if az.LoadBalancerCacheTTLInSeconds == 0 {
return newTimedcache(time.Duration(lbCacheTTLDefault)*time.Second, getter) az.LoadBalancerCacheTTLInSeconds = loadBalancerCacheTTLDefaultInSeconds
} }
return newTimedcache(time.Duration(az.LbCacheTTL)*time.Second, getter) return newTimedcache(time.Duration(az.LoadBalancerCacheTTLInSeconds)*time.Second, getter)
} }
func (az *Cloud) newNSGCache() (*timedCache, error) { func (az *Cloud) newNSGCache() (*timedCache, error) {
@ -277,10 +277,10 @@ func (az *Cloud) newNSGCache() (*timedCache, error) {
return &nsg, nil return &nsg, nil
} }
if az.NsgCacheTTL == 0 { if az.NsgCacheTTLInSeconds == 0 {
return newTimedcache(time.Duration(nsgCacheTTLDefault)*time.Second, getter) az.NsgCacheTTLInSeconds = nsgCacheTTLDefaultInSeconds
} }
return newTimedcache(time.Duration(az.NsgCacheTTL)*time.Second, getter) return newTimedcache(time.Duration(az.NsgCacheTTLInSeconds)*time.Second, getter)
} }
func (az *Cloud) newRouteTableCache() (*timedCache, error) { func (az *Cloud) newRouteTableCache() (*timedCache, error) {
@ -301,10 +301,10 @@ func (az *Cloud) newRouteTableCache() (*timedCache, error) {
return &rt, nil return &rt, nil
} }
if az.RtCacheTTL == 0 { if az.RouteTableCacheTTLInSeconds == 0 {
return newTimedcache(time.Duration(rtCacheTTLDefault)*time.Second, getter) az.RouteTableCacheTTLInSeconds = routeTableCacheTTLDefaultInSeconds
} }
return newTimedcache(time.Duration(az.RtCacheTTL)*time.Second, getter) return newTimedcache(time.Duration(az.RouteTableCacheTTLInSeconds)*time.Second, getter)
} }
func (az *Cloud) useStandardLoadBalancer() bool { func (az *Cloud) useStandardLoadBalancer() bool {