Update guestbook examples; replace RC concepts with Deployment

cmd/mungedocs/example_syncer.go

@@ -36,14 +36,14 @@ var exampleMungeTagRE = regexp.MustCompile(beginMungeTag(fmt.Sprintf("%s %s", ex
 // the content of the example, thereby syncing it.
 //
 // For example,
-// <!-- BEGIN MUNGE: EXAMPLE ../../examples/guestbook/frontend-controller.yaml -->
+// <!-- BEGIN MUNGE: EXAMPLE ../../examples/guestbook/frontend-service.yaml -->
 //
 // ```yaml
 // foo:
 //    bar:
 // ```
 //
-// [Download example](../../examples/guestbook/frontend-controller.yaml?raw=true)
+// [Download example](../../examples/guestbook/frontend-service.yaml?raw=true)
 // <!-- END MUNGE: EXAMPLE -->
 func syncExamples(filePath string, mlines mungeLines) (mungeLines, error) {
 	var err error

examples/examples_test.go

@@ -172,13 +172,18 @@ func TestExampleObjectSchemas(t *testing.T) {
 			"v1-controller": &api.ReplicationController{},
 		},
 		"../examples/guestbook": {
-			"frontend-controller":     &api.ReplicationController{},
-			"redis-slave-controller":  &api.ReplicationController{},
-			"redis-master-controller": &api.ReplicationController{},
+			"frontend-deployment":     &extensions.Deployment{},
+			"redis-slave-deployment":  &extensions.Deployment{},
+			"redis-master-deployment": &extensions.Deployment{},
 			"frontend-service":        &api.Service{},
 			"redis-master-service":    &api.Service{},
 			"redis-slave-service":     &api.Service{},
 		},
+		"../examples/guestbook/legacy": {
+			"frontend-controller":     &api.ReplicationController{},
+			"redis-slave-controller":  &api.ReplicationController{},
+			"redis-master-controller": &api.ReplicationController{},
+		},
 		"../examples/guestbook-go": {
 			"guestbook-controller":    &api.ReplicationController{},
 			"redis-slave-controller":  &api.ReplicationController{},

examples/guestbook/all-in-one/frontend.yaml

@@ -16,24 +16,25 @@ spec:
     app: guestbook
     tier: frontend
 ---
-apiVersion: v1
-kind: ReplicationController
+apiVersion: extensions/v1beta1
+kind: Deployment
 metadata:
   name: frontend
   # these labels can be applied automatically
   # from the labels in the pod template if not set
-  labels:
-    app: guestbook
-    tier: frontend
+  # labels:
+  #   app: guestbook
+  #   tier: frontend
 spec:
   # this replicas value is default
   # modify it according to your case
   replicas: 3
   # selector can be applied automatically
   # from the labels in the pod template if not set
   # selector:
-  #   app: guestbook
-  #   tier: frontend
+  #   matchLabels:
+  #     app: guestbook
+  #     tier: frontend
   template:
     metadata:
       labels:

examples/guestbook/all-in-one/guestbook-all-in-one.yaml

@@ -16,26 +16,27 @@ spec:
     tier: backend
     role: master
 ---
-apiVersion: v1
-kind: ReplicationController
+apiVersion: extensions/v1beta1
+kind: Deployment
 metadata:
   name: redis-master
   # these labels can be applied automatically 
   # from the labels in the pod template if not set
-  labels:
-    app: redis
-    role: master
-    tier: backend
+  # labels:
+  #   app: redis
+  #   role: master
+  #   tier: backend
 spec:
   # this replicas value is default
   # modify it according to your case
   replicas: 1
   # selector can be applied automatically 
   # from the labels in the pod template if not set
   # selector:
-  #   app: guestbook
-  #   role: master
-  #   tier: backend
+  #   matchLabels:
+  #     app: guestbook
+  #     role: master
+  #     tier: backend
   template:
     metadata:
       labels:
@@ -70,26 +71,27 @@ spec:
     tier: backend
     role: slave
 ---
-apiVersion: v1
-kind: ReplicationController
+apiVersion: extensions/v1beta1
+kind: Deployment
 metadata:
   name: redis-slave
   # these labels can be applied automatically
   # from the labels in the pod template if not set
-  labels:
-    app: redis
-    role: slave
-    tier: backend
+  # labels:
+  #   app: redis
+  #   role: slave
+  #   tier: backend
 spec:
   # this replicas value is default
   # modify it according to your case
   replicas: 2
   # selector can be applied automatically
   # from the labels in the pod template if not set
   # selector:
-  #   app: guestbook
-  #   role: slave
-  #   tier: backend
+  #   matchLabels:
+  #     app: guestbook
+  #     role: slave
+  #     tier: backend
   template:
     metadata:
       labels:
@@ -133,24 +135,25 @@ spec:
     app: guestbook
     tier: frontend
 ---
-apiVersion: v1
-kind: ReplicationController
+apiVersion: extensions/v1beta1
+kind: Deployment
 metadata:
   name: frontend
   # these labels can be applied automatically
   # from the labels in the pod template if not set
-  labels:
-    app: guestbook
-    tier: frontend
+  # labels:
+  #   app: guestbook
+  #   tier: frontend
 spec:
   # this replicas value is default
   # modify it according to your case
   replicas: 3
   # selector can be applied automatically
   # from the labels in the pod template if not set
   # selector:
-  #   app: guestbook
-  #   tier: frontend
+  #   matchLabels:
+  #     app: guestbook
+  #     tier: frontend
   template:
     metadata:
       labels:

examples/guestbook/all-in-one/redis-slave.yaml

@@ -15,26 +15,27 @@ spec:
     role: slave
     tier: backend
 ---
-apiVersion: v1
-kind: ReplicationController
+apiVersion: extensions/v1beta1
+kind: Deployment
 metadata:
   name: redis-slave
   # these labels can be applied automatically
   # from the labels in the pod template if not set
-  labels:
-    app: redis
-    role: slave
-    tier: backend
+  # labels:
+  #   app: redis
+  #   role: slave
+  #   tier: backend
 spec:
   # this replicas value is default
   # modify it according to your case
   replicas: 2
   # selector can be applied automatically
   # from the labels in the pod template if not set
   # selector:
-  #   app: guestbook
-  #   role: slave
-  #   tier: backend
+  #   matchLabels:
+  #     app: guestbook
+  #     role: slave
+  #     tier: backend
   template:
     metadata:
       labels:

examples/guestbook/frontend-deployment.yaml

@@ -0,0 +1,42 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: frontend
+  # these labels can be applied automatically
+  # from the labels in the pod template if not set
+  # labels:
+  #   app: guestbook
+  #   tier: frontend
+spec:
+  # this replicas value is default
+  # modify it according to your case
+  replicas: 3
+  # selector can be applied automatically
+  # from the labels in the pod template if not set
+  # selector:
+  #   matchLabels:
+  #     app: guestbook
+  #     tier: frontend
+  template:
+    metadata:
+      labels:
+        app: guestbook
+        tier: frontend
+    spec:
+      containers:
+      - name: php-redis
+        image: gcr.io/google_samples/gb-frontend:v3
+        resources:
+          requests:
+            cpu: 100m
+            memory: 100Mi
+        env:
+        - name: GET_HOSTS_FROM
+          value: dns
+          # If your cluster config does not include a dns service, then to
+          # instead access environment variables to find service host
+          # info, comment out the 'value: dns' line above, and uncomment the
+          # line below.
+          # value: env
+        ports:
+        - containerPort: 80

examples/guestbook/redis-master-deployment.yaml

@@ -0,0 +1,37 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: redis-master
+  # these labels can be applied automatically 
+  # from the labels in the pod template if not set
+  # labels:
+  #   app: redis
+  #   role: master
+  #   tier: backend
+spec:
+  # this replicas value is default
+  # modify it according to your case
+  replicas: 1
+  # selector can be applied automatically 
+  # from the labels in the pod template if not set
+  # selector:
+  #   matchLabels:
+  #     app: guestbook
+  #     role: master
+  #     tier: backend
+  template:
+    metadata:
+      labels:
+        app: redis
+        role: master
+        tier: backend
+    spec:
+      containers:
+      - name: master
+        image: gcr.io/google_containers/redis:e2e  # or just image: redis
+        resources:
+          requests:
+            cpu: 100m
+            memory: 100Mi
+        ports:
+        - containerPort: 6379

examples/guestbook/redis-slave-deployment.yaml

@@ -0,0 +1,45 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: redis-slave
+  # these labels can be applied automatically
+  # from the labels in the pod template if not set
+  # labels:
+  #   app: redis
+  #   role: slave
+  #   tier: backend
+spec:
+  # this replicas value is default
+  # modify it according to your case
+  replicas: 2
+  # selector can be applied automatically
+  # from the labels in the pod template if not set
+  # selector:
+  #   matchLabels:
+  #     app: guestbook
+  #     role: slave
+  #     tier: backend
+  template:
+    metadata:
+      labels:
+        app: redis
+        role: slave
+        tier: backend
+    spec:
+      containers:
+      - name: slave
+        image: gcr.io/google_samples/gb-redisslave:v1
+        resources:
+          requests:
+            cpu: 100m
+            memory: 100Mi
+        env:
+        - name: GET_HOSTS_FROM
+          value: dns
+          # If your cluster config does not include a dns service, then to
+          # instead access an environment variable to find the master
+          # service's host, comment out the 'value: dns' line above, and
+          # uncomment the line below.
+          # value: env
+        ports:
+        - containerPort: 6379

hack/test-cmd.sh

@@ -1106,8 +1106,8 @@ __EOF__
   kubectl delete rc frontend "${kube_flags[@]}"
 
   ### Scale multiple replication controllers
-  kubectl create -f examples/guestbook/redis-master-controller.yaml "${kube_flags[@]}"
-  kubectl create -f examples/guestbook/redis-slave-controller.yaml "${kube_flags[@]}"
+  kubectl create -f examples/guestbook/legacy/redis-master-controller.yaml "${kube_flags[@]}"
+  kubectl create -f examples/guestbook/legacy/redis-slave-controller.yaml "${kube_flags[@]}"
   # Command
   kubectl scale rc/redis-master rc/redis-slave --replicas=4 "${kube_flags[@]}"
   # Post-condition: 4 replicas each
@@ -1217,7 +1217,7 @@ __EOF__
   kube::test::get_object_assert rc "{{range.items}}{{$id_field}}:{{end}}" ''
   # Command
   kubectl create -f hack/testdata/frontend-controller.yaml "${kube_flags[@]}"
-  kubectl create -f examples/guestbook/redis-slave-controller.yaml "${kube_flags[@]}"
+  kubectl create -f examples/guestbook/legacy/redis-slave-controller.yaml "${kube_flags[@]}"
   # Post-condition: frontend and redis-slave
   kube::test::get_object_assert rc "{{range.items}}{{$id_field}}:{{end}}" 'frontend:redis-slave:'