From b0d3228959b856c43712d2d60412cb33dfc94178 Mon Sep 17 00:00:00 2001 From: Ben Napolitan Date: Thu, 11 Jun 2020 23:00:48 -0400 Subject: [PATCH] Try to create new nodegroup and apply deployment to it. --- deploy-20-pods.yaml | 3 ++- scripts/lib/cluster.sh | 2 +- scripts/run-integration-tests.sh | 6 ++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/deploy-20-pods.yaml b/deploy-20-pods.yaml index f02e08e3f74..6b7ec5efa59 100644 --- a/deploy-20-pods.yaml +++ b/deploy-20-pods.yaml @@ -21,5 +21,6 @@ spec: ports: - name: http containerPort: 80 + imagePullPolicy: IfNotPresent nodeSelector: - nodetomatch: thisone + eks.amazonaws.com/nodegroup: two-nodes diff --git a/scripts/lib/cluster.sh b/scripts/lib/cluster.sh index c8458d6d30d..85261488161 100644 --- a/scripts/lib/cluster.sh +++ b/scripts/lib/cluster.sh @@ -25,7 +25,7 @@ function up-test-cluster() { AWS_K8S_TESTER_EKS_ADD_ON_MANAGED_NODE_GROUPS_ENABLE=true \ AWS_K8S_TESTER_EKS_ADD_ON_MANAGED_NODE_GROUPS_ROLE_CREATE=$ROLE_CREATE \ AWS_K8S_TESTER_EKS_ADD_ON_MANAGED_NODE_GROUPS_ROLE_ARN=$ROLE_ARN \ - AWS_K8S_TESTER_EKS_ADD_ON_MANAGED_NODE_GROUPS_MNGS='{"GetRef.Name-mng-for-cni":{"name":"GetRef.Name-mng-for-cni","remote-access-user-name":"ec2-user","tags":{"group":"amazon-vpc-cni-k8s"},"release-version":"","ami-type":"AL2_x86_64","asg-min-size":3,"asg-max-size":3,"asg-desired-capacity":3,"instance-types":["c5.xlarge"],"volume-size":40}}' \ + AWS_K8S_TESTER_EKS_ADD_ON_MANAGED_NODE_GROUPS_MNGS='{"GetRef.Name-mng-for-cni":{"name":"GetRef.Name-mng-for-cni","remote-access-user-name":"ec2-user","tags":{"group":"amazon-vpc-cni-k8s"},"release-version":"","ami-type":"AL2_x86_64","asg-min-size":3,"asg-max-size":3,"asg-desired-capacity":3,"instance-types":["c5.xlarge"],"volume-size":40}}, {"two-nodes":{"name":"two-nodes","remote-access-user-name":"ec2-user","tags":{"group":"amazon-vpc-cni-k8s"},"release-version":"","ami-type":"AL2_x86_64","asg-min-size":2,"asg-max-size":2,"asg-desired-capacity":2,"instance-types":["m5.xlarge"],"volume-size":40}}' \ AWS_K8S_TESTER_EKS_ADD_ON_MANAGED_NODE_GROUPS_FETCH_LOGS=true \ AWS_K8S_TESTER_EKS_ADD_ON_NLB_HELLO_WORLD_ENABLE=true \ AWS_K8S_TESTER_EKS_ADD_ON_ALB_2048_ENABLE=true \ diff --git a/scripts/run-integration-tests.sh b/scripts/run-integration-tests.sh index 5bd197a6941..e9c55a29697 100755 --- a/scripts/run-integration-tests.sh +++ b/scripts/run-integration-tests.sh @@ -154,13 +154,11 @@ sudo mv -v /tmp/eksctl /usr/local/bin aws sts get-caller-identity eksctl get clusters -eksctl get ng --cluster $CLUSTER_NAME -eksctl create ng --cluster $CLUSTER_NAME -n single-node -t m5.xlarge -N 1 -m 1 -M 1 --node-labels nodetomatch=thisone echo "TESTING tring to put 20 pods on new nodegroup" -eksctl apply -f deploy-20-pods.yaml +kubectl apply -f deploy-20-pods.yaml sleep 60 -eksctl get pods +kubectl get pods echo "Using $BASE_CONFIG_PATH as a template" cp "$BASE_CONFIG_PATH" "$TEST_CONFIG_PATH"