Reverting some commits causing test failures

tests/pipelines/eks/awscli-cl2-load-with-addons.yaml

@@ -16,9 +16,6 @@ spec:
   - name: slack-message
   - name: amp-workspace-id
   - name: vpc-cfn-url
-    default: "https://raw.githubusercontent.com/awslabs/kubernetes-iteration-toolkit/main/tests/assets/amazon-eks-vpc.json"
-  - name: ng-cfn-url
-    default: "https://raw.githubusercontent.com/awslabs/kubernetes-iteration-toolkit/main/tests/assets/eks_nodeGroup_launch_template.json"
   - name: kubernetes-version
   - name: service-role-cfn-url
     default: "https://raw.githubusercontent.com/awslabs/kubernetes-iteration-toolkit/main/tests/assets/eks_service_role.json"
@@ -92,26 +89,6 @@ spec:
     workspaces:
     - name: config    
       workspace: config
-  - name: create-launch-template
-    params:
-      - name: cluster-name
-        value: $(params.cluster-name)
-      - name: stack-name
-        value: $(params.cluster-name)-launch-template
-      - name: kubernetes-version
-        value: "$(params.kubernetes-version)"
-      - name: ng-cfn-url
-        value: "$(params.ng-cfn-url)"
-      - name: endpoint
-        value: $(params.endpoint)
-    runAfter:
-      - create-eks-cluster
-    taskRef:
-      kind: Task
-      name: awscli-eks-cfn-launch-template
-    workspaces:
-      - name: config
-        workspace: config
   - name: create-mng-monitoring-nodes
     params:
     - name: cluster-name
@@ -131,7 +108,7 @@ spec:
     - name: nodegroup-prefix
       value: "monitoring-"
     runAfter:
-    - create-launch-template
+    - create-eks-cluster
     taskRef:
       kind: Task
       name:  awscli-eks-nodegroup-create
@@ -237,8 +214,6 @@ spec:
       value: $(params.cluster-name)-service-role
     - name: node-role-stack-name
       value: $(params.cluster-name)-node-role
-    - name: launch-template-stack-name
-      value: $(params.cluster-name)-launch-template
     taskRef:
       kind: Task
       name:  awscli-eks-cluster-teardown

tests/pipelines/eks/awscli-eks-cl2-load.yaml

@@ -18,9 +18,6 @@ spec:
   - name: slack-hook
   - name: slack-message
   - name: vpc-cfn-url
-    default: "https://raw.githubusercontent.com/awslabs/kubernetes-iteration-toolkit/main/tests/assets/amazon-eks-vpc.json"
-  - name: ng-cfn-url
-    default: "https://raw.githubusercontent.com/awslabs/kubernetes-iteration-toolkit/main/tests/assets/eks_nodeGroup_launch_template.json"
   - name: kubernetes-version
     default: "1.23"
   - name: amp-workspace-id
@@ -91,26 +88,6 @@ spec:
     workspaces:
     - name: config    
       workspace: config
-  - name: create-cfn-launch-template
-    params:
-      - name: cluster-name
-        value: $(params.cluster-name)
-      - name: stack-name
-        value: $(params.cluster-name)-launch-template
-      - name: kubernetes-version
-        value: "$(params.kubernetes-version)"
-      - name: ng-cfn-url
-        value: "$(params.ng-cfn-url)"
-      - name: endpoint
-        value: $(params.endpoint)
-    runAfter:
-      - create-eks-cluster
-    taskRef:
-      kind: Task
-      name: awscli-eks-cfn-launch-template
-    workspaces:
-      - name: config
-        workspace: config
   - name: create-mng-monitoring-nodes
     params:
     - name: cluster-name
@@ -130,7 +107,7 @@ spec:
     - name: nodegroup-prefix
       value: "monitoring-"
     runAfter:
-    - create-cfn-launch-template
+    - create-eks-cluster
     taskRef:
       kind: Task
       name:  awscli-eks-nodegroup-create
@@ -224,8 +201,6 @@ spec:
       value: $(params.cluster-name)-service-role
     - name: node-role-stack-name
       value: $(params.cluster-name)-node-role
-    - name: launch-template-stack-name
-      value: $(params.cluster-name)-launch-template
     taskRef:
       kind: Task
       name:  awscli-eks-cluster-teardown

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

@@ -75,11 +75,9 @@ spec:
       asgs=$((nodes/max_nodes))
       echo "asgs: $asgs"
       node_group=$(params.nodegroup-prefix)$(params.cluster-name)-nodes
-
       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 [ "$CREATED_NODEGROUP" == "" ]; then
@@ -88,7 +86,6 @@ spec:
           --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 \

tests/tasks/teardown/awscli-eks.yaml

@@ -22,7 +22,6 @@ spec:
     default: "Job is completed"
   - name: service-role-stack-name
   - name: node-role-stack-name
-  - name: launch-template-stack-name
   steps:
   - name: delete-cluster
     image: alpine/k8s:1.23.7
@@ -43,7 +42,6 @@ spec:
     script: |
       aws cloudformation delete-stack --stack-name $(params.service-role-stack-name)
       aws cloudformation delete-stack --stack-name $(params.node-role-stack-name)
-      aws cloudformation delete-stack --stack-name $(params.launch-template-stack-name)
   - name: send-slack-notification
     image: alpine/k8s:1.23.7
     script: |

tests/tasks/teardown/awscli-vpc-delete.yaml

@@ -29,4 +29,4 @@ spec:
         aws cloudformation delete-stack --region $(params.region) --stack-name $(params.stack-name) 
         # Wait for the stack to be deleted
         aws cloudformation wait stack-delete-complete --region $(params.region) --stack-name $(params.stack-name)
-        echo "Stack deleted successfully!"
+        echo "Stack deleted successfully!"