Merge pull request #28452 from jimangel/sync-guestbook-updates

Updating tutorial to match source

Author: k8s-ci-robot

content/en/docs/tutorials/_index.md

@@ -35,7 +35,7 @@ Before walking through each tutorial, you may want to bookmark the
 
 * [Exposing an External IP Address to Access an Application in a Cluster](/docs/tutorials/stateless-application/expose-external-ip-address/)
 
-* [Example: Deploying PHP Guestbook application with MongoDB](/docs/tutorials/stateless-application/guestbook/)
+* [Example: Deploying PHP Guestbook application with Redis](/docs/tutorials/stateless-application/guestbook/)
 
 ## Stateful Applications
 

content/en/docs/tutorials/stateless-application/guestbook.md

@@ -1,32 +1,29 @@
+# SOURCE: https://cloud.google.com/kubernetes-engine/docs/tutorials/guestbook
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: frontend
-  labels:
-    app.kubernetes.io/name: guestbook
-    app.kubernetes.io/component: frontend
 spec:
+  replicas: 3
   selector:
     matchLabels:
-      app.kubernetes.io/name: guestbook
-      app.kubernetes.io/component: frontend
-  replicas: 3
+        app: guestbook
+        tier: frontend
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: guestbook
-        app.kubernetes.io/component: frontend
+        app: guestbook
+        tier: frontend
     spec:
       containers:
-      - name: guestbook
-        image: paulczar/gb-frontend:v5
-        # image: gcr.io/google-samples/gb-frontend:v4
+      - name: php-redis
+        image: gcr.io/google_samples/gb-frontend:v5
+        env:
+        - name: GET_HOSTS_FROM
+          value: "dns"
         resources:
           requests:
             cpu: 100m
             memory: 100Mi
-        env:
-        - name: GET_HOSTS_FROM
-          value: dns
         ports:
-        - containerPort: 80
+        - containerPort: 80

content/en/examples/application/guestbook/frontend-deployment.yaml

@@ -1,16 +1,19 @@
+# SOURCE: https://cloud.google.com/kubernetes-engine/docs/tutorials/guestbook
 apiVersion: v1
 kind: Service
 metadata:
   name: frontend
   labels:
-    app.kubernetes.io/name: guestbook
-    app.kubernetes.io/component: frontend
+    app: guestbook
+    tier: frontend
 spec:
   # if your cluster supports it, uncomment the following to automatically create
   # an external load-balanced IP for the frontend service.
   # type: LoadBalancer
+  #type: LoadBalancer
   ports:
+    # the port that this service should serve on
   - port: 80
   selector:
-    app.kubernetes.io/name: guestbook
-    app.kubernetes.io/component: frontend
+    app: guestbook
+    tier: frontend

content/en/examples/application/guestbook/frontend-service.yaml

@@ -0,0 +1,30 @@
+# SOURCE: https://cloud.google.com/kubernetes-engine/docs/tutorials/guestbook
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: redis-follower
+  labels:
+    app: redis
+    role: follower
+    tier: backend
+spec:
+  replicas: 2
+  selector:
+    matchLabels:
+      app: redis
+  template:
+    metadata:
+      labels:
+        app: redis
+        role: follower
+        tier: backend
+    spec:
+      containers:
+      - name: follower
+        image: gcr.io/google_samples/gb-redis-follower:v2
+        resources:
+          requests:
+            cpu: 100m
+            memory: 100Mi
+        ports:
+        - containerPort: 6379

content/en/examples/application/guestbook/mongo-deployment.yaml

@@ -0,0 +1,17 @@
+# SOURCE: https://cloud.google.com/kubernetes-engine/docs/tutorials/guestbook
+apiVersion: v1
+kind: Service
+metadata:
+  name: redis-follower
+  labels:
+    app: redis
+    role: follower
+    tier: backend
+spec:
+  ports:
+    # the port that this service should serve on
+  - port: 6379
+  selector:
+    app: redis
+    role: follower
+    tier: backend

content/en/examples/application/guestbook/mongo-service.yaml

@@ -0,0 +1,30 @@
+# SOURCE: https://cloud.google.com/kubernetes-engine/docs/tutorials/guestbook
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: redis-leader
+  labels:
+    app: redis
+    role: leader
+    tier: backend
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: redis
+  template:
+    metadata:
+      labels:
+        app: redis
+        role: leader
+        tier: backend
+    spec:
+      containers:
+      - name: leader
+        image: "docker.io/redis:6.0.5"
+        resources:
+          requests:
+            cpu: 100m
+            memory: 100Mi
+        ports:
+        - containerPort: 6379

content/en/examples/application/guestbook/redis-follower-deployment.yaml

@@ -0,0 +1,17 @@
+# SOURCE: https://cloud.google.com/kubernetes-engine/docs/tutorials/guestbook
+apiVersion: v1
+kind: Service
+metadata:
+  name: redis-leader
+  labels:
+    app: redis
+    role: leader
+    tier: backend
+spec:
+  ports:
+  - port: 6379
+    targetPort: 6379
+  selector:
+    app: redis
+    role: leader
+    tier: backend