Merge branch 'master' into master

roycaihw · web-flow · commit 12d0bcb04a2c · 2018-01-26T14:03:35.000-08:00
diff --git a/kubernetes/base b/kubernetes/base
@@ -1 +1 @@
-Subproject commit a41c44715241552de73361673152f3f0d0bb9bc4
+Subproject commit 6f02e73d80a7b91e62f71a4ad81b4605e365b342
