github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #54036 from xiangpengzhao/no-formatting

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 54036, 53739). 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>.

Remove Sprintf when there are no placeholders in the formatting.

**What this PR does / why we need it**:
Minor cleanup.

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-10-17 06:49:14 -07:00 committed by GitHub
commit e75cd21afa
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/e2e/common/downward_api.go
View File

@ -148,10 +148,10 @@ var _ = Describe("[sig-api-machinery] Downward API", func() {
}, },
} }
expectations := []string{ expectations := []string{
fmt.Sprintf("CPU_LIMIT=2"), "CPU_LIMIT=2",
fmt.Sprintf("MEMORY_LIMIT=67108864"), "MEMORY_LIMIT=67108864",
fmt.Sprintf("CPU_REQUEST=1"), "CPU_REQUEST=1",
fmt.Sprintf("MEMORY_REQUEST=33554432"), "MEMORY_REQUEST=33554432",
} }
testDownwardAPI(f, podName, env, expectations) testDownwardAPI(f, podName, env, expectations)
@ -178,8 +178,8 @@ var _ = Describe("[sig-api-machinery] Downward API", func() {
}, },
} }
expectations := []string{ expectations := []string{
fmt.Sprintf("CPU_LIMIT=[1-9]"), "CPU_LIMIT=[1-9]",
fmt.Sprintf("MEMORY_LIMIT=[1-9]"), "MEMORY_LIMIT=[1-9]",
} }
pod := &v1.Pod{ pod := &v1.Pod{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
@ -218,7 +218,7 @@ var _ = Describe("[sig-api-machinery] Downward API", func() {
} }
expectations := []string{ expectations := []string{
fmt.Sprintf("POD_UID=[a-z0-9]{8}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{12}"), "POD_UID=[a-z0-9]{8}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{12}",
} }
testDownwardAPI(f, podName, env, expectations) testDownwardAPI(f, podName, env, expectations)