github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-07 11:13:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #56269 from edisonxiang/changewording

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 55557, 55504, 56269, 55604, 56202). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Change wording in OpenStack Provider

**What this PR does / why we need it**:

Change working from "dealy" into "delay" in OpenStack Provider.

**Release note**:

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-12-14 13:54:43 -08:00 committed by GitHub
commit 23ec8f0e36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go
View File

@ -52,7 +52,7 @@ const (
// going into ACTIVE loadbalancer provisioning status. Starting with 1 // going into ACTIVE loadbalancer provisioning status. Starting with 1
// seconds, multiplying by 1.2 with each step and taking 19 steps at maximum // seconds, multiplying by 1.2 with each step and taking 19 steps at maximum
// it will time out after 128s, which roughly corresponds to 120s // it will time out after 128s, which roughly corresponds to 120s
loadbalancerActiveInitDealy = 1 * time.Second loadbalancerActiveInitDelay = 1 * time.Second
loadbalancerActiveFactor = 1.2 loadbalancerActiveFactor = 1.2
loadbalancerActiveSteps = 19 loadbalancerActiveSteps = 19
@ -60,7 +60,7 @@ const (
// waiting for delete operation to complete. Starting with 1 // waiting for delete operation to complete. Starting with 1
// seconds, multiplying by 1.2 with each step and taking 13 steps at maximum // seconds, multiplying by 1.2 with each step and taking 13 steps at maximum
// it will time out after 32s, which roughly corresponds to 30s // it will time out after 32s, which roughly corresponds to 30s
loadbalancerDeleteInitDealy = 1 * time.Second loadbalancerDeleteInitDelay = 1 * time.Second
loadbalancerDeleteFactor = 1.2 loadbalancerDeleteFactor = 1.2
loadbalancerDeleteSteps = 13 loadbalancerDeleteSteps = 13
@ -328,7 +328,7 @@ func getSecurityGroupRules(client *gophercloud.ServiceClient, opts rules.ListOpt
func waitLoadbalancerActiveProvisioningStatus(client *gophercloud.ServiceClient, loadbalancerID string) (string, error) { func waitLoadbalancerActiveProvisioningStatus(client *gophercloud.ServiceClient, loadbalancerID string) (string, error) {
backoff := wait.Backoff{ backoff := wait.Backoff{
Duration: loadbalancerActiveInitDealy, Duration: loadbalancerActiveInitDelay,
Factor: loadbalancerActiveFactor, Factor: loadbalancerActiveFactor,
Steps: loadbalancerActiveSteps, Steps: loadbalancerActiveSteps,
} }
@ -358,7 +358,7 @@ func waitLoadbalancerActiveProvisioningStatus(client *gophercloud.ServiceClient,
func waitLoadbalancerDeleted(client *gophercloud.ServiceClient, loadbalancerID string) error { func waitLoadbalancerDeleted(client *gophercloud.ServiceClient, loadbalancerID string) error {
backoff := wait.Backoff{ backoff := wait.Backoff{
Duration: loadbalancerDeleteInitDealy, Duration: loadbalancerDeleteInitDelay,
Factor: loadbalancerDeleteFactor, Factor: loadbalancerDeleteFactor,
Steps: loadbalancerDeleteSteps, Steps: loadbalancerDeleteSteps,
} }

4
pkg/cloudprovider/providers/openstack/openstack_test.go
View File

@ -45,14 +45,14 @@ const (
// waiting for specified volume status. Starting with 1 // waiting for specified volume status. Starting with 1
// seconds, multiplying by 1.2 with each step and taking 13 steps at maximum // seconds, multiplying by 1.2 with each step and taking 13 steps at maximum
// it will time out after 32s, which roughly corresponds to 30s // it will time out after 32s, which roughly corresponds to 30s
volumeStatusInitDealy = 1 * time.Second volumeStatusInitDelay = 1 * time.Second
volumeStatusFactor = 1.2 volumeStatusFactor = 1.2
volumeStatusSteps = 13 volumeStatusSteps = 13
) )
func WaitForVolumeStatus(t *testing.T, os *OpenStack, volumeName string, status string) { func WaitForVolumeStatus(t *testing.T, os *OpenStack, volumeName string, status string) {
backoff := wait.Backoff{ backoff := wait.Backoff{
Duration: volumeStatusInitDealy, Duration: volumeStatusInitDelay,
Factor: volumeStatusFactor, Factor: volumeStatusFactor,
Steps: volumeStatusSteps, Steps: volumeStatusSteps,
} }