Update guestbook example to use replication controller instead of a naked pod. #4267

rsokolowski · 2015-02-10T00:23:54Z

Bunch of changes in addition and also to make the change work:

Added redis-master-controller.json that replaces redis-master.json.
Removed HostPort from resources in the json files.
Expanded README.md to include 6th step that sets up service for frontend.
Reexecuted commands from the example and pasted up to date output.
Bunch of changes in test files that were relying on redis-master.json file that generated pod resource. I've updated the relevant calls to use replication controller resource.

bgrant0607 · 2015-02-10T01:19:43Z

Tests failed with:

F0210 00:53:56.836262   14857 create.go:79] the path "examples/guestbook/redis-master.json" does not exist

bgrant0607 · 2015-02-10T01:23:49Z

Thanks @rsokolowski! @ddysher could you take a look?

ddysher · 2015-02-10T01:28:37Z

Sure, I'll take a look.

ddysher · 2015-02-10T21:15:20Z

examples/guestbook/README.md

@@ -46,7 +54,7 @@ Use the file `examples/guestbook/redis-master.json` which describes a single pod
 Create the redis pod in your Kubernetes cluster by running:

 ```shell
-$ cluster/kubectl.sh create -f examples/guestbook/redis-master.json
+$ cluster/kubectl.sh create -f examples/guestbook/redis-master-controller.json
 ```



Also show that using cluster/kubectl.sh get rc will list the replication controller.

ddysher · 2015-02-10T21:40:23Z

@rsokolowski Thanks!

I haven't looked at kubectl unittest yet. But I think you'll also need to fix guestbook.sh in e2e-suite. Can you fix it, rebase/squash?

rsokolowski · 2015-02-16T15:03:29Z

Thanks for comments @ddysher. PTAL.

ddysher · 2015-02-19T21:04:00Z

examples/guestbook/README.md

-NAME                IMAGE(S)            HOST                                                       LABELS              STATUS
-redis-master        dockerfile/redis    kubernetes-minion-2.c.myproject.internal/130.211.156.189   name=redis-master   Running
+POD                                          IP                  CONTAINER(S)            IMAGE(S)                                 HOST                                                           LABELS                                                     STATUS                                                                                                                               
+redis-master-controller-gb50a                10.244.3.7          redis-master            dockerfile/redis                         kubernetes-minion-4.c.hazel-mote-834.internal/104.154.54.203   app=redis,name=redis-master                                Running


This is slightly out-dated. Minion name is not numbered anymore, it has a random suffix. E.g. kubernetes-minion-7yx6 instead of kubernetes-minion-1, etc. This is for idempotent creation I believe.

Just do a simple replace string will suffix:
s/kubernetes-minion-1/kubernetes-minion-7yx6
s/kubernetes-minion-2/kubernetes-minion-eatx
....

It's actually because the minions are now created as part of Managed Instance Groups members of which just have unique IDs versus counts.

Ah, really, I thought it's follow up work for this #3789 Thanks

ddysher · 2015-02-19T21:13:37Z

Looks good, some minor comments. Need a rebase.

rsokolowski · 2015-02-20T14:18:54Z

Thanks for comments @ddysher . Applied them and rebased/squashed. I also fixed hack/test-cmd.sh which was broken.

rsokolowski · 2015-02-23T10:07:30Z

Ping, I again synced to head.

ddysher · 2015-02-23T20:04:35Z

Have you ran e2e test? Just for precaution even though this is an example update. I believe a some places in e2e touches the directory.

You seem to touch very hot files.

rsokolowski · 2015-02-24T09:27:28Z

The relevant e2e tests are passing. There is not that much dependency on examples/guestbook: mainly test-cmd.sh and guestbook.sh

ddysher · 2015-02-24T13:24:44Z

Have you commented on this?
#4267 (comment)

rsokolowski · 2015-02-24T15:13:37Z

Oops, I've missed the comment - replied.

zmerlynn · 2015-02-24T15:23:04Z

This LGTM, but deferring to @ddysher for final.

