Merge pull request #52445 from Cynerva/gkk/cdk-service-kicker

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>..

Fix kubernetes charms not restarting services properly after host reboot on LXD

**What this PR does / why we need it**:

This fixes an issue when running the Kubernetes charms on LXD where the services don't restart properly after a reboot of the host machine.

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: https://github.com/juju-solutions/bundle-canonical-kubernetes/issues/357

**Special notes for your reviewer**:

See https://github.com/juju-solutions/layer-cdk-service-kicker

**Release note**:

```release-note
Fix kubernetes charms not restarting services properly after host reboot on LXD
```
This commit is contained in:
Kubernetes Submit Queue 2017-09-23 14:30:08 -07:00 committed by GitHub
commit c6ef395023
2 changed files with 11 additions and 0 deletions

View File

@ -7,6 +7,7 @@ includes:
- 'layer:debug'
- 'layer:metrics'
- 'layer:nagios'
- 'layer:cdk-service-kicker'
- 'interface:ceph-admin'
- 'interface:etcd'
- 'interface:http'
@ -24,3 +25,8 @@ options:
server_key_path: '/root/cdk/server.key'
client_certificate_path: '/root/cdk/client.crt'
client_key_path: '/root/cdk/client.key'
cdk-service-kicker:
services:
- snap.kube-apiserver.daemon
- snap.kube-controller-manager.daemon
- snap.kube-scheduler.daemon

View File

@ -8,6 +8,7 @@ includes:
- 'layer:nagios'
- 'layer:tls-client'
- 'layer:nvidia-cuda'
- 'layer:cdk-service-kicker'
- 'interface:http'
- 'interface:kubernetes-cni'
- 'interface:kube-dns'
@ -29,3 +30,7 @@ options:
server_key_path: '/root/cdk/server.key'
client_certificate_path: '/root/cdk/client.crt'
client_key_path: '/root/cdk/client.key'
cdk-service-kicker:
services:
- 'snap.kubelet.daemon'
- 'snap.kube-proxy.daemon'