update custom networking integration tests following node readiness c…

…hanges
aws · Apr 26, 2023 · b4caba8 · b4caba8
1 parent 62bc27c
commit b4caba8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 11 deletions.
diff --git a/scripts/run-ginkgo-integration-suite.sh b/scripts/run-ginkgo-integration-suite.sh
@@ -14,7 +14,7 @@ source "$SCRIPT_DIR"/lib/cluster.sh
 source "$SCRIPT_DIR"/lib/canary.sh
 
 function run_ginkgo_test() {
-  (CGO_ENABLED=0 ginkgo $EXTRA_GINKGO_FLAGS -v --timeout 30m --no-color --fail-on-pending $GINKGO_TEST_BUILD/$SUITE_NAME.test -- --cluster-kubeconfig="$KUBE_CONFIG_PATH" --cluster-name="$CLUSTER_NAME" --aws-region="$REGION" --aws-vpc-id="$VPC_ID" --ng-name-label-key="kubernetes.io/os" --ng-name-label-val="linux")
+  (CGO_ENABLED=0 ginkgo $EXTRA_GINKGO_FLAGS -v --timeout 60m --no-color --fail-on-pending $GINKGO_TEST_BUILD/$SUITE_NAME.test -- --cluster-kubeconfig="$KUBE_CONFIG_PATH" --cluster-name="$CLUSTER_NAME" --aws-region="$REGION" --aws-vpc-id="$VPC_ID" --ng-name-label-key="kubernetes.io/os" --ng-name-label-val="linux")
 }
 
 load_cluster_details

diff --git a/test/framework/resources/k8s/resources/node.go b/test/framework/resources/k8s/resources/node.go
@@ -89,8 +89,6 @@ func (d *defaultNodeManager) WaitTillNodesReady(nodeLabelKey string, nodeLabelVa
 				}
 			}
 		}
-
 		return true, nil
-
 	}, context.Background().Done())
 }
diff --git a/test/integration/custom-networking/custom_networking_test.go b/test/integration/custom-networking/custom_networking_test.go
@@ -164,15 +164,11 @@ var _ = Describe("Custom Networking Test", func() {
 			err = f.CloudServices.EC2().TerminateInstance(instanceIDs)
 			Expect(err).ToNot(HaveOccurred())
 
-			By("waiting for the node to be removed")
+			By("waiting for nodes to be removed")
 			time.Sleep(time.Second * 120)
 
-			By("waiting for all nodes to become ready")
-			err = f.K8sResourceManagers.NodeManager().
-				WaitTillNodesReady(nodeGroupProperties.NgLabelKey, nodeGroupProperties.NgLabelVal,
-					nodeGroupProperties.AsgSize)
-			Expect(err).ToNot(HaveOccurred())
-
+			// Nodes should be stuck in NotReady state since no ENIs could be attached and no pod
+			// IP addresses are available.
 			deployment := manifest.NewBusyBoxDeploymentBuilder().
 				Replicas(2).
 				NodeSelector(nodeGroupProperties.NgLabelKey, nodeGroupProperties.NgLabelVal).

diff --git a/testdata/amazon-eks-nodegroup.yaml b/testdata/amazon-eks-nodegroup.yaml
@@ -74,7 +74,7 @@ Parameters:
 
   NodeImageIdSSMParam:
     Type: "AWS::SSM::Parameter::Value<AWS::EC2::Image::Id>"
-    Default: /aws/service/eks/optimized-ami/1.22/amazon-linux-2/recommended/image_id
+    Default: /aws/service/eks/optimized-ami/1.24/amazon-linux-2/recommended/image_id
     Description: AWS Systems Manager Parameter Store parameter of the AMI ID for the worker node instances. Change this value to match the version of Kubernetes you are using.
 
   DisableIMDSv1:
-Original file line number
+Diff line change
@@ Expand Up @@
     				}
     			}
     		}
     		return true, nil
     	}, context.Background().Done())
     }