Remove docs related to manual subnet ids

Signed-off-by: Drumil Patel <[email protected]>
prometheus · Aug 28, 2020 · 3cb1154 · 3cb1154
1 parent 2eceb06
commit 3cb1154
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 17 deletions.
diff --git a/funcbench/Makefile b/funcbench/Makefile
@@ -15,14 +15,12 @@ cluster_create:
 	$(INFRA_CMD) $(PROVIDER) cluster create -a ${AUTH_FILE} \
 		-v GKE_PROJECT_ID:${GKE_PROJECT_ID} -v ZONE:${ZONE} -v CLUSTER_NAME:funcbench-${PR_NUMBER} -v PR_NUMBER:${PR_NUMBER} \
 		-v EKS_WORKER_ROLE_ARN:${EKS_WORKER_ROLE_ARN} -v EKS_CLUSTER_ROLE_ARN:${EKS_CLUSTER_ROLE_ARN} \
-		-v EKS_SUBNET_IDS:${EKS_SUBNET_IDS} \
 		-f manifests/cluster_$(PROVIDER).yaml
 
 cluster_delete:
 	$(INFRA_CMD) $(PROVIDER) cluster delete -a ${AUTH_FILE} \
 		-v GKE_PROJECT_ID:${GKE_PROJECT_ID} -v ZONE:${ZONE} -v CLUSTER_NAME:funcbench-${PR_NUMBER} -v PR_NUMBER:${PR_NUMBER} \
 		-v EKS_WORKER_ROLE_ARN:${EKS_WORKER_ROLE_ARN} -v EKS_CLUSTER_ROLE_ARN:${EKS_CLUSTER_ROLE_ARN} \
-		-v EKS_SUBNET_IDS:${EKS_SUBNET_IDS} \
 		-f manifests/cluster_$(PROVIDER).yaml
 
 resource_apply:

diff --git a/infra/README.md b/infra/README.md
@@ -71,19 +71,19 @@ Commands:
 
   eks nodes create
     eks nodes create -a authFile -f FileOrFolder -v ZONE:eu-west-1 -v
-    CLUSTER_NAME:test -v EKS_SUBNET_IDS: subnetId1,subnetId2,subnetId3
+    CLUSTER_NAME:test
 
   eks nodes delete
     eks nodes delete -a authFile -f FileOrFolder -v ZONE:eu-west-1 -v
-    CLUSTER_NAME:test -v EKS_SUBNET_IDS: subnetId1,subnetId2,subnetId3
+    CLUSTER_NAME:test
 
   eks nodes check-running
     eks nodes check-running -a credentails -f FileOrFolder -v ZONE:eu-west-1 -v
-    CLUSTER_NAME:test -v EKS_SUBNET_IDS: subnetId1,subnetId2,subnetId3
+    CLUSTER_NAME:test
 
   eks nodes check-deleted
     eks nodes check-deleted -a authFile -f FileOrFolder -v ZONE:eu-west-1 -v
-    CLUSTER_NAME:test -v EKS_SUBNET_IDS: subnetId1,subnetId2,subnetId3
+    CLUSTER_NAME:test
 
   eks resource apply
     eks resource apply -a credentials -f manifestsFileOrFolder -v

diff --git a/infra/infra.go b/infra/infra.go
@@ -108,13 +108,13 @@ func main() {
 	k8sEKSNodeGroup := k8sEKS.Command("nodes", "manage EKS clusters nodegroups").
 		Action(e.NewEKSClient).
 		Action(e.EKSDeploymentParse)
-	k8sEKSNodeGroup.Command("create", "eks nodes create -a authFile -f FileOrFolder -v ZONE:eu-west-1 -v CLUSTER_NAME:test -v EKS_SUBNET_IDS: subnetId1,subnetId2,subnetId3").
+	k8sEKSNodeGroup.Command("create", "eks nodes create -a authFile -f FileOrFolder -v ZONE:eu-west-1 -v CLUSTER_NAME:test").
 		Action(e.NodeGroupCreate)
-	k8sEKSNodeGroup.Command("delete", "eks nodes delete -a authFile -f FileOrFolder -v ZONE:eu-west-1 -v CLUSTER_NAME:test -v EKS_SUBNET_IDS: subnetId1,subnetId2,subnetId3").
+	k8sEKSNodeGroup.Command("delete", "eks nodes delete -a authFile -f FileOrFolder -v ZONE:eu-west-1 -v CLUSTER_NAME:test").
 		Action(e.NodeGroupDelete)
-	k8sEKSNodeGroup.Command("check-running", "eks nodes check-running -a credentails -f FileOrFolder -v ZONE:eu-west-1 -v CLUSTER_NAME:test -v EKS_SUBNET_IDS: subnetId1,subnetId2,subnetId3").
+	k8sEKSNodeGroup.Command("check-running", "eks nodes check-running -a credentails -f FileOrFolder -v ZONE:eu-west-1 -v CLUSTER_NAME:test").
 		Action(e.AllNodeGroupsRunning)
-	k8sEKSNodeGroup.Command("check-deleted", "eks nodes check-deleted -a authFile -f FileOrFolder -v ZONE:eu-west-1 -v CLUSTER_NAME:test -v EKS_SUBNET_IDS: subnetId1,subnetId2,subnetId3").
+	k8sEKSNodeGroup.Command("check-deleted", "eks nodes check-deleted -a authFile -f FileOrFolder -v ZONE:eu-west-1 -v CLUSTER_NAME:test").
 		Action(e.AllNodeGroupsDeleted)
 
 	// K8s resource operations.

diff --git a/prombench/Makefile b/prombench/Makefile
@@ -13,7 +13,6 @@ node_create:
 	${INFRA_CMD} ${PROVIDER} nodes create -a ${AUTH_FILE} \
 		-v ZONE:${ZONE} -v GKE_PROJECT_ID:${GKE_PROJECT_ID} \
 		-v EKS_WORKER_ROLE_ARN:${EKS_WORKER_ROLE_ARN} -v EKS_CLUSTER_ROLE_ARN:${EKS_CLUSTER_ROLE_ARN} \
-		-v EKS_SUBNET_IDS:${EKS_SUBNET_IDS} \
 		-v CLUSTER_NAME:${CLUSTER_NAME} -v PR_NUMBER:${PR_NUMBER} \
 		-f manifests/prombench/nodes_${PROVIDER}.yaml
 
@@ -37,22 +36,19 @@ node_delete:
 	$(INFRA_CMD) ${PROVIDER} nodes delete -a ${AUTH_FILE} \
 		-v ZONE:${ZONE} -v GKE_PROJECT_ID:${GKE_PROJECT_ID} \
 		-v EKS_WORKER_ROLE_ARN:${EKS_WORKER_ROLE_ARN} -v EKS_CLUSTER_ROLE_ARN:${EKS_CLUSTER_ROLE_ARN} \
-		-v EKS_SUBNET_IDS:${EKS_SUBNET_IDS} \
 		-v CLUSTER_NAME:${CLUSTER_NAME} -v PR_NUMBER:${PR_NUMBER} \
 		-f manifests/prombench/nodes_${PROVIDER}.yaml
 
 all_nodes_running:
 	$(INFRA_CMD) ${PROVIDER} nodes check-running -a ${AUTH_FILE} \
 		-v ZONE:${ZONE} -v GKE_PROJECT_ID:${GKE_PROJECT_ID} \
 		-v EKS_WORKER_ROLE_ARN:${EKS_WORKER_ROLE_ARN} -v EKS_CLUSTER_ROLE_ARN:${EKS_CLUSTER_ROLE_ARN} \
-		-v EKS_SUBNET_IDS:${EKS_SUBNET_IDS} -v SEPARATOR:${SEPARATOR} \
 		-v CLUSTER_NAME:${CLUSTER_NAME} -v PR_NUMBER:${PR_NUMBER} \
 		-f manifests/prombench/nodes_${PROVIDER}.yaml	
 
 all_nodes_deleted:
 	$(INFRA_CMD) ${PROVIDER} nodes check-deleted -a ${AUTH_FILE} \
 		-v ZONE:${ZONE} -v GKE_PROJECT_ID:${GKE_PROJECT_ID} \
 		-v EKS_WORKER_ROLE_ARN:${EKS_WORKER_ROLE_ARN} -v EKS_CLUSTER_ROLE_ARN:${EKS_CLUSTER_ROLE_ARN} \
-		-v EKS_SUBNET_IDS:${EKS_SUBNET_IDS} -v SEPARATOR:${SEPARATOR} \
 		-v CLUSTER_NAME:${CLUSTER_NAME} -v PR_NUMBER:${PR_NUMBER} \
 		-f manifests/prombench/nodes_${PROVIDER}.yaml
diff --git a/prombench/docs/eks.md b/prombench/docs/eks.md
@@ -32,11 +32,9 @@ export EKS_CLUSTER_ROLE_ARN=<Amazon EKS cluster role ARN>
 # By default SEPARATOR DeploymentVar is set to `,` but you can override it by exporting and
 # then passing it with the -v flag. It is used to split DeploymentVar into a slice.
 export SEPARATOR=, 
-export EKS_SUBNET_IDS=SUBNETID1,SUBNETID2,SUBNETID3
 
 ../infra/infra eks cluster create -a $AUTH_FILE -v ZONE:$ZONE \
     -v EKS_WORKER_ROLE_ARN:$EKS_WORKER_ROLE_ARN -v EKS_CLUSTER_ROLE_ARN:$EKS_CLUSTER_ROLE_ARN \
-    -v EKS_SUBNET_IDS:$EKS_SUBNET_IDS \
     -v CLUSTER_NAME:$CLUSTER_NAME \
     -f manifests/cluster_eks.yaml
 ```
@@ -97,7 +95,6 @@ export PR_NUMBER=<PR to benchmark against the selected $RELEASE>
 ```shell
 ../infra/infra eks nodes create -a $AUTH_FILE \
     -v ZONE:$ZONE -v EKS_WORKER_ROLE_ARN:$EKS_WORKER_ROLE_ARN -v EKS_CLUSTER_ROLE_ARN:$EKS_CLUSTER_ROLE_ARN \
-    -v EKS_SUBNET_IDS:$EKS_SUBNET_IDS \
     -v CLUSTER_NAME:$CLUSTER_NAME \
     -v PR_NUMBER:$PR_NUMBER -f manifests/prombench/nodes_eks.yaml
 ```