github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-11-02 14:51:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #36229 from wojtek-t/bump_etcd_version

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 36229, 39450)

Bump etcd to 3.0.14 and switch to v3 API in etcd.

Ref #20504

**Release note**:

```release-note
Switch default etcd version to 3.0.14.
Switch default storage backend flag in apiserver to `etcd3` mode.
```
This commit is contained in:
Kubernetes Submit Queue
2017-01-04 17:36:06 -08:00
committed by GitHub
parent a104229e1a 498a893fa3
commit f4a8713088
7 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cluster/saltbase/salt/etcd/etcd.manifest
View File

@@ -20,9 +20,9 @@
{% endfor -%}
{% set etcd_cluster = vars.etcd_cluster -%}
{% set cluster_state = vars.cluster_state -%}
{% set storage_backend = pillar.get('storage_backend', 'etcd2') -%}
{% set storage_backend = pillar.get('storage_backend', 'etcd3') -%}
{% set quota_bytes = '' -%}
{% if pillar.get('storage_backend', 'etcd2') == 'etcd3' -%}
{% if pillar.get('storage_backend', 'etcd3') == 'etcd3' -%}
{% set quota_bytes = '--quota-backend-bytes=4294967296' -%}
{% endif -%}
{% set srv_kube_path = "/srv/kubernetes" -%}
@@ -39,7 +39,7 @@
"containers":[
{
"name": "etcd-container",
"image": "gcr.io/google_containers/etcd:{{ pillar.get('etcd_docker_tag', '2.2.1') }}",
"image": "gcr.io/google_containers/etcd:{{ pillar.get('etcd_docker_tag', '3.0.14-alpha.1') }}",
"resources": {
"requests": {
"cpu": {{ cpulimit }}
@@ -55,7 +55,7 @@
"value": "{{ storage_backend }}"
},
{ "name": "TARGET_VERSION",
"value": "{{ pillar.get('etcd_version', '2.2.1') }}"
"value": "{{ pillar.get('etcd_version', '3.0.14') }}"
},
{ "name": "DATA_DIRECTORY",
"value": "/var/etcd/data{{ suffix }}"