Revert "Add unmanaged nodegroup support"

tests/assets/eks_node_group_launch_template_al2023.yaml

@@ -29,22 +29,10 @@ Parameters:
     Type: String
     Description: Launch template ImageId value, which may be an AMI ID or resolve:ssm reference.
     Default: ''
-  NodeRoleName:
-    Type: String
-    Description: Name of the IAM Role for the node instances.
-  SecurityGroup:
-    Type: AWS::EC2::SecurityGroup::Id
-    Description: EKS-created cluster security group that allows node communication with the control plane.
 Conditions:
   AMIProvided:
     !Not [!Equals [!Ref AMI, '']]
 Resources:
-  NodeInstanceProfile:
-    Type: AWS::IAM::InstanceProfile
-    Properties:
-      Path: "/"
-      Roles:
-      - !Ref NodeRoleName
   LaunchTemplate:
     Type: AWS::EC2::LaunchTemplate
     Properties:
@@ -62,10 +50,6 @@ Resources:
           HttpPutResponseHopLimit: 2
           HttpEndpoint: enabled
           HttpTokens: required
-        IamInstanceProfile:
-          Arn: !GetAtt NodeInstanceProfile.Arn
-        SecurityGroupIds:
-          - !Ref SecurityGroup
         ImageId:
           !If
           - AMIProvided

tests/tekton-resources/tasks/setup/eks/awscli-cfn-lt-al2023.yaml

@@ -30,8 +30,6 @@ spec:
     - name: ami
       default: ""
       description: The AMI ID (or SSM parameter) to use for the launch template. If not provided, the launch template will not specify an AMI.
-    - name: node-role-name
-      description: The name of the IAM role to use for the node's instance profile, specified in the launch template.
   workspaces:
     - name: config
       mountPath: /config/
@@ -64,7 +62,7 @@ spec:
             aws ec2 create-key-pair --region $(params.region) --key-name $SSH_KEY_NAME --query 'KeyMaterial' --output text
         fi
 
-        aws eks $ENDPOINT_FLAG describe-cluster --name $(params.cluster-name) --region $(params.region) --output json > cluster.json
+        aws eks describe-cluster --name $(params.cluster-name) --region $(params.region) --output json > cluster.json
 
         launch_template_name=$(params.cluster-name)-launchTemplate
         STACK_NAME=$(params.stack-name)
@@ -82,8 +80,6 @@ spec:
             --arg CertificateAuthority "$(jq -r .cluster.certificateAuthority.data cluster.json)" \
             --arg KubeletConfig '$(params.kubelet-config)' \
             --arg AMI "$(params.ami)" \
-            --arg SecurityGroup "$(jq -r .cluster.resourcesVpcConfig.clusterSecurityGroupId cluster.json)" \
-            --arg NodeRoleName '$(params.node-role-name)' \
             '$ARGS.named | to_entries | map({"ParameterKey": .key, "ParameterValue": .value})' \
           > parameters.json
 
@@ -92,7 +88,6 @@ spec:
                 --stack-name $STACK_NAME \
                 --template-body file://$(pwd)/amazon-ng-cfn \
                 --parameters file://$(pwd)/parameters.json \
-                --capabilities CAPABILITY_IAM \
                 --region $(params.region)
 
             aws cloudformation wait stack-create-complete --stack-name $STACK_NAME --region $(params.region)

tests/tekton-resources/tasks/setup/eks/awscli-mng.yaml

@@ -6,8 +6,8 @@ metadata:
   namespace: scalability
 spec:
   description: |
-    Create an EKS nodegroup, managed or unmanaged, for a given cluster.
-    This Task can be used to create an EKS managed or unmanaged nodegroup for a given VPC Subnets, security groups and service role in an AWS account.
+    Create an EKS managed nodegroup for a given cluster.
+    This Task can be used to create an EKS managed nodegroup for a given VPC Subnets, security groups and service role in an AWS account.
   params:
   - name: cluster-name
     description: The name of the EKS cluster you want to spin managed nodegroups for.
@@ -36,12 +36,6 @@ spec:
   - name: nodegroup-prefix
     description: Prefix that needs to be appended to asg names.
     default: ""
-  - name: unmanaged-nodegroup-cfn-url
-    default: ""
-    description: URL for "unmanaged nodegroup" (AutoScaling group) CloudFormation template. If not specified, a managed nodegroup will be created.
-  - name: launch-template-name
-    default: ""
-    description: Name of the launch template to be used for the nodegroup.
   workspaces:
   - name: config
     mountPath: /config/
@@ -53,11 +47,6 @@ spec:
   - name: create-nodegroup
     image: alpine/k8s:1.23.7
     script: |
-      set -o xtrace
-      set -o errexit
-      set -o pipefail
-      set -o nounset
-
       ENDPOINT_FLAG=""
 
       NODE_ROLE_NAME=$(params.host-cluster-node-role-name)
@@ -71,8 +60,9 @@ spec:
         TAINTS_FLAG="--taints $(params.host-taints)"
       fi
 
-      aws eks $ENDPOINT_FLAG --region $(params.region)  describe-cluster --name $(params.cluster-name) --output json > cluster.json
-      NG_SUBNETS=$(jq -r '.cluster.resourcesVpcConfig.subnetIds | join(" ")' cluster.json)
+      NG_SUBNETS=$(aws eks $ENDPOINT_FLAG --region $(params.region)  describe-cluster --name $(params.cluster-name) \
+      --query cluster.resourcesVpcConfig.subnetIds --output text \
+      )
 
       max_nodes=$(params.max-nodes)
       nodes=$(params.desired-nodes)
@@ -82,100 +72,33 @@ spec:
       create_and_validate_dp_nodes()
       {
         node_group_name=$node_group-$1
+        launch_template_name=$(params.cluster-name)-launchTemplate
+        CREATED_NODEGROUP=$(aws eks $ENDPOINT_FLAG --region $(params.region) list-nodegroups --cluster-name $(params.cluster-name)  --query 'nodegroups[?@==`'$node_group_name'`]' --output text)
         EC2_INSTANCES=$3
-        # if no unmanaged nodegroup cfn template is provided, assume we want managed nodegroups
-        if [ "$(params.unmanaged-nodegroup-cfn-url)" = "" ]; then
-          CREATED_NODEGROUP=$(aws eks $ENDPOINT_FLAG --region $(params.region) list-nodegroups --cluster-name $(params.cluster-name)  --query 'nodegroups[?@==`'$node_group_name'`]' --output text)
-          if [ "$CREATED_NODEGROUP" == "" ]; then
-            aws eks $ENDPOINT_FLAG create-nodegroup \
-            --cluster-name $(params.cluster-name) \
-            --nodegroup-name $node_group_name \
-            --node-role $NODE_ROLE_ARN \
-            --launch-template name=$(params.launch-template-name) \
-            --region $(params.region) \
-            --instance-types $EC2_INSTANCES \
-            --scaling-config minSize=$(params.min-nodes),maxSize=$2,desiredSize=$2 \
-            --subnets $NG_SUBNETS $TAINTS_FLAG
-          fi
-          echo "CREATED_NODEGROUP=$node_group_name"
-          while [[ "$(aws eks $ENDPOINT_FLAG --region $(params.region) describe-nodegroup --cluster-name $(params.cluster-name) --nodegroup-name $node_group_name --query nodegroup.status --output text)" == "CREATING" ]]
-          do
-            echo "$node_group_name is "CREATING" at $(date)"
-            sleep 2
-          done
-          # TODO: do this for unmanaged nodes as well
-          # right now we don't have an appropriate label to filter on for unmanaged nodes
-          while true; do
-            ready_node=$(kubectl get nodes -l eks.amazonaws.com/nodegroup=$node_group_name --no-headers 2>/dev/null | grep -w Ready | wc -l)
-            echo "ready-nodes=$ready_node out of $2, for nodegroup: $node_group_name"
-            if [[ "$ready_node" -eq $2 ]]; then break; fi
-            sleep 5
-          done
-        else
-          echo "Creating or updating aws-auth ConfigMap..."
-          if ! kubectl get configmap aws-auth -n kube-system &> /dev/null; then
-            # Download the official template as shown in the Amazon EKS User Guide:
-            # https://docs.aws.amazon.com/eks/latest/userguide/auth-configmap.html#aws-auth-configmap
-            curl -O https://s3.us-west-2.amazonaws.com/amazon-eks/cloudformation/2020-10-29/aws-auth-cm.yaml
-
-            # Replace the placeholder with our role ARN and apply the configmap
-            sed -i.bak -e "s|<ARN of instance role (not instance profile)>|${NODE_ROLE_ARN}|" aws-auth-cm.yaml
-
-            kubectl apply -f aws-auth-cm.yaml
-            echo "Created aws-auth ConfigMap"
-            # Wait for the config map to be ready
-            echo "Verifying aws-auth ConfigMap..."
-            for i in {1..10}; do
-              if kubectl get configmap aws-auth -n kube-system -o yaml | grep -q "${NODE_ROLE_ARN}"; then
-                echo "aws-auth ConfigMap verified successfully"
-                break
-              fi
-              if [ $i -eq 10 ]; then
-                echo "Warning: Could not verify aws-auth ConfigMap after 10 attempts"
-              else
-                echo "Waiting for aws-auth ConfigMap to be ready... attempt $i"
-                sleep 5
-              fi
-            done
-          else
-            echo "aws-auth ConfigMap already exists"
-          fi
-
-          STACK_NAME=$node_group_name
-          STACK_STATUS=$(aws cloudformation describe-stacks --query 'Stacks[?StackName==`'${STACK_NAME}'`].StackStatus' --output text  --region $(params.region))
-          if [[ "$STACK_STATUS" == "" ]]; then
-            curl -s $(params.unmanaged-nodegroup-cfn-url) -o ./cfn-template
-
-          # assemble the stack parameters as a JSON file
-          # the AWS CLI can't handle a JSON string as a ParameterValue in the flag representation
-          # and we need that for kubelet-config
-          jq --null-input \
-              --arg LaunchTemplateName "$(params.launch-template-name)" \
-              --arg ClusterName "$(params.cluster-name)" \
-              --arg AutoScalingGroupName "${node_group_name}" \
-              --arg NodeCount "$2" \
-              --arg SubnetIds $(jq -r '.cluster.resourcesVpcConfig.subnetIds | join(",")' cluster.json) \
-              --arg SecurityGroup "$(jq -r '.cluster.resourcesVpcConfig.clusterSecurityGroupId' cluster.json)" \
-              --arg VpcId $(jq -r '.cluster.resourcesVpcConfig.vpcId' cluster.json) \
-              '$ARGS.named | to_entries | map({"ParameterKey": .key, "ParameterValue": .value})' \
-            > parameters.json
-
-            # cloudformation really fights you every step of the way to pass JSON in, so let's just hack it
-            LAUNCH_TEMPLATE_OVERRIDES=$(echo "$EC2_INSTANCES" | jq -R -c 'split(" ") | map({"InstanceType": .})')
-            sed -i "s/PLACEHOLDER_LAUNCH_TEMPLATE_OVERRIDES/$LAUNCH_TEMPLATE_OVERRIDES/g" cfn-template
-
-            aws cloudformation create-stack \
-              --region $(params.region) \
-              --stack-name $STACK_NAME \
-              --template-body file://$(pwd)/cfn-template \
-              --parameters file://$(pwd)/parameters.json
-
-              aws cloudformation wait stack-create-complete --stack-name $STACK_NAME --region $(params.region)
-              echo "CREATED_CFN_STACK=$STACK_NAME"
-          else
-              echo "$STACK_NAME Already exists"
-          fi
+        if [ "$CREATED_NODEGROUP" == "" ]; then
+          #create node group
+          aws eks $ENDPOINT_FLAG create-nodegroup \
+          --cluster-name $(params.cluster-name) \
+          --nodegroup-name $node_group_name \
+          --node-role $NODE_ROLE_ARN \
+          --launch-template name=$launch_template_name\
+          --region $(params.region) \
+          --instance-types $EC2_INSTANCES \
+          --scaling-config minSize=$(params.min-nodes),maxSize=$2,desiredSize=$2 \
+          --subnets $NG_SUBNETS $TAINTS_FLAG
         fi
+        echo "CREATED_NODEGROUP=$node_group_name"
+        while [[ "$(aws eks $ENDPOINT_FLAG --region $(params.region) describe-nodegroup --cluster-name $(params.cluster-name) --nodegroup-name $node_group_name --query nodegroup.status --output text)" == "CREATING" ]]
+        do
+          echo "$node_group_name is "CREATING" at $(date)"
+          sleep 2
+        done
+        while true; do
+          ready_node=$(kubectl get nodes -l eks.amazonaws.com/nodegroup=$node_group_name --no-headers 2>/dev/null | grep -w Ready | wc -l)
+          echo "ready-nodes=$ready_node out of $2, for nodegroup: $node_group_name"
+          if [[ "$ready_node" -eq $2 ]]; then break; fi
+          sleep 5
+        done
       }
       for i in $(seq 1 $asgs)
       do