Merge pull request #14256 from linzichang/fixup-guestbook

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

+apiVersion: v1
+kind: Service
+metadata:
+  name: frontend
+  labels:
+    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
+  ports:
+    # the port that this service should serve on
+  - port: 80
+  selector:
+    app: guestbook
+    tier: frontend
+---
+apiVersion: v1
+kind: ReplicationController
+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:
+  #   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/all-in-one/guestbook-all-in-one.yaml

+apiVersion: v1
+kind: Service
+metadata:
+  name: redis-master
+  labels:
+    app: redis
+    tier: backend
+    role: master
+spec:
+  ports:
+    # the port that this service should serve on
+  - port: 6379
+    targetPort: 6379
+  selector:
+    app: redis
+    tier: backend
+    role: master
+---
+apiVersion: v1
+kind: ReplicationController
+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:
+  #   app: guestbook
+  #   role: master
+  #   tier: backend
+  template:
+    metadata:
+      labels:
+        app: redis
+        role: master
+        tier: backend
+    spec:
+      containers:
+      - name: master
+        image: redis
+        resources:
+          requests:
+            cpu: 100m
+            memory: 100Mi
+        ports:
+        - containerPort: 6379
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: redis-slave
+  labels:
+    app: redis
+    tier: backend
+    role: slave
+spec:
+  ports:
+    # the port that this service should serve on
+  - port: 6379
+  selector:
+    app: redis
+    tier: backend
+    role: slave
+---
+apiVersion: v1
+kind: ReplicationController
+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:
+  #   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
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: frontend
+  labels:
+    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
+  ports:
+    # the port that this service should serve on
+  - port: 80
+  selector:
+    app: guestbook
+    tier: frontend
+---
+apiVersion: v1
+kind: ReplicationController
+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:
+  #   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/all-in-one/redis-slave.yaml

+apiVersion: v1
+kind: Service
+metadata:
+  name: redis-slave
+  labels:
+    app: redis
+    role: slave
+    tier: backend
+spec:
+  ports:
+    # the port that this service should serve on
+  - port: 6379
+  selector:
+    app: redis
+    role: slave
+    tier: backend
+---
+apiVersion: v1
+kind: ReplicationController
+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:
+  #   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

examples/guestbook/frontend-controller.yaml

@@ -2,20 +2,33 @@ apiVersion: v1
 kind: ReplicationController
 metadata:
   name: frontend
+  # these labels can be applied automatically
+  # from the labels in the pod template if not set
   labels:
-    name: frontend
+    app: guestbook
+    tier: frontend
 spec:
+  # this replicas value is default
+  # modify it according to your case
   replicas: 3
-  selector:
-    name: frontend
+  # selector can be applied automatically
+  # from the labels in the pod template if not set
+  # selector:
+  #   app: guestbook
+  #   tier: frontend
   template:
     metadata:
       labels:
-        name: frontend
+        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

examples/guestbook/frontend-service.yaml

@@ -3,13 +3,15 @@ kind: Service
 metadata:
   name: frontend
   labels:
-    name: 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
   ports:
     # the port that this service should serve on
-    - port: 80
+  - port: 80
   selector:
-    name: frontend
+    app: guestbook
+    tier: frontend

examples/guestbook/redis-master-controller.yaml

@@ -2,19 +2,35 @@ apiVersion: v1
 kind: ReplicationController
 metadata:
   name: redis-master
+  # these labels can be applied automatically 
+  # from the labels in the pod template if not set
   labels:
-    name: redis-master
+    app: redis
+    role: master
+    tier: backend
 spec:
+  # this replicas value is default
+  # modify it according to your case
   replicas: 1
-  selector:
-    name: redis-master
+  # selector can be applied automatically 
+  # from the labels in the pod template if not set
+  # selector:
+  #   app: guestbook
+  #   role: master
+  #   tier: backend
   template:
     metadata:
       labels:
-        name: redis-master
+        app: redis
+        role: master
+        tier: backend
     spec:
       containers:
       - name: master
         image: redis
+        resources:
+          requests:
+            cpu: 100m
+            memory: 100Mi
         ports:
         - containerPort: 6379

examples/guestbook/redis-master-service.yaml

@@ -3,11 +3,15 @@ kind: Service
 metadata:
   name: redis-master
   labels:
-    name: redis-master
+    app: redis
+    role: master
+    tier: backend
 spec:
   ports:
     # the port that this service should serve on
   - port: 6379
     targetPort: 6379
   selector:
-    name: redis-master
+    app: redis
+    role: master
+    tier: backend

examples/guestbook/redis-slave-controller.yaml

@@ -2,20 +2,36 @@ apiVersion: v1
 kind: ReplicationController
 metadata:
   name: redis-slave
+  # these labels can be applied automatically
+  # from the labels in the pod template if not set
   labels:
-    name: redis-slave
+    app: redis
+    role: slave
+    tier: backend
 spec:
+  # this replicas value is default
+  # modify it according to your case
   replicas: 2
-  selector:
-    name: redis-slave
+  # selector can be applied automatically
+  # from the labels in the pod template if not set
+  # selector:
+  #   app: guestbook
+  #   role: slave
+  #   tier: backend
   template:
     metadata:
       labels:
-        name: redis-slave
+        app: redis
+        role: slave
+        tier: backend
     spec:
       containers:
-      - name: worker
+      - name: slave
         image: gcr.io/google_samples/gb-redisslave:v1
+        resources:
+          requests:
+            cpu: 100m
+            memory: 100Mi
         env:
         - name: GET_HOSTS_FROM
           value: dns

examples/guestbook/redis-slave-service.yaml

@@ -3,10 +3,14 @@ kind: Service
 metadata:
   name: redis-slave
   labels:
-    name: redis-slave
+    app: redis
+    role: slave
+    tier: backend
 spec:
   ports:
     # the port that this service should serve on
   - port: 6379
   selector:
-    name: redis-slave
+    app: redis
+    role: slave
+    tier: backend

test/e2e/kubectl.go

@@ -56,9 +56,9 @@ const (
 	kittenImage              = "gcr.io/google_containers/update-demo:kitten"
 	updateDemoSelector       = "name=update-demo"
 	updateDemoContainer      = "update-demo"
-	frontendSelector         = "name=frontend"
-	redisMasterSelector      = "name=redis-master"
-	redisSlaveSelector       = "name=redis-slave"
+	frontendSelector         = "app=guestbook,tier=frontend"
+	redisMasterSelector      = "app=redis,role=master"
+	redisSlaveSelector       = "app=redis,role=slave"
 	goproxyContainer         = "goproxy"
 	goproxyPodSelector       = "name=goproxy"
 	netexecContainer         = "netexec"