Commit 8a29f67f authored by k8s-merge-robot's avatar k8s-merge-robot

Merge pull request #26524 from luxas/fix_test_typo

Automatic merge from submit-queue Fix comment typos in #25972 @ixdy
parents 5a099089 46525a7d
......@@ -40,7 +40,7 @@ const (
defaultRootDir = "/var/lib/kubelet"
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"
defaultPodInfraContainerImageVersion = "3.0"
)
......
......@@ -140,7 +140,7 @@ const (
// before e2es.
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 {
arch := ""
sVer, err := c.Discovery().ServerVersion()
......@@ -156,12 +156,12 @@ func GetServerArchitecture(c *client.Client) string {
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 {
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 {
return currentPodInfraContainerImageName + "-" + goRuntime.GOARCH + ":" + currentPodInfraContainerImageVersion
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment