k3s/cluster/juju
Kubernetes Submit Queue ee43f7c34e
Merge pull request #57246 from juju-solutions/feature/etcd3
Automatic merge from submit-queue (batch tested with PRs 49874, 56919, 57246). 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>.

Enable support for etcd3

**What this PR does / why we need it**: With this PR juju deployments of kubernetes can use both etcd2 and 3.

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:

**Special notes for your reviewer**: Lets not merge this immediately. Lets wait for next year. 

**Release note**:

```NONE

```
2018-01-10 08:15:46 -08:00
..
bundles fix kubemark, juju, and libvirt-coreos README.md (from minion to node) 2017-10-10 06:45:15 +00:00
layers Merge pull request #57246 from juju-solutions/feature/etcd3 2018-01-10 08:15:46 -08:00
prereqs Update OWNERS approvers and reviewers: cluster/juju 2016-11-09 10:17:09 -08:00
.gitignore Add metric collection to charms for autoscalling 2017-04-13 16:02:13 -05:00
OWNERS Insert Cynerva and Kjackal to approvers list 2017-06-21 10:40:59 -05:00
config-default.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
config-test.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
identify-leaders.py Fixing identification script and adding output to ignore. 2016-08-04 19:18:07 +00:00
kube-system-ns.yaml Changes necessary to enable ssl for the Juju charms 2015-09-17 15:23:02 -05:00
return-node-ips.py Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
util.sh Fixing identification script and adding output to ignore. 2016-08-04 19:18:07 +00:00