Moving to kubernetes deployments.

Jon Wayne Parrott · Jon Wayne Parrott · commit 4799366e19a0 · 2016-05-17T12:05:40.000-07:00
diff --git a/optional-container-engine/Makefile b/optional-container-engine/Makefile
@@ -6,7 +6,8 @@ all: deploy
 .PHONY: create-cluster
 create-cluster:
 	gcloud container clusters create bookshelf \
-		--scope "https://www.googleapis.com/auth/userinfo.email","cloud-platform"
+		--scope "cloud-platform" \
+		--num-nodes 2
 	gcloud container clusters get-credentials bookshelf
 
 .PHONY: create-bucket
@@ -27,6 +28,10 @@ template:
 	sed -i ".tmpl" "s/\$$GCLOUD_PROJECT/$(GCLOUD_PROJECT)/g" bookshelf-frontend.yaml
 	sed -i ".tmpl" "s/\$$GCLOUD_PROJECT/$(GCLOUD_PROJECT)/g" bookshelf-worker.yaml
 
+.PHONY: create-service
+create-service:
+	kubectl create -f bookshelf-service.yaml
+
 .PHONY: deploy-frontend
 deploy-frontend: push template
 	kubectl create -f bookshelf-frontend.yaml
@@ -36,10 +41,10 @@ deploy-worker: push template
 	kubectl create -f bookshelf-worker.yaml
 
 .PHONY: deploy
-deploy: deploy-frontend deploy-worker
+deploy: deploy-frontend deploy-worker create-service
 
 .PHONY: delete
 delete:
-	kubectl delete rc bookshelf-frontend
-	kubectl delete rc bookshelf-worker
-	kubectl delete service bookshelf-frontend
+	-kubectl delete -f bookshelf-frontend.yaml
+	-kubectl delete -f bookshelf-worker.yaml
+	-kubectl delete -f bookshelf-frontend.yaml
diff --git a/optional-container-engine/README.md b/optional-container-engine/README.md
@@ -22,7 +22,7 @@ This optional tutorial will walk you through how to deploy the Bookshelf sample
 Create a cluster for the bookshelf application:
 
     gcloud container clusters create bookshelf \
-        --scope "https://www.googleapis.com/auth/userinfo.email","cloud-platform" \
+        --scope "cloud-platform" \
         --num-nodes 2
     gcloud container clusters get-credentials bookshelf
 
diff --git a/optional-container-engine/bookshelf-frontend.yaml b/optional-container-engine/bookshelf-frontend.yaml
@@ -15,16 +15,16 @@
 # This file configures the bookshelf application frontend. The frontend serves
 # public web traffic.
 
-# The bookshelf frontend replication controller ensures that at least 3
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: bookshelf-frontend
+  labels:
+    app: bookshelf
+# The bookshelf frontend replica set ensures that at least 3
 # instances of the bookshelf app are running on the cluster.
 # For more info about Pods see:
 #   https://cloud.google.com/container-engine/docs/pods/
-# For more info about Replication Controllers:
-#   https://cloud.google.com/container-engine/docs/replicationcontrollers/
-apiVersion: v1
-kind: ReplicationController
-metadata:
-  name: bookshelf-frontend
 spec:
   replicas: 3
   template:
@@ -49,29 +49,5 @@ spec:
           value: bookshelf
         # The bookshelf process listens on port 8080 for web traffic by default.
         ports:
-        - containerPort: 8080
-
----
-
-# The bookshelf service provides a load-balancing proxy over the bookshelf app
-# pods. By specifying the type as a 'LoadBalancer', Container Engine will
-# create an external HTTP load balancer.
-# For more information about Services see:
-#   https://cloud.google.com/container-engine/docs/services/
-# For more information about external HTTP load balancing see:
-#   https://cloud.google.com/container-engine/docs/load-balancer
-apiVersion: v1
-kind: Service
-metadata:
-  name: bookshelf-frontend
-  labels:
-    app: bookshelf
-    tier: frontend
-spec:
-  type: LoadBalancer
-  ports:
-  - port: 80
-    targetPort: 8080
-  selector:
-    app: bookshelf
-    tier: frontend
+        - name: http-server
+          containerPort: 8080
diff --git a/optional-container-engine/bookshelf-service.yaml b/optional-container-engine/bookshelf-service.yaml
@@ -0,0 +1,36 @@
+# Copyright 2016 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License
+
+# The bookshelf service provides a load-balancing proxy over the bookshelf
+# frontend pods. By specifying the type as a 'LoadBalancer', Container Engine
+# will create an external HTTP load balancer.
+# For more information about Services see:
+#   https://cloud.google.com/container-engine/docs/services/
+# For more information about external HTTP load balancing see:
+#   https://cloud.google.com/container-engine/docs/load-balancer
+apiVersion: v1
+kind: Service
+metadata:
+  name: bookshelf-frontend
+  labels:
+    app: bookshelf
+    tier: frontend
+spec:
+  type: LoadBalancer
+  ports:
+  - port: 80
+    targetPort: http-server
+  selector:
+    app: bookshelf
+    tier: frontend
diff --git a/optional-container-engine/bookshelf-worker.yaml b/optional-container-engine/bookshelf-worker.yaml
@@ -15,16 +15,16 @@
 # This file configures the bookshelf task worker. The worker is responsible
 # for processing book requests and updating book information.
 
-# The bookshelf worker controller ensures that at least 3 instances of the
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: bookshelf-worker
+  labels:
+    app: bookshelf
+# The bookshelf worker replica set ensures that at least 2 instances of the
 # bookshelf worker pod are running on the cluster.
 # For more info about Pods see:
 #   https://cloud.google.com/container-engine/docs/pods/
-# For more info about Replication Controllers:
-#   https://cloud.google.com/container-engine/docs/replicationcontrollers/
-apiVersion: v1
-kind: ReplicationController
-metadata:
-  name: bookshelf-worker
 spec:
   replicas: 2
   template:
