From e6031e3190ab7f2012d7c75051c312b9d751a67e Mon Sep 17 00:00:00 2001 From: Piotr Szczesniak Date: Mon, 16 Mar 2015 14:27:09 +0100 Subject: [PATCH] Removed resource specification from guestbook example The reason is partially #5503 but also I think it makes guestbook more complicated and is not necessary there. --- examples/guestbook/README.md | 4 ---- examples/guestbook/frontend-controller.json | 2 -- examples/guestbook/redis-master-controller.json | 1 - examples/guestbook/redis-slave-controller.json | 1 - 4 files changed, 8 deletions(-) diff --git a/examples/guestbook/README.md b/examples/guestbook/README.md index b46058758e9..38e397a34b6 100644 --- a/examples/guestbook/README.md +++ b/examples/guestbook/README.md @@ -42,7 +42,6 @@ Note that, although the redis server runs just with a single replica, we use rep "containers": [{ "name": "redis-master", "image": "dockerfile/redis", - "cpu": 100, "ports": [{ "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": [{ "name": "redis-slave", "image": "kubernetes/redis-slave:v2", - "cpu": 200, "ports": [{"containerPort": 6379}] }] } @@ -268,8 +266,6 @@ The pod is described in the file `examples/guestbook/frontend-controller.json`: "containers": [{ "name": "php-redis", "image": "kubernetes/example-guestbook-php-redis:v2", - "cpu": 100, - "memory": 50000000, "ports": [{"name": "http-server", "containerPort": 80}] }] } diff --git a/examples/guestbook/frontend-controller.json b/examples/guestbook/frontend-controller.json index 3fac9eb1427..6764d7434b4 100644 --- a/examples/guestbook/frontend-controller.json +++ b/examples/guestbook/frontend-controller.json @@ -13,8 +13,6 @@ "containers": [{ "name": "php-redis", "image": "kubernetes/example-guestbook-php-redis:v2", - "cpu": 100, - "memory": 50000000, "ports": [{"name": "http-server", "containerPort": 80}] }] } diff --git a/examples/guestbook/redis-master-controller.json b/examples/guestbook/redis-master-controller.json index a25ad9aa431..ab75d25a71c 100644 --- a/examples/guestbook/redis-master-controller.json +++ b/examples/guestbook/redis-master-controller.json @@ -13,7 +13,6 @@ "containers": [{ "name": "redis-master", "image": "dockerfile/redis", - "cpu": 100, "ports": [{"containerPort": 6379}] }] } diff --git a/examples/guestbook/redis-slave-controller.json b/examples/guestbook/redis-slave-controller.json index 8e9477c606b..38e3bb60df3 100644 --- a/examples/guestbook/redis-slave-controller.json +++ b/examples/guestbook/redis-slave-controller.json @@ -13,7 +13,6 @@ "containers": [{ "name": "redis-slave", "image": "kubernetes/redis-slave:v2", - "cpu": 200, "ports": [{"containerPort": 6379}] }] }