-
Notifications
You must be signed in to change notification settings - Fork 414
Conversation
Enabled calico support for k8s
3af143e
to
04642e4
Compare
Just rebased onto lastest master. |
After rebasing onto #1296, this upgrades cleanly from 1.0.3 👍
|
@BrianHicks is this ready to merge now that we know it upgrades cleanly? |
I thought it was, but it looks like Kubelet is killing the I think it's going to require a few changes to nginx-consul and logstash (specifically to restart them when they fail), which may fall outside the scope of this PR. @ryane do you have a preference for where that should go? |
This is needed because Kubelet sends signal 137 (128+9, AKA kill -9) to the containers on startup. `on-failure` doesn't catch that, so the services stay dead, despite us wanting them to restart.
I added it in 48d0058, but we can revert that commit. |
I suppose we could move it to a new PR but I don't have a problem with leaving it in this one... |
Cool, then it's ready to merge
|
Add Kubernetes by default, incorporating many of @Zogg's changes. Docs are at 3af143e
Successor to #1302, obsoletes #1121 (since we no longer have to customize those variables)