(I was mainly butting my head in here because it was referenced by #4588.)

ddysher · 2015-02-24T18:25:57Z

LGTM, will merge after final rebase. N.B. can you put a comment on the conflict part so I don't have to go through the whole commit, thx.

rsokolowski · 2015-02-24T19:23:49Z

hack/test-cmd.sh

-  kubectl get pods "${kube_flags[@]}" -lname=redis-master | grep -q 'redis-master'
-  [ ! $(kubectl delete pods --all pods -l name=redis-master "${kube_flags[@]}" ) ]   # not --all and label selector together
+  kubectl get pods "${kube_flags[@]}" -lname=valid-pod | grep -q 'valid-pod'
+  [ ! $(kubectl delete pods --all pods -l name=valid-pod "${kube_flags[@]}" ) ]   # not --all and label selector together


Latest conflict was here due to 29aae75

rsokolowski · 2015-02-24T19:24:49Z

Thanks for review @ddysher . Rebased, resolved conflict and added comment as requested.

Update guestbook example to use replication controller instead of a naked pod.

bgrant0607 assigned ddysher Feb 10, 2015

ddysher reviewed Feb 10, 2015
View reviewed changes

rsokolowski force-pushed the guestbook-doc branch 3 times, most recently from 988985b to 19ef840 Compare February 16, 2015 15:01

bgrant0607 mentioned this pull request Feb 18, 2015

Adding guestbook example with latest json format for v1beta3 api #4460

Merged

piosz mentioned this pull request Feb 19, 2015

Improved guestbook.sh test to become actual test #4588

Merged

ddysher reviewed Feb 19, 2015
View reviewed changes

erictune mentioned this pull request Feb 19, 2015

Remove HostPort conflict checking. #4619

Merged

rsokolowski force-pushed the guestbook-doc branch from 19ef840 to 3839f1f Compare February 20, 2015 14:14

googlebot added the cla: yes label Feb 20, 2015

rsokolowski force-pushed the guestbook-doc branch from 3839f1f to 50ba0ab Compare February 20, 2015 14:15

rsokolowski mentioned this pull request Feb 20, 2015

hack/test-cmd.sh doesn't work on clean client while working on Travis due to different environment #4661

Closed

rsokolowski force-pushed the guestbook-doc branch 6 times, most recently from 508b747 to 6e3bfab Compare February 20, 2015 15:39

rsokolowski force-pushed the guestbook-doc branch from 6e3bfab to d784f9d Compare February 23, 2015 09:52

rsokolowski force-pushed the guestbook-doc branch from d784f9d to 8f7e5ef Compare February 24, 2015 07:32

rsokolowski force-pushed the guestbook-doc branch from 351ede8 to 125d1e9 Compare February 24, 2015 15:09

Update guestbook example to use replication controller.

635281e

rsokolowski force-pushed the guestbook-doc branch from 125d1e9 to 635281e Compare February 24, 2015 19:21

rsokolowski reviewed Feb 24, 2015
View reviewed changes

ddysher added a commit that referenced this pull request Feb 24, 2015

Merge pull request #4267 from rsokolowski/guestbook-doc

f2698e5

Update guestbook example to use replication controller instead of a naked pod.

ddysher merged commit f2698e5 into kubernetes:master Feb 24, 2015

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update guestbook example to use replication controller instead of a naked pod. #4267

Update guestbook example to use replication controller instead of a naked pod. #4267

rsokolowski commented Feb 10, 2015

bgrant0607 commented Feb 10, 2015

bgrant0607 commented Feb 10, 2015

ddysher commented Feb 10, 2015

ddysher Feb 10, 2015

rsokolowski Feb 16, 2015

ddysher commented Feb 10, 2015

rsokolowski commented Feb 16, 2015

ddysher Feb 19, 2015

zmerlynn Feb 19, 2015

ddysher Feb 19, 2015

rsokolowski Feb 20, 2015

ddysher commented Feb 19, 2015

rsokolowski commented Feb 20, 2015

rsokolowski commented Feb 23, 2015

ddysher commented Feb 23, 2015

rsokolowski commented Feb 24, 2015

ddysher commented Feb 24, 2015

rsokolowski commented Feb 24, 2015

zmerlynn commented Feb 24, 2015

ddysher commented Feb 24, 2015

rsokolowski Feb 24, 2015

rsokolowski commented Feb 24, 2015

Update guestbook example to use replication controller instead of a naked pod. #4267

Update guestbook example to use replication controller instead of a naked pod. #4267

Conversation

rsokolowski commented Feb 10, 2015

bgrant0607 commented Feb 10, 2015

bgrant0607 commented Feb 10, 2015

ddysher commented Feb 10, 2015

ddysher Feb 10, 2015

Choose a reason for hiding this comment

rsokolowski Feb 16, 2015

Choose a reason for hiding this comment

ddysher commented Feb 10, 2015

rsokolowski commented Feb 16, 2015

ddysher Feb 19, 2015

Choose a reason for hiding this comment

zmerlynn Feb 19, 2015

Choose a reason for hiding this comment

ddysher Feb 19, 2015

Choose a reason for hiding this comment

rsokolowski Feb 20, 2015

Choose a reason for hiding this comment

ddysher commented Feb 19, 2015

rsokolowski commented Feb 20, 2015

rsokolowski commented Feb 23, 2015

ddysher commented Feb 23, 2015

rsokolowski commented Feb 24, 2015

ddysher commented Feb 24, 2015

rsokolowski commented Feb 24, 2015

zmerlynn commented Feb 24, 2015

ddysher commented Feb 24, 2015

rsokolowski Feb 24, 2015

Choose a reason for hiding this comment

rsokolowski commented Feb 24, 2015