Add WINDOWS bool to hack/e2e/run.sh for creating eksctl windows node …

…group

hack/e2e/eksctl.sh

@@ -22,6 +22,7 @@ function eksctl_create_cluster() {
   KUBECONFIG=${8}
   EKSCTL_PATCH_FILE=${9}
   EKSCTL_ADMIN_ROLE=${10}
+  WINDOWS=${11}
 
   generate_ssh_key "${SSH_KEY_PATH}"
 
@@ -57,13 +58,25 @@ function eksctl_create_cluster() {
   loudecho "Getting cluster ${CLUSTER_NAME}"
   ${BIN} get cluster "${CLUSTER_NAME}"
 
-  if [ -n "$EKSCTL_ADMIN_ROLE" ]; then
+  if [[ -n "$EKSCTL_ADMIN_ROLE" ]]; then
     AWS_ACCOUNT_ID=$(aws sts get-caller-identity --query Account --output text)
     ADMIN_ARN="arn:aws:iam::${AWS_ACCOUNT_ID}:role/${EKSCTL_ADMIN_ROLE}"
     loudecho "Granting ${ADMIN_ARN} admin access to the cluster"
     ${BIN} create iamidentitymapping --cluster "${CLUSTER_NAME}" --arn "${ADMIN_ARN}" --group system:masters --username admin
   fi
 
+  if [[ "$WINDOWS" == true ]]; then
+    ${BIN} create nodegroup \
+      --cluster="${CLUSTER_NAME}" \
+      --node-ami-family=WindowsServer2019FullContainer \
+      -n ng-windows \
+      -m 1 \
+      -M 1 \
+      --ssh-access \
+      --ssh-public-key "${SSH_KEY_PATH}".pub
+    ${BIN} utils install-vpc-controllers --cluster="${CLUSTER_NAME}" --approve
+  fi
+
   return $?
 }
 

hack/e2e/run.sh

@@ -59,6 +59,9 @@ KOPS_PATCH_NODE_FILE=${KOPS_PATCH_NODE_FILE:-./hack/kops-patch-node.yaml}
 
 EKSCTL_PATCH_FILE=${EKSCTL_PATCH_FILE:-./hack/eksctl-patch.yaml}
 EKSCTL_ADMIN_ROLE=${EKSCTL_ADMIN_ROLE:-}
+# Creates a windows node group. The windows ami doesn't (yet) install csi-proxy
+# so that has to be done separately.
+WINDOWS=${WINDOWS:-"false"}
 
 HELM_VALUES_FILE=${HELM_VALUES_FILE:-./hack/values.yaml}
 HELM_EXTRA_FLAGS=${HELM_EXTRA_FLAGS:-}
@@ -137,7 +140,8 @@ elif [[ "${CLUSTER_TYPE}" == "eksctl" ]]; then
     "$CLUSTER_FILE" \
     "$KUBECONFIG" \
     "$EKSCTL_PATCH_FILE" \
-    "$EKSCTL_ADMIN_ROLE"
+    "$EKSCTL_ADMIN_ROLE" \
+    "$WINDOWS"
   if [[ $? -ne 0 ]]; then
     exit 1
   fi