Merge pull request #61960 from jpbetz/migrate-if-needed-ha-fix-1.10

Automatic merge from submit-queue. Backport etcd.manifest fixes for HA clusters from #61241 to 1.10 Backport the `etcd.manifest` changes from #61241 to kubernetes 1.8. This fixes GCE configurations using HA etcd with k8s.gcr.io/etcd images built from #61241 (k8s.gcr.io/etcd:e.g. 3.1.13-0). ```release-note Fix GCE etcd scripts to pass in all required parameters for the etcd migration utility to correctly perform HA upgrades and downgrades ```

Merge pull request #61960 from jpbetz/migrate-if-needed-ha-fix-1.10
3ca752c6 · Kubernetes Submit Queue · GitHub · 18ca81f0 · 204616bd · 3ca752c6
Unverified Commit 3ca752c6 authored Apr 04, 2018 by Kubernetes Submit Queue Committed by GitHub Apr 04, 2018
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

etcd.manifest cluster/gce/manifests/etcd.manifest +6 -0

No files found.
--- a/cluster/gce/manifests/etcd.manifest
+++ b/cluster/gce/manifests/etcd.manifest
@@ -37,6 +37,12 @@
      { "name": "INITIAL_CLUSTER",
        "value": "{{ etcd_cluster }}"
      },
+      { "name": "LISTEN_PEER_URLS",
+        "value": "{{ etcd_protocol }}://{{ host_ip }}:{{ server_port }}"
+      },
+      { "name": "INITIAL_ADVERTISE_PEER_URLS",
+        "value": "{{ etcd_protocol }}://{{ hostname }}:{{ server_port }}"
+      },
      { "name": "ETCD_CREDS",
        "value": "{{ etcd_creds }}"
      }