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
e2f4141b
Commit
e2f4141b
authored
Mar 22, 2016
by
k8s-merge-robot
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #23249 from fejta/hackcmd
Auto commit by PR queue bot
parents
88d50f30
4f22713a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
integration.go
cmd/integration/integration.go
+4
-4
No files found.
cmd/integration/integration.go
View file @
e2f4141b
...
...
@@ -388,7 +388,7 @@ func runStaticPodTest(c *client.Client, configFilePath string) {
id: static-pod-from-manifest
containers:
- name: static-container
image:
kubernetes/pause
`
,
image:
gcr.io/google_containers/pause:2.0
`
,
},
{
desc
:
"static-pod-from-spec"
,
...
...
@@ -401,7 +401,7 @@ containers:
"spec": {
"containers": [{
"name": "static-container",
"image": "
kubernetes/pause
"
"image": "
gcr.io/google_containers/pause:2.0
"
}]
}
}`
,
...
...
@@ -1108,7 +1108,7 @@ const (
"containers": [
{
"name": "redis",
"image": "
redis
",
"image": "
gcr.io/google_containers/redis:e2e
",
"volumeMounts": [{
"name": "redis-data",
"mountPath": "/data"
...
...
@@ -1116,7 +1116,7 @@ const (
},
{
"name": "guestbook",
"image": "g
oogle/guestbook-python-redis
",
"image": "g
cr.io/google_samples/gb-frontend:v3
",
"ports": [{
"name": "www",
"hostPort": 80,
...
...
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