Merge pull request #99 from chibiegg/feat/roll

ローリングアップデートに対応
isucon · Sep 18, 2019 · 6569e8a · 6569e8a
2 parents 5f14214 + 6c9e921
commit 6569e8a
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 22 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -3,7 +3,7 @@ README.md
 .git/
 media/icons/*
 docs/
-kubernates/
+kubernetes/
 nginx/
 logs/
 data/
diff --git a/Makefile b/Makefile
@@ -1,25 +1,26 @@
-all: nginx app
+all: image
 
-.PHONY: nginx app apply delete
+.PHONY: image apply delete restart
 
-nginx: nginx/Dockerfile
-	cd nginx && docker build -t isucon/portal-nginx .
-
-app: Dockerfile
+image:
 	docker build -t isucon/portal-app .
+	cd nginx && docker build -t isucon/portal-nginx .
 
 apply:
-	kubectl apply -f kubernates/00-*.yml
-	kubectl apply -f kubernates/01-*.yml
-	kubectl apply -f kubernates/02-*.yml
-	kubectl apply -f kubernates/03-*.yml
-	kubectl apply -f kubernates/04-*.yml
-	kubectl apply -f kubernates/05-*.yml
+	kubectl apply -f kubernetes/00-*.yml
+	kubectl apply -f kubernetes/01-*.yml
+	kubectl apply -f kubernetes/02-*.yml
+	kubectl apply -f kubernetes/03-*.yml
+	kubectl apply -f kubernetes/04-*.yml
+	kubectl apply -f kubernetes/05-*.yml
 
 delete:
-	kubectl delete -f kubernates/05-*.yml
-	kubectl delete -f kubernates/04-*.yml
-	kubectl delete -f kubernates/03-*.yml
-	kubectl delete -f kubernates/02-*.yml
-	kubectl delete -f kubernates/01-*.yml
-	kubectl delete -f kubernates/00-*.yml
+	kubectl delete -f kubernetes/05-*.yml
+	kubectl delete -f kubernetes/04-*.yml
+	kubectl delete -f kubernetes/03-*.yml
+	kubectl delete -f kubernetes/02-*.yml
+	kubectl delete -f kubernetes/01-*.yml
+	kubectl delete -f kubernetes/00-*.yml
+
+restart:
+	kubectl rollout restart deployment/portal-app
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ python manage.py runserver
 ```
 
 
-## kubernates (minikube)
+## kubernetes (minikube)
 
 ```bash
 make

diff --git a/isucon/portal/docker_settings.py b/isucon/portal/docker_settings.py
@@ -13,7 +13,7 @@
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True if os.environ.get('DJANGO_DEBUG', "true").lower() == "true" else False
 
-ALLOWED_HOSTS = [os.environ.get('DJANGO_ALLOWED_HOST', "*")]
+ALLOWED_HOSTS = [os.environ.get('DJANGO_ALLOWED_HOST', "*"), "localhost"]
 
 SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
 

diff --git a/kubernates/00-secret.yml → kubernetes/00-secret.yml b/kubernates/00-secret.yml → kubernetes/00-secret.yml
diff --git a/kubernates/01-redis.yml → kubernetes/01-redis.yml b/kubernates/01-redis.yml → kubernetes/01-redis.yml
diff --git a/kubernates/02-postgres.yml → kubernetes/02-postgres.yml b/kubernates/02-postgres.yml → kubernetes/02-postgres.yml
diff --git a/kubernates/03-volume.yml → kubernetes/03-volume.yml b/kubernates/03-volume.yml → kubernetes/03-volume.yml
diff --git a/kubernates/04-app.yml → kubernetes/04-app.yml b/kubernates/04-app.yml → kubernetes/04-app.yml
@@ -19,7 +19,10 @@ spec:
     matchLabels:
       app: portal-app
   strategy:
-    type: Recreate
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 2
+      maxUnavailable: 0
   template:
     metadata:
       labels:
@@ -73,6 +76,13 @@ spec:
         ports:
         - containerPort: 5000
           name: portal-app
+        livenessProbe:
+          httpGet:
+            path: /
+            port: 5000
+            httpHeaders:
+            - name: Host
+              value: localhost
         volumeMounts:
         - name: static-volume
           mountPath: /opt/app/static

diff --git a/kubernates/05-nginx.yml → kubernetes/05-nginx.yml b/kubernates/05-nginx.yml → kubernetes/05-nginx.yml