Use kubernetes minor version to choose kubelet config

awslabs · May 30, 2019 · eccfa3a · eccfa3a
1 parent 32d2ac4
commit eccfa3a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/eks-worker-al2.json b/eks-worker-al2.json
@@ -90,10 +90,9 @@
       "type": "shell",
       "script": "install-worker.sh",
       "environment_vars": [
-        "KUBERNETES_VERSION={{user `kubernetes_version`}}",
-        "BINARY_BUCKET_NAME={{user `binary_bucket_name`}}",
         "KUBERNETES_VERSION={{user `kubernetes_version`}}",
         "KUBERNETES_BUILD_DATE={{user `kubernetes_build_date`}}",
+        "BINARY_BUCKET_NAME={{user `binary_bucket_name`}}",
         "BINARY_BUCKET_REGION={{user `binary_bucket_region`}}",
         "DOCKER_VERSION={{user `docker_version`}}",
         "CNI_VERSION={{user `cni_version`}}",

diff --git a/install-worker.sh b/install-worker.sh
@@ -170,7 +170,8 @@ done
 sudo rm *.sha256
 
 KUBELET_CONFIG=""
-if [ "$KUBERNETES_VERSION" = "1.10" ] || [ "$KUBERNETES_VERSION" = "1.11" ]; then
+KUBERNETES_MINOR_VERSION=${KUBERNETES_VERSION%.*}
+if [ "$KUBERNETES_MINOR_VERSION" = "1.10" ] || [ "$KUBERNETES_MINOR_VERSION" = "1.11" ]; then
     KUBELET_CONFIG=kubelet-config.json
 else
     # For newer versions use this config to fix https://github.com/kubernetes/kubernetes/issues/74412.