Cattle-AWS bug fixes and new features

Signed-off-by: Shantanu Deshpande <shantanud106@gmail.com>

Author: ishantanu

config-cattle-aws-existing-vpc.yaml

@@ -12,11 +12,12 @@ cattle-aws:
    rke_network_plugin: "canal"
    region: "eu-central-1"
    existing_vpc: "true"
+   zone: "eu-central-1a"
+   vpc_cidr_block:
    vpc_id: "vpc-1abcdgggga72a691a"
    subnet_id: "subnet-1f98d368767ge1e71"
    security_group_name: "rancher-nodes"
-   ami_id: "test123" # specify if you know the specific AMI ID. If used, keep below os field empty (not that setting it would impact).
-   os: "" # specify the OS. Supported values: ubuntu, centos, coreos. Keep above field empty if this is being used.
+   ami_id: "test123" 
    controlplane_instance_type: "t2.medium"
    worker_instance_type: "t2.large"
    overlap_cp_etcd_worker: "true"

config-cattle-aws-novpc-nooverlap.yaml

@@ -12,11 +12,12 @@ cattle-aws:
    rke_network_plugin: "canal"
    region: "eu-central-1"
    existing_vpc: "false"
+   zone: "eu-central-1a"
    vpc_id:
+   vpc_cidr_block: "10.0.0.0/16"
    subnet_id:
    security_group_name:
-   ami_id: "test123" # specify if you know the specific AMI ID. If used, keep below os field empty (not that setting it would impact).
-   os: "" # specify the OS. Supported values: ubuntu, centos, coreos. Keep above field empty if this is being used.
+   ami_id: "test123"
    controlplane_instance_type: "t2.medium"
    worker_instance_type: "t2.large"
    overlap_cp_etcd_worker: "false"

config-cattle-aws-novpc-overlap.yaml

@@ -12,11 +12,12 @@ cattle-aws:
    rke_network_plugin: "canal"
    region: "eu-central-1"
    existing_vpc: "false"
+   zone: "eu-central-1a"
    vpc_id:
+   vpc_cidr_block: "10.0.0.0/16"  
    subnet_id:
    security_group_name:
-   ami_id: "test123" # specify if you know the specific AMI ID. If used, keep below os field empty (not that setting it would impact).
-   os: "" # specify the OS. Supported values: ubuntu, centos, coreos. Keep above field empty if this is being used.  
+   ami_id: "test123"
    controlplane_instance_type: "t2.medium"
    worker_instance_type: "t2.large"
    overlap_cp_etcd_worker: "true"

pkg/templates/variables.go

@@ -364,6 +364,24 @@ variable "cloudwatch_monitoring" {
   type        = "string"
 }
 
+variable "zone" {
+  default     = "{{.Zone}}"
+  description = "Zone. Ex - eu-central-1a"
+  type        = "string"
+}
+
+variable "vpc_cidr_block" {
+  default     = "{{.VpcCidrBlock}}"
+  description = "VPC CIDR block for creating VPC with the provisioner"
+  type        = "string"
+}
+
+variable "ssh_user" {
+  default     = "{{.SshUser}}"
+  description = "SSH user"
+  type        = "string"
+}
+
 variable "ami_id" {
   default     = "{{.AmiID}}"
   description = "AMI ID for instances"
@@ -462,12 +480,6 @@ variable "security_group_name" {
   type        = "string"
 }
 
-variable "os" {
-  default     = "{{.OS}}"
-  description = "ami id - frankfurt"
-  type        = "string"
-}
-
 variable "worker_instance_type" {
   default     = "{{.WorkerInstanceType}}"
   description = "Instance type"