From 44f364b2ef124ecd2622270f9bf247d775e43558 Mon Sep 17 00:00:00 2001
From: Kevin Lefevre <kevin.lefevre@osones.io>
Date: Wed, 1 Feb 2017 10:50:41 +0100
Subject: [PATCH] Remove $myip when unnecessary and use KUBE_NODE_IP

myip is defined almost in every fragment. It is unnecessary. We can use
KUBE_NODE_IP that is defined in HEAT. Also, if for some reason
KUBE_NODE_IP is empty, we use the failsafe like in make-cert fragment
where we curl metadata to make sure KUBE_NODE_IP is not empty.

Implements: blueprint coreos-best-pratice
Change-Id: I8597a5afa9b4bc7a5c740738303102e7b60ec63e
---
 .../templates/fragments/configure-etcd.yaml        | 14 ++++++++------
 .../templates/fragments/create-kube-namespace.yaml |  2 --
 .../templates/fragments/enable-kube-apiserver.yaml |  2 --
 .../fragments/enable-kube-proxy-master.yaml        |  2 --
 .../fragments/enable-kube-proxy-minion.yaml        |  2 --
 .../templates/fragments/enable-kubelet-master.yaml |  6 ++++--
 .../templates/fragments/enable-kubelet-minion.yaml |  6 ++++--
 .../fragments/enable-network-service-client.yaml   |  7 +++++--
 .../fragments/enable-network-service.yaml          |  7 +++++--
 9 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/magnum/drivers/k8s_coreos_v1/templates/fragments/configure-etcd.yaml b/magnum/drivers/k8s_coreos_v1/templates/fragments/configure-etcd.yaml
index 4f9fe52365..a66e32fd6c 100644
--- a/magnum/drivers/k8s_coreos_v1/templates/fragments/configure-etcd.yaml
+++ b/magnum/drivers/k8s_coreos_v1/templates/fragments/configure-etcd.yaml
@@ -21,7 +21,9 @@ write_files:
     content: |
       #!/bin/sh
 
-      myip=$(curl -s http://169.254.169.254/latest/meta-data/local-ipv4)
+      if [ -z "${KUBE_NODE_IP}" ]; then
+        KUBE_NODE_IP=$(curl -s http://169.254.169.254/latest/meta-data/local-ipv4)
+      fi
 
       DROP_IN_FILE=/etc/systemd/system/etcd2.service.d/20-configure-etcd.conf
       mkdir -p $(dirname $DROP_IN_FILE)
@@ -32,13 +34,13 @@ write_files:
       fi
       cat > $DROP_IN_FILE <<EOF
       [Service]
-      Environment=ETCD_NAME=$myip
+      Environment=ETCD_NAME=$KUBE_NODE_IP
       Environment=ETCD_DATA_DIR=/var/lib/etcd/default.etcd
-      Environment=ETCD_LISTEN_CLIENT_URLS=$protocol://$myip:2379,http://127.0.0.1:2379
-      Environment=ETCD_LISTEN_PEER_URLS=$protocol://$myip:2380
+      Environment=ETCD_LISTEN_CLIENT_URLS=$protocol://$KUBE_NODE_IP:2379,http://127.0.0.1:2379
+      Environment=ETCD_LISTEN_PEER_URLS=$protocol://$KUBE_NODE_IP:2380
 
-      Environment=ETCD_ADVERTISE_CLIENT_URLS=$protocol://$myip:2379,http://127.0.0.1:2379
-      Environment=ETCD_INITIAL_ADVERTISE_PEER_URLS=$protocol://$myip:2380
+      Environment=ETCD_ADVERTISE_CLIENT_URLS=$protocol://$KUBE_NODE_IP:2379,http://127.0.0.1:2379
+      Environment=ETCD_INITIAL_ADVERTISE_PEER_URLS=$protocol://$KUBE_NODE_IP:2380
       Environment=ETCD_DISCOVERY=$ETCD_DISCOVERY_URL
       EOF
 
diff --git a/magnum/drivers/k8s_coreos_v1/templates/fragments/create-kube-namespace.yaml b/magnum/drivers/k8s_coreos_v1/templates/fragments/create-kube-namespace.yaml
index ca0966ce31..ff8861260f 100644
--- a/magnum/drivers/k8s_coreos_v1/templates/fragments/create-kube-namespace.yaml
+++ b/magnum/drivers/k8s_coreos_v1/templates/fragments/create-kube-namespace.yaml
@@ -23,8 +23,6 @@ write_files:
     content: |
       #!/bin/sh
 
-      myip=$(curl -s http://169.254.169.254/latest/meta-data/local-ipv4)
-
       until curl -sf "http://127.0.0.1:8080/healthz"
       do
           echo "Waiting for Kubernetes API..."
diff --git a/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kube-apiserver.yaml b/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kube-apiserver.yaml
index 72e0293813..af880daee9 100644
--- a/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kube-apiserver.yaml
+++ b/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kube-apiserver.yaml
@@ -21,8 +21,6 @@ write_files:
     content: |
       #!/bin/sh
 
-      myip=$(curl -s http://169.254.169.254/latest/meta-data/local-ipv4)
-
       TLS_CERT_FILE=${KUBE_CERTS_PATH}/apiserver.pem
       TLS_PRIVATE_KEY_FILE=${KUBE_CERTS_PATH}/apiserver-key.pem
       CLIENT_CA_FILE=${KUBE_CERTS_PATH}/ca.pem
diff --git a/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kube-proxy-master.yaml b/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kube-proxy-master.yaml
index 7a45669eba..3cc9ac5d31 100644
--- a/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kube-proxy-master.yaml
+++ b/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kube-proxy-master.yaml
@@ -21,8 +21,6 @@ write_files:
     content: |
       #!/bin/sh
 
-      myip=$(curl -s http://169.254.169.254/latest/meta-data/local-ipv4)
-
       TEMPLATE=/etc/kubernetes/manifests/kube-proxy.yaml
       mkdir -p $(dirname ${TEMPLATE})
       cat > ${TEMPLATE} <<EOF
diff --git a/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kube-proxy-minion.yaml b/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kube-proxy-minion.yaml
index 8e5f32bcac..f7d8f86c95 100644
--- a/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kube-proxy-minion.yaml
+++ b/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kube-proxy-minion.yaml
@@ -21,8 +21,6 @@ write_files:
     content: |
       #!/bin/sh
 
-      myip=$(curl -s http://169.254.169.254/latest/meta-data/local-ipv4)
-
       KUBE_CONFIG_PATH=/etc/kubernetes/config
       KUBE_PROTOCOL="https"
       KUBE_CONFIG="${KUBE_CONFIG_PATH}/worker-kubeconfig.yaml"
diff --git a/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kubelet-master.yaml b/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kubelet-master.yaml
index 03f37c295e..47b7bd45a5 100644
--- a/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kubelet-master.yaml
+++ b/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kubelet-master.yaml
@@ -21,7 +21,9 @@ write_files:
     content: |
       #!/bin/sh
 
-      myip=$(curl -s http://169.254.169.254/latest/meta-data/local-ipv4)
+      if [ -z "${KUBE_NODE_IP}" ]; then
+        KUBE_NODE_IP=$(curl -s http://169.254.169.254/latest/meta-data/local-ipv4)
+      fi
 
       CONF_FILE=/etc/systemd/system/kubelet.service
       cat > $CONF_FILE <<EOF
@@ -34,7 +36,7 @@ write_files:
         --register-schedulable=false \
         --allow-privileged=true \
         --config=/etc/kubernetes/manifests \
-        --hostname-override=${myip} \
+        --hostname-override=${KUBE_NODE_IP} \
         --logtostderr=true \
         --v=0
       Restart=always
diff --git a/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kubelet-minion.yaml b/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kubelet-minion.yaml
index 0fdac9240c..85617acc2c 100644
--- a/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kubelet-minion.yaml
+++ b/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kubelet-minion.yaml
@@ -21,7 +21,9 @@ write_files:
     content: |
       #!/bin/sh
 
-      myip=$(curl -s http://169.254.169.254/latest/meta-data/local-ipv4)
+      if [ -z "${KUBE_NODE_IP}" ]; then
+        KUBE_NODE_IP=$(curl -s http://169.254.169.254/latest/meta-data/local-ipv4)
+      fi
 
       TLS_CERT_FILE=${KUBE_CERTS_PATH}/worker.pem
       TLS_PRIVATE_KEY_FILE=${KUBE_CERTS_PATH}/worker-key.pem
@@ -45,7 +47,7 @@ write_files:
         --register-node=true \
         --allow-privileged=true \
         --config=/etc/kubernetes/manifests \
-        --hostname-override=${myip} \
+        --hostname-override=${KUBE_NODE_IP} \
         --logtostderr=true \
         --v=0 \
         --cadvisor-port=4194 \
diff --git a/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-network-service-client.yaml b/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-network-service-client.yaml
index 690116cfea..fbed975254 100644
--- a/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-network-service-client.yaml
+++ b/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-network-service-client.yaml
@@ -25,7 +25,10 @@ write_files:
           exit 0
       fi
 
-      myip=$(curl -s http://169.254.169.254/latest/meta-data/local-ipv4)
+      if [ -z "${KUBE_NODE_IP}" ]; then
+        KUBE_NODE_IP=$(curl -s http://169.254.169.254/latest/meta-data/local-ipv4)
+      fi
+
       ETCD_SERVER_IP=${ETCD_SERVER_IP:-127.0.0.1}
 
       PROTOCOL=https
@@ -37,7 +40,7 @@ write_files:
       ENV_FILE=/etc/flannel/options.env
       mkdir -p $(dirname $ENV_FILE)
       cat > $ENV_FILE <<EOF
-      FLANNELD_IFACE=$myip
+      FLANNELD_IFACE=${KUBE_NODE_IP}
       FLANNELD_ETCD_ENDPOINTS=${PROTOCOL}://${ETCD_SERVER_IP}:2379
       EOF
 
diff --git a/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-network-service.yaml b/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-network-service.yaml
index 52a57189f2..800f532803 100644
--- a/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-network-service.yaml
+++ b/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-network-service.yaml
@@ -25,7 +25,10 @@ write_files:
           exit 0
       fi
 
-      myip=$(curl -s http://169.254.169.254/latest/meta-data/local-ipv4)
+      if [ -z "${KUBE_NODE_IP}" ]; then
+        KUBE_NODE_IP=$(curl -s http://169.254.169.254/latest/meta-data/local-ipv4)
+      fi
+
       ETCD_SERVER_IP=${ETCD_SERVER_IP:-127.0.0.1}
 
       PROTOCOL=https
@@ -37,7 +40,7 @@ write_files:
       ENV_FILE=/etc/flannel/options.env
       mkdir -p $(dirname $ENV_FILE)
       cat > $ENV_FILE <<EOF
-      FLANNELD_IFACE=$myip
+      FLANNELD_IFACE=${KUBE_NODE_IP}
       FLANNELD_ETCD_ENDPOINTS=${PROTOCOL}://${ETCD_SERVER_IP}:2379
       EOF