Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
46525a7d
Commit
46525a7d
authored
May 30, 2016
by
Lucas Käldström
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix comment typos in #25972
parent
5643b749
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
options.go
cmd/kubelet/app/options/options.go
+1
-1
util.go
test/e2e/framework/util.go
+3
-3
No files found.
cmd/kubelet/app/options/options.go
View file @
46525a7d
...
@@ -40,7 +40,7 @@ const (
...
@@ -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"
)
)
...
...
test/e2e/framework/util.go
View file @
46525a7d
...
@@ -140,7 +140,7 @@ const (
...
@@ -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 clust
er.
// GetServerArchitecture fetches the architecture of the
cluster's apiserv
er.
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 {
...
@@ -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
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment