Skip to content

Commit 287e329

Browse files
zqingqing1zqingqing1
committed
suffix InSeconds to cacheTTL for clearification
1 parent 8953544 commit 287e329

File tree

4 files changed

+107
-107
lines changed

4 files changed

+107
-107
lines changed

‎staging/src/k8s.io/legacy-cloud-providers/azure/azure.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -175,21 +175,21 @@ type Config struct {
175175
// with LoadBalancerName
176176
LoadBalancerResourceGroup string `json:"loadBalancerResourceGroup,omitempty" yaml:"loadBalancerResourceGroup,omitempty"`
177177

178-
// AvailabilitySetNodesCacheTTL sets the Cache TTL for availabilitySetNodesCache
178+
// AvailabilitySetNodesCacheTTLInSeconds sets the Cache TTL for availabilitySetNodesCache
179179
// if not set, will use default value
180-
AvailabilitySetNodesCacheTTL int `json:"availabilitySetNodesCacheTTL,omitempty" yaml:"availabilitySetNodesCacheTTL,omitempty"`
181-
// VmssCacheTTL sets the cache TTL for VMSS
182-
VmssCacheTTL int `json:"vmssCacheTTL,omitempty" yaml:"vmssCacheTTL,omitempty"`
183-
// VmssVirtualMachinesCacheTTL sets the cache TTL for vmssVirtualMachines
184-
VmssVirtualMachinesCacheTTL int `json:"vmssVirtualMachinesCacheTTL,omitempty" yaml:"vmssVirtualMachinesCacheTTL,omitempty"`
185-
// VmCacheTTL sets the cache TTL for vm
186-
VMCacheTTL int `json:"vmCacheTTL,omitempty" yaml:"vmCacheTTL,omitempty"`
187-
// LbCacheTTL sets the cache TTL for load balancer
188-
LbCacheTTL int `json:"lbCacheTTL,omitempty" yaml:"lbcacheTTL,omitempty"`
189-
// NsgCacheTTL sets the cache TTL for network security group
190-
NsgCacheTTL int `json:"nsgCacheTTL,omityempty" yaml:"nsgCacheTTL,omitempty"`
191-
// RtCacheTTL sets the cache TTL for route table
192-
RtCacheTTL int `json:"rtCacheTTL,omitempty" yaml:"rtCacheTTL,omitempty"`
180+
AvailabilitySetNodesCacheTTLInSeconds int `json:"availabilitySetNodesCacheTTLInSeconds,omitempty" yaml:"availabilitySetNodesCacheTTLInSeconds,omitempty"`
181+
// VmssCacheTTLInSeconds sets the cache TTL for VMSS
182+
VmssCacheTTLInSeconds int `json:"vmssCacheTTLInSeconds,omitempty" yaml:"vmssCacheTTLInSeconds,omitempty"`
183+
// VmssVirtualMachinesCacheTTLInSeconds sets the cache TTL for vmssVirtualMachines
184+
VmssVirtualMachinesCacheTTLInSeconds int `json:"vmssVirtualMachinesCacheTTLInSeconds,omitempty" yaml:"vmssVirtualMachinesCacheTTLInSeconds,omitempty"`
185+
// VmCacheTTLInSeconds sets the cache TTL for vm
186+
VMCacheTTLInSeconds int `json:"vmCacheTTLInSeconds,omitempty" yaml:"vmCacheTTLInSeconds,omitempty"`
187+
// LoadBalancerCacheTTLInSeconds sets the cache TTL for load balancer
188+
LoadBalancerCacheTTLInSeconds int `json:"loadBalancerCacheTTLInSeconds,omitempty" yaml:"loadBalancerCacheTTLInSeconds,omitempty"`
189+
// NsgCacheTTLInSeconds sets the cache TTL for network security group
190+
NsgCacheTTLInSeconds int `json:"nsgCacheTTLInSeconds,omitempty" yaml:"nsgCacheTTLInSeconds,omitempty"`
191+
// RouteTableCacheTTLInSeconds sets the cache TTL for route table
192+
RouteTableCacheTTLInSeconds int `json:"routeTableCacheTTLInSeconds,omitempty" yaml:"routeTableCacheTTLInSeconds,omitempty"`
193193
}
194194

195195
var _ cloudprovider.Interface = (*Cloud)(nil)

‎staging/src/k8s.io/legacy-cloud-providers/azure/azure_test.go‎

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,13 @@ func TestParseConfig(t *testing.T) {
5959
"CloudProviderRateLimitBucketWrite": 1,
6060
"cloudProviderRateLimitQPS": 1,
6161
"CloudProviderRateLimitQPSWrite": 1,
62-
"availabilitySetNodesCacheTTL": 100,
63-
"vmssCacheTTL": 100,
64-
"vmssVirtualMachinesCacheTTL": 100,
65-
"vmCacheTTL": 100,
66-
"lbCacheTTL": 100,
67-
"nsgCacheTTL": 100,
68-
"rtCacheTTL": 100,
62+
"availabilitySetNodesCacheTTLInSeconds": 100,
63+
"vmssCacheTTLInSeconds": 100,
64+
"vmssVirtualMachinesCacheTTLInSeconds": 100,
65+
"vmCacheTTLInSeconds": 100,
66+
"loadBalancerCacheTTLInSeconds": 100,
67+
"nsgCacheTTLInSeconds": 100,
68+
"routeTableCacheTTLInSeconds": 100,
6969
"location": "location",
7070
"maximumLoadBalancerRuleCount": 1,
7171
"primaryAvailabilitySetName": "primaryAvailabilitySetName",
@@ -94,36 +94,36 @@ func TestParseConfig(t *testing.T) {
9494
TenantID: "tenantId",
9595
UseManagedIdentityExtension: true,
9696
},
97-
CloudProviderBackoff: true,
98-
CloudProviderBackoffDuration: 1,
99-
CloudProviderBackoffExponent: 1,
100-
CloudProviderBackoffJitter: 1,
101-
CloudProviderBackoffRetries: 1,
102-
CloudProviderRateLimit: true,
103-
CloudProviderRateLimitBucket: 1,
104-
CloudProviderRateLimitBucketWrite: 1,
105-
CloudProviderRateLimitQPS: 1,
106-
CloudProviderRateLimitQPSWrite: 1,
107-
AvailabilitySetNodesCacheTTL: 100,
108-
VmssCacheTTL: 100,
109-
VmssVirtualMachinesCacheTTL: 100,
110-
VMCacheTTL: 100,
111-
LbCacheTTL: 100,
112-
NsgCacheTTL: 100,
113-
RtCacheTTL: 100,
114-
Location: "location",
115-
MaximumLoadBalancerRuleCount: 1,
116-
PrimaryAvailabilitySetName: "primaryAvailabilitySetName",
117-
PrimaryScaleSetName: "primaryScaleSetName",
118-
ResourceGroup: "resourcegroup",
119-
RouteTableName: "routeTableName",
120-
RouteTableResourceGroup: "routeTableResourceGroup",
121-
SecurityGroupName: "securityGroupName",
122-
SubnetName: "subnetName",
123-
UseInstanceMetadata: true,
124-
VMType: "standard",
125-
VnetName: "vnetName",
126-
VnetResourceGroup: "vnetResourceGroup",
97+
CloudProviderBackoff: true,
98+
CloudProviderBackoffDuration: 1,
99+
CloudProviderBackoffExponent: 1,
100+
CloudProviderBackoffJitter: 1,
101+
CloudProviderBackoffRetries: 1,
102+
CloudProviderRateLimit: true,
103+
CloudProviderRateLimitBucket: 1,
104+
CloudProviderRateLimitBucketWrite: 1,
105+
CloudProviderRateLimitQPS: 1,
106+
CloudProviderRateLimitQPSWrite: 1,
107+
AvailabilitySetNodesCacheTTLInSeconds: 100,
108+
VmssCacheTTLInSeconds: 100,
109+
VmssVirtualMachinesCacheTTLInSeconds: 100,
110+
VMCacheTTLInSeconds: 100,
111+
LoadBalancerCacheTTLInSeconds: 100,
112+
NsgCacheTTLInSeconds: 100,
113+
RouteTableCacheTTLInSeconds: 100,
114+
Location: "location",
115+
MaximumLoadBalancerRuleCount: 1,
116+
PrimaryAvailabilitySetName: "primaryAvailabilitySetName",
117+
PrimaryScaleSetName: "primaryScaleSetName",
118+
ResourceGroup: "resourcegroup",
119+
RouteTableName: "routeTableName",
120+
RouteTableResourceGroup: "routeTableResourceGroup",
121+
SecurityGroupName: "securityGroupName",
122+
SubnetName: "subnetName",
123+
UseInstanceMetadata: true,
124+
VMType: "standard",
125+
VnetName: "vnetName",
126+
VnetResourceGroup: "vnetResourceGroup",
127127
}
128128

129129
buffer := bytes.NewBufferString(azureConfig)
@@ -1587,13 +1587,13 @@ func TestNewCloudFromJSON(t *testing.T) {
15871587
"cloudProviderRatelimit": true,
15881588
"cloudProviderRateLimitQPS": 0.5,
15891589
"cloudProviderRateLimitBucket": 5,
1590-
"availabilitySetNodesCacheTTL": 100,
1591-
"vmssCacheTTL": 100,
1592-
"vmssVirtualMachinesCacheTTL": 100,
1593-
"vmCacheTTL": 100,
1594-
"lbCacheTTL": 100,
1595-
"nsgCacheTTL": 100,
1596-
"rtCacheTTL": 100,
1590+
"availabilitySetNodesCacheTTLInSeconds": 100,
1591+
"vmssCacheTTLInSeconds": 100,
1592+
"vmssVirtualMachinesCacheTTLInSeconds": 100,
1593+
"vmCacheTTLInSeconds": 100,
1594+
"loadBalancerCacheTTLInSeconds": 100,
1595+
"nsgCacheTTLInSeconds": 100,
1596+
"routeTableCacheTTLInSeconds": 100,
15971597
}`
15981598
validateConfig(t, config)
15991599
}
@@ -1643,13 +1643,13 @@ cloudProviderBackoffJitter: 1.0
16431643
cloudProviderRatelimit: true
16441644
cloudProviderRateLimitQPS: 0.5
16451645
cloudProviderRateLimitBucket: 5
1646-
availabilitySetNodesCacheTTL: 100
1647-
vmssCacheTTL: 100
1648-
vmssVirtualMachinesCacheTTL: 100
1649-
vmCacheTTL: 100
1650-
lbCacheTTL: 100
1651-
nsgCacheTTL: 100
1652-
rtCacheTTL: 100
1646+
availabilitySetNodesCacheTTLInSeconds: 100
1647+
vmssCacheTTLInSeconds: 100
1648+
vmssVirtualMachinesCacheTTLInSeconds: 100
1649+
vmCacheTTLInSeconds: 100
1650+
loadBalancerCacheTTLInSeconds: 100
1651+
nsgCacheTTLInSeconds: 100
1652+
routeTableCacheTTLInSeconds: 100
16531653
`
16541654
validateConfig(t, config)
16551655
}
@@ -1723,26 +1723,26 @@ func validateConfig(t *testing.T, config string) {
17231723
if azureCloud.CloudProviderRateLimitBucket != 5 {
17241724
t.Errorf("got incorrect value for CloudProviderRateLimitBucket")
17251725
}
1726-
if azureCloud.AvailabilitySetNodesCacheTTL != 100 {
1727-
t.Errorf("got incorrect value for availabilitySetNodesCacheTTL")
1726+
if azureCloud.AvailabilitySetNodesCacheTTLInSeconds != 100 {
1727+
t.Errorf("got incorrect value for availabilitySetNodesCacheTTLInSeconds")
17281728
}
1729-
if azureCloud.VmssCacheTTL != 100 {
1730-
t.Errorf("got incorrect value for vmssCacheTTL")
1729+
if azureCloud.VmssCacheTTLInSeconds != 100 {
1730+
t.Errorf("got incorrect value for vmssCacheTTLInSeconds")
17311731
}
1732-
if azureCloud.VmssVirtualMachinesCacheTTL != 100 {
1733-
t.Errorf("got incorrect value for vmssVirtualMachinesCacheTTL")
1732+
if azureCloud.VmssVirtualMachinesCacheTTLInSeconds != 100 {
1733+
t.Errorf("got incorrect value for vmssVirtualMachinesCacheTTLInSeconds")
17341734
}
1735-
if azureCloud.VMCacheTTL != 100 {
1736-
t.Errorf("got incorrect value for vmCacheTTL")
1735+
if azureCloud.VMCacheTTLInSeconds != 100 {
1736+
t.Errorf("got incorrect value for vmCacheTTLInSeconds")
17371737
}
1738-
if azureCloud.LbCacheTTL != 100 {
1739-
t.Errorf("got incorrect value for lbCacheTTL")
1738+
if azureCloud.LoadBalancerCacheTTLInSeconds != 100 {
1739+
t.Errorf("got incorrect value for loadBalancerCacheTTLInSeconds")
17401740
}
1741-
if azureCloud.NsgCacheTTL != 100 {
1742-
t.Errorf("got incorrect value for nsgCacheTTL")
1741+
if azureCloud.NsgCacheTTLInSeconds != 100 {
1742+
t.Errorf("got incorrect value for nsgCacheTTLInSeconds")
17431743
}
1744-
if azureCloud.RtCacheTTL != 100 {
1745-
t.Errorf("got incorrect value for rtCacheTTL")
1744+
if azureCloud.RouteTableCacheTTLInSeconds != 100 {
1745+
t.Errorf("got incorrect value for routeTableCacheTTLInSeconds")
17461746
}
17471747
}
17481748

‎staging/src/k8s.io/legacy-cloud-providers/azure/azure_vmss_cache.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ var (
3838
vmssVirtualMachinesKey = "k8svmssVirtualMachinesKey"
3939
availabilitySetNodesKey = "k8sAvailabilitySetNodesKey"
4040

41-
availabilitySetNodesCacheTTLDefault = 900 // in seconds
42-
vmssCacheTTLDefault = 600 // in seconds
43-
vmssVirtualMachinesCacheTTLDefault = 600 // in seconds
41+
availabilitySetNodesCacheTTLDefaultInSeconds = 900
42+
vmssCacheTTLDefaultInSeconds = 600
43+
vmssVirtualMachinesCacheTTLDefaultInSeconds = 600
4444
)
4545

4646
type vmssVirtualMachinesEntry struct {
@@ -87,10 +87,10 @@ func (ss *scaleSet) newVMSSCache() (*timedCache, error) {
8787
return localCache, nil
8888
}
8989

90-
if ss.Config.VmssCacheTTL == 0 {
91-
return newTimedcache(time.Duration(vmssCacheTTLDefault)*time.Second, getter)
90+
if ss.Config.VmssCacheTTLInSeconds == 0 {
91+
ss.Config.VmssCacheTTLInSeconds = vmssCacheTTLDefaultInSeconds
9292
}
93-
return newTimedcache(time.Duration(ss.Config.VmssCacheTTL)*time.Second, getter)
93+
return newTimedcache(time.Duration(ss.Config.VmssCacheTTLInSeconds)*time.Second, getter)
9494
}
9595

9696
func extractVmssVMName(name string) (string, string, error) {
@@ -150,10 +150,10 @@ func (ss *scaleSet) newVMSSVirtualMachinesCache() (*timedCache, error) {
150150
return localCache, nil
151151
}
152152

153-
if ss.Config.VmssVirtualMachinesCacheTTL == 0 {
154-
return newTimedcache(time.Duration(vmssVirtualMachinesCacheTTLDefault)*time.Second, getter)
153+
if ss.Config.VmssVirtualMachinesCacheTTLInSeconds == 0 {
154+
ss.Config.VmssVirtualMachinesCacheTTLInSeconds = vmssVirtualMachinesCacheTTLDefaultInSeconds
155155
}
156-
return newTimedcache(time.Duration(ss.Config.VmssVirtualMachinesCacheTTL)*time.Second, getter)
156+
return newTimedcache(time.Duration(ss.Config.VmssVirtualMachinesCacheTTLInSeconds)*time.Second, getter)
157157
}
158158

159159
func (ss *scaleSet) deleteCacheForNode(nodeName string) error {
@@ -192,10 +192,10 @@ func (ss *scaleSet) newAvailabilitySetNodesCache() (*timedCache, error) {
192192
return localCache, nil
193193
}
194194

195-
if ss.Config.AvailabilitySetNodesCacheTTL == 0 {
196-
return newTimedcache(time.Duration(availabilitySetNodesCacheTTLDefault)*time.Second, getter)
195+
if ss.Config.AvailabilitySetNodesCacheTTLInSeconds == 0 {
196+
ss.Config.AvailabilitySetNodesCacheTTLInSeconds = availabilitySetNodesCacheTTLDefaultInSeconds
197197
}
198-
return newTimedcache(time.Duration(ss.Config.AvailabilitySetNodesCacheTTL)*time.Second, getter)
198+
return newTimedcache(time.Duration(ss.Config.AvailabilitySetNodesCacheTTLInSeconds)*time.Second, getter)
199199
}
200200

201201
func (ss *scaleSet) isNodeManagedByAvailabilitySet(nodeName string, crt cacheReadType) (bool, error) {

‎staging/src/k8s.io/legacy-cloud-providers/azure/azure_wrap.go‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ import (
3535
)
3636

3737
var (
38-
vmCacheTTLDefault = 60 // in seconds
39-
lbCacheTTLDefault = 120 // in seconds
40-
nsgCacheTTLDefault = 120 // in seconds
41-
rtCacheTTLDefault = 120 // in seconds
38+
vmCacheTTLDefaultInSeconds = 60
39+
loadBalancerCacheTTLDefaultInSeconds = 120
40+
nsgCacheTTLDefaultInSeconds = 120
41+
routeTableCacheTTLDefaultInSeconds = 120
4242

4343
azureNodeProviderIDRE = regexp.MustCompile(`^azure:///subscriptions/(?:.*)/resourceGroups/(?:.*)/providers/Microsoft.Compute/(?:.*)`)
4444
azureResourceGroupNameRE = regexp.MustCompile(`.*/subscriptions/(?:.*)/resourceGroups/(.+)/providers/(?:.*)`)
@@ -228,10 +228,10 @@ func (az *Cloud) newVMCache() (*timedCache, error) {
228228
return &vm, nil
229229
}
230230

231-
if az.VMCacheTTL == 0 {
232-
return newTimedcache(time.Duration(vmCacheTTLDefault)*time.Second, getter)
231+
if az.VMCacheTTLInSeconds == 0 {
232+
az.VMCacheTTLInSeconds = vmCacheTTLDefaultInSeconds
233233
}
234-
return newTimedcache(time.Duration(az.VMCacheTTL)*time.Second, getter)
234+
return newTimedcache(time.Duration(az.VMCacheTTLInSeconds)*time.Second, getter)
235235
}
236236

237237
func (az *Cloud) newLBCache() (*timedCache, error) {
@@ -253,10 +253,10 @@ func (az *Cloud) newLBCache() (*timedCache, error) {
253253
return &lb, nil
254254
}
255255

256-
if az.LbCacheTTL == 0 {
257-
return newTimedcache(time.Duration(lbCacheTTLDefault)*time.Second, getter)
256+
if az.LoadBalancerCacheTTLInSeconds == 0 {
257+
az.LoadBalancerCacheTTLInSeconds = loadBalancerCacheTTLDefaultInSeconds
258258
}
259-
return newTimedcache(time.Duration(az.LbCacheTTL)*time.Second, getter)
259+
return newTimedcache(time.Duration(az.LoadBalancerCacheTTLInSeconds)*time.Second, getter)
260260
}
261261

262262
func (az *Cloud) newNSGCache() (*timedCache, error) {
@@ -277,10 +277,10 @@ func (az *Cloud) newNSGCache() (*timedCache, error) {
277277
return &nsg, nil
278278
}
279279

280-
if az.NsgCacheTTL == 0 {
281-
return newTimedcache(time.Duration(nsgCacheTTLDefault)*time.Second, getter)
280+
if az.NsgCacheTTLInSeconds == 0 {
281+
az.NsgCacheTTLInSeconds = nsgCacheTTLDefaultInSeconds
282282
}
283-
return newTimedcache(time.Duration(az.NsgCacheTTL)*time.Second, getter)
283+
return newTimedcache(time.Duration(az.NsgCacheTTLInSeconds)*time.Second, getter)
284284
}
285285

286286
func (az *Cloud) newRouteTableCache() (*timedCache, error) {
@@ -301,10 +301,10 @@ func (az *Cloud) newRouteTableCache() (*timedCache, error) {
301301
return &rt, nil
302302
}
303303

304-
if az.RtCacheTTL == 0 {
305-
return newTimedcache(time.Duration(rtCacheTTLDefault)*time.Second, getter)
304+
if az.RouteTableCacheTTLInSeconds == 0 {
305+
az.RouteTableCacheTTLInSeconds = routeTableCacheTTLDefaultInSeconds
306306
}
307-
return newTimedcache(time.Duration(az.RtCacheTTL)*time.Second, getter)
307+
return newTimedcache(time.Duration(az.RouteTableCacheTTLInSeconds)*time.Second, getter)
308308
}
309309

310310
func (az *Cloud) useStandardLoadBalancer() bool {

0 commit comments

Comments
 (0)