mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-01 07:47:56 +00:00
Merge pull request #5504 from piosz/guestbook_example
Removed resource specification from guestbook example
This commit is contained in:
commit
a2e710b3fe
@ -42,7 +42,6 @@ Note that, although the redis server runs just with a single replica, we use rep
|
|||||||
"containers": [{
|
"containers": [{
|
||||||
"name": "redis-master",
|
"name": "redis-master",
|
||||||
"image": "dockerfile/redis",
|
"image": "dockerfile/redis",
|
||||||
"cpu": 100,
|
|
||||||
"ports": [{
|
"ports": [{
|
||||||
"containerPort": 6379, # containerPort: Where traffic to redis ultimately is routed to.
|
"containerPort": 6379, # containerPort: Where traffic to redis ultimately is routed to.
|
||||||
}]
|
}]
|
||||||
@ -162,7 +161,6 @@ Use the file `examples/guestbook/redis-slave-controller.json`, which looks like
|
|||||||
"containers": [{
|
"containers": [{
|
||||||
"name": "redis-slave",
|
"name": "redis-slave",
|
||||||
"image": "kubernetes/redis-slave:v2",
|
"image": "kubernetes/redis-slave:v2",
|
||||||
"cpu": 200,
|
|
||||||
"ports": [{"containerPort": 6379}]
|
"ports": [{"containerPort": 6379}]
|
||||||
}]
|
}]
|
||||||
}
|
}
|
||||||
@ -268,8 +266,6 @@ The pod is described in the file `examples/guestbook/frontend-controller.json`:
|
|||||||
"containers": [{
|
"containers": [{
|
||||||
"name": "php-redis",
|
"name": "php-redis",
|
||||||
"image": "kubernetes/example-guestbook-php-redis:v2",
|
"image": "kubernetes/example-guestbook-php-redis:v2",
|
||||||
"cpu": 100,
|
|
||||||
"memory": 50000000,
|
|
||||||
"ports": [{"name": "http-server", "containerPort": 80}]
|
"ports": [{"name": "http-server", "containerPort": 80}]
|
||||||
}]
|
}]
|
||||||
}
|
}
|
||||||
|
@ -13,8 +13,6 @@
|
|||||||
"containers": [{
|
"containers": [{
|
||||||
"name": "php-redis",
|
"name": "php-redis",
|
||||||
"image": "kubernetes/example-guestbook-php-redis:v2",
|
"image": "kubernetes/example-guestbook-php-redis:v2",
|
||||||
"cpu": 100,
|
|
||||||
"memory": 50000000,
|
|
||||||
"ports": [{"name": "http-server", "containerPort": 80}]
|
"ports": [{"name": "http-server", "containerPort": 80}]
|
||||||
}]
|
}]
|
||||||
}
|
}
|
||||||
|
@ -13,7 +13,6 @@
|
|||||||
"containers": [{
|
"containers": [{
|
||||||
"name": "redis-master",
|
"name": "redis-master",
|
||||||
"image": "dockerfile/redis",
|
"image": "dockerfile/redis",
|
||||||
"cpu": 100,
|
|
||||||
"ports": [{"containerPort": 6379}]
|
"ports": [{"containerPort": 6379}]
|
||||||
}]
|
}]
|
||||||
}
|
}
|
||||||
|
@ -13,7 +13,6 @@
|
|||||||
"containers": [{
|
"containers": [{
|
||||||
"name": "redis-slave",
|
"name": "redis-slave",
|
||||||
"image": "kubernetes/redis-slave:v2",
|
"image": "kubernetes/redis-slave:v2",
|
||||||
"cpu": 200,
|
|
||||||
"ports": [{"containerPort": 6379}]
|
"ports": [{"containerPort": 6379}]
|
||||||
}]
|
}]
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user