etcd: Rename ESCAPED_IP_ADDR to ESCAPED_IP_ADDRESS

as requested in during review of PR #1211.
openshift · Dec 19, 2019 · d0ac32e · d0ac32e
1 parent 2031c46
commit d0ac32e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/cmd/setup-etcd-environment/run.go b/cmd/setup-etcd-environment/run.go
@@ -179,7 +179,7 @@ func runRunCmd(cmd *cobra.Command, args []string) error {
 	unexportedEnv := map[string]string{
 		// TODO This can actually be IPv6, so we should rename this ...
 		"IPV4_ADDRESS":         setupEnv.etcdIP,
-		"ESCAPED_IP_ADDR":      escapedIP,
+		"ESCAPED_IP_ADDRESS":   escapedIP,
 		"ESCAPED_ALL_IPS":      escapedAllIPs,
 		"LOCALHOST_IP":         localhostIP,
 		"ESCAPED_LOCALHOST_IP": escapedLocalhostIP,

diff --git a/templates/master/00-master/_base/files/etc-kubernetes-manifests-etcd-member.yaml b/templates/master/00-master/_base/files/etc-kubernetes-manifests-etcd-member.yaml
@@ -135,7 +135,7 @@ contents:
           set +a
 
           exec etcd \
-            --initial-advertise-peer-urls=https://${ETCD_ESCAPED_IP_ADDR}:2380 \
+            --initial-advertise-peer-urls=https://${ETCD_ESCAPED_IP_ADDRESS}:2380 \
             --cert-file=/etc/ssl/etcd/system:etcd-server:${ETCD_DNS_NAME}.crt \
             --key-file=/etc/ssl/etcd/system:etcd-server:${ETCD_DNS_NAME}.key \
             --trusted-ca-file=/etc/ssl/etcd/ca.crt \
@@ -144,7 +144,7 @@ contents:
             --peer-key-file=/etc/ssl/etcd/system:etcd-peer:${ETCD_DNS_NAME}.key \
             --peer-trusted-ca-file=/etc/ssl/etcd/ca.crt \
             --peer-client-cert-auth=true \
-            --advertise-client-urls=https://${ETCD_ESCAPED_IP_ADDR}:2379 \
+            --advertise-client-urls=https://${ETCD_ESCAPED_IP_ADDRESS}:2379 \
             --listen-client-urls=https://${ETCD_ESCAPED_ALL_IPS}:2379 \
             --listen-peer-urls=https://${ETCD_ESCAPED_ALL_IPS}:2380 \
             --listen-metrics-urls=https://${ETCD_ESCAPED_ALL_IPS}:9978 \