Merge pull request #530 from mumoshu/node-instance-id-label

feat: Instance ID Node Label
eksctl-io · Feb 12, 2019 · bbac8d6 · bbac8d6
2 parents d61f737 + 305e8ff
commit bbac8d6
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/pkg/nodebootstrap/assets.go b/pkg/nodebootstrap/assets.go
diff --git a/pkg/nodebootstrap/assets/10-eksclt.al2.conf b/pkg/nodebootstrap/assets/10-eksclt.al2.conf
@@ -5,15 +5,15 @@
 EnvironmentFile=/etc/eksctl/metadata.env
 # Global and static parameters: MAX_PODS, CLUSTER_DNS, NODE_LABELS
 EnvironmentFile=/etc/eksctl/kubelet.env
-# Local non-static parameters: NODE_IP
+# Local non-static parameters: NODE_IP, INSTANCE_ID
 EnvironmentFile=/etc/eksctl/kubelet.local.env
 
 ExecStart=
 ExecStart=/usr/bin/kubelet \
   --node-ip=${NODE_IP} \
   --cluster-dns=${CLUSTER_DNS} \
   --max-pods=${MAX_PODS} \
-  --node-labels=${NODE_LABELS} \
+  --node-labels=${NODE_LABELS},alpha.eksctl.io/instance-id=${INSTANCE_ID} \
   --allow-privileged=true \
   --pod-infra-container-image=602401143452.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/eks/pause-amd64:3.1 \
   --cloud-provider=aws \

diff --git a/pkg/nodebootstrap/assets/bootstrap.al2.sh b/pkg/nodebootstrap/assets/bootstrap.al2.sh
@@ -1,6 +1,7 @@
 #!/bin/sh -eu
 
 echo "NODE_IP=$(curl --silent http://169.254.169.254/latest/meta-data/local-ipv4)" > /etc/eksctl/kubelet.local.env
+echo "INSTANCE_ID=$(curl --silent http://169.254.169.254/latest/meta-data/instance-id)" >> /etc/eksctl/kubelet.local.env
 
 systemctl daemon-reload
 systemctl enable kubelet

diff --git a/pkg/nodebootstrap/assets/bootstrap.ubuntu.sh b/pkg/nodebootstrap/assets/bootstrap.ubuntu.sh
@@ -1,6 +1,7 @@
 #!/bin/bash -eu
 
 echo "NODE_IP=$(curl --silent http://169.254.169.254/latest/meta-data/local-ipv4)" > /etc/eksctl/kubelet.local.env
+echo "INSTANCE_ID=$(curl --silent http://169.254.169.254/latest/meta-data/instance-id)" >> /etc/eksctl/kubelet.local.env
 
 snap alias kubelet-eks.kubelet kubelet
 snap alias kubectl-eks.kubectl kubectl
@@ -22,7 +23,7 @@ systemctl reset-failed
     "node-ip=${NODE_IP}"
     "cluster-dns=${CLUSTER_DNS}"
     "max-pods=${MAX_PODS}"
-    "node-labels=${NODE_LABELS}"
+    "node-labels=${NODE_LABELS},alpha.eksctl.io/instance-id=${INSTANCE_ID}"
     "authentication-token-webhook=true"
     "authorization-mode=Webhook"
     "allow-privileged=true"