github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #314 from thockin/valid2 

Fix examples to set manifest ID and version
pull/6/head
brendandburns 2014-06-30 20:21:32 -07:00
parent 65a62278b1 9affd6d260
commit d53c56dd29
8 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/examples/controller.json
View File

@ -6,6 +6,8 @@
"podTemplate": {
"desiredState": {
"manifest": {
"version": "v1beta1",
"id": "nginxController",
"containers": [{
"name": "nginx",
"image": "dockerfile/nginx",

6
api/examples/pod-list.json
View File

@ -8,6 +8,8 @@
},
"desiredState": {
"manifest": {
"version": "v1beta1",
"id": "my-pod-1",
"containers": [{
"image": "dockerfile/nginx",
"ports": [{
@ -29,6 +31,8 @@
},
"desiredState": {
"manifest": {
"version": "v1beta1",
"id": "my-pod-2",
"containers": [{
"image": "dockerfile/nginx",
"ports": [{
@ -43,4 +47,4 @@
}
}
]
}
}

2
api/examples/pod.json
View File

@ -2,6 +2,8 @@
"id": "php",
"desiredState": {
"manifest": {
"version": "v1beta1",
"id": "php",
"containers": [{
"image": "dockerfile/nginx",
"ports": [{

2
cmd/integration/integration.go
View File

@ -161,7 +161,7 @@ containers:
image: dockerfile/redis
volumeMounts:
- name: redis-data
path: /data
mountPath: /data
- name: guestbook
image: google/guestbook-python-redis

2
examples/guestbook/frontend-controller.json
View File

@ -6,6 +6,8 @@
"podTemplate": {
"desiredState": {
"manifest": {
"version": "v1beta1",
"id": "frontendController",
"containers": [{
"image": "brendanburns/php-redis",
"ports": [{"containerPort": 80, "hostPort": 8000}]

6
examples/guestbook/guestbook.md
View File

@ -21,6 +21,8 @@ Create a file named `redis-master.json` describing a single pod, which runs a re
"id": "redis-master-2",
"desiredState": {
"manifest": {
"version": "v1beta1",
"id": "redis-master-2",
"containers": [{
"name": "master",
"image": "dockerfile/redis",
@ -112,6 +114,8 @@ Create a file named `redis-slave-controller.json` that contains:
"podTemplate": {
"desiredState": {
"manifest": {
"version": "v1beta1",
"id": "redisSlaveController",
"containers": [{
"image": "brendanburns/redis-slave",
"ports": [{"containerPort": 6379, "hostPort": 6380}]
@ -195,6 +199,8 @@ Create a file named `frontend-controller.json`:
"podTemplate": {
"desiredState": {
"manifest": {
"version": "v1beta1",
"id": "frontendController",
"containers": [{
"image": "brendanburns/php-redis",
"ports": [{"containerPort": 80, "hostPort": 8000}]

2
examples/guestbook/redis-master.json
View File

@ -2,6 +2,8 @@
"id": "redis-master-2",
"desiredState": {
"manifest": {
"version": "v1beta1",
"id": "redis-master-2",
"containers": [{
"name": "master",
"image": "dockerfile/redis",

2
examples/guestbook/redis-slave-controller.json
View File

@ -6,6 +6,8 @@
"podTemplate": {
"desiredState": {
"manifest": {
"version": "v1beta1",
"id": "redisSlaveController",
"containers": [{
"image": "brendanburns/redis-slave",
"ports": [{"containerPort": 6379, "hostPort": 6380}]