github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #26524 from luxas/fix_test_typo

Browse Source 
Automatic merge from submit-queue

Fix comment typos in #25972

@ixdy
This commit is contained in:
k8s-merge-robot
2016-05-30 12:29:02 -07:00
parent 5a09908975 46525a7d19
commit 8a29f67fc1
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubelet/app/options/options.go
View File

@@ -40,7 +40,7 @@ const (
defaultRootDir = "/var/lib/kubelet" defaultRootDir = "/var/lib/kubelet"
experimentalFlannelOverlay = false experimentalFlannelOverlay = false
// When these values are updated, also update test/e2e/util.go // When these values are updated, also update test/e2e/framework/util.go
defaultPodInfraContainerImageName = "gcr.io/google_containers/pause" defaultPodInfraContainerImageName = "gcr.io/google_containers/pause"
defaultPodInfraContainerImageVersion = "3.0" defaultPodInfraContainerImageVersion = "3.0"
) )

6
test/e2e/framework/util.go
View File

@@ -140,7 +140,7 @@ const (
// before e2es. // before e2es.
var ImagePullerLabels = map[string]string{"name": "e2e-image-puller"} var ImagePullerLabels = map[string]string{"name": "e2e-image-puller"}
// GetServerArchitecture fetches the architecture of the target cluster. // GetServerArchitecture fetches the architecture of the cluster's apiserver.
func GetServerArchitecture(c *client.Client) string { func GetServerArchitecture(c *client.Client) string {
arch := "" arch := ""
sVer, err := c.Discovery().ServerVersion() sVer, err := c.Discovery().ServerVersion()
@@ -156,12 +156,12 @@ func GetServerArchitecture(c *client.Client) string {
return arch return arch
} }
// GetPauseImageName fetches the architecture of the target cluster and chooses the pause image to use. // GetPauseImageName fetches the pause image name for the same architecture as the apiserver.
func GetPauseImageName(c *client.Client) string { func GetPauseImageName(c *client.Client) string {
return currentPodInfraContainerImageName + "-" + GetServerArchitecture(c) + ":" + currentPodInfraContainerImageVersion return currentPodInfraContainerImageName + "-" + GetServerArchitecture(c) + ":" + currentPodInfraContainerImageVersion
} }
// GetPauseImageNameForHostArch() fetches the pause image for the same architecture the machine is running on. // GetPauseImageNameForHostArch fetches the pause image name for the same architecture the test is running on.
func GetPauseImageNameForHostArch() string { func GetPauseImageNameForHostArch() string {
return currentPodInfraContainerImageName + "-" + goRuntime.GOARCH + ":" + currentPodInfraContainerImageVersion return currentPodInfraContainerImageName + "-" + goRuntime.GOARCH + ":" + currentPodInfraContainerImageVersion
} }