Merge pull request kubernetes-sigs#2903 from shivi28/subnets_update

Updated subnets field in Machinepool yaml
databricks · Dec 13, 2021 · de0fb7c · de0fb7c
2 parents dc4f58f + 0c587fe
commit de0fb7c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/docs/book/src/topics/machinepools.md b/docs/book/src/topics/machinepools.md
@@ -48,10 +48,9 @@ clusterctl generate cluster my-cluster --kubernetes-version v1.16.8 --flavor eks
 The template used for this [flavor](https://cluster-api.sigs.k8s.io/clusterctl/commands/generate-cluster.html#flavors) is located [here](https://github.com/kubernetes-sigs/cluster-api-provider-aws/blob/main/templates/cluster-template-eks-managedmachinepool.yaml).
 
 
-
 ## Examples
 
-### Example MachinePool, AWSMachinePool and KubeadmConfig Resources
+### Example: MachinePool, AWSMachinePool and KubeadmConfig Resources
 
 Below is an example of the resources needed to create a pool of EC2 machines orchestrated with
 an AWS Auto Scaling Group.
@@ -92,7 +91,7 @@ spec:
     instanceType: "${AWS_CONTROL_PLANE_MACHINE_TYPE}"
     sshKeyName: "${AWS_SSH_KEY_NAME}"
   subnets:
-  - ${AWS_SUBNET}
+    - id : "${AWS_SUBNET_ID}"
 ---
 apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
 kind: KubeadmConfig
@@ -105,4 +104,4 @@ spec:
       name: '{{ ds.meta_data.local_hostname }}'
       kubeletExtraArgs:
         cloud-provider: aws
-```
+```
diff --git a/templates/cluster-template-machinepool.yaml b/templates/cluster-template-machinepool.yaml
@@ -98,8 +98,6 @@ spec:
   awsLaunchTemplate:
     instanceType: "${AWS_CONTROL_PLANE_MACHINE_TYPE}"
     sshKeyName: "${AWS_SSH_KEY_NAME}"
-  subnets:
-  - ${AWS_SUBNET}
 ---
 apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
 kind: KubeadmConfig