Develop (#102)

* Modified docs Signed-off-by: niki-1905 <[email protected]> * Remove jmeter submodule, literatebee key, and empty vendor folder. Signed-off-by: Arush Salil <[email protected]> * Update Dockerfile Signed-off-by: Arush Salil <[email protected]> * Update Readme Signed-off-by: Arush Salil <[email protected]> * Update AWS documentation Signed-off-by: Arush Salil <[email protected]> * Add lifecycle documentation. Signed-off-by: Arush Salil <[email protected]> * Fix typo Signed-off-by: Arush Salil <[email protected]> * Refactor and add tests Signed-off-by: Manuel Müller <[email protected]> * Update documentation * Update .gitignore * add pkg provisioner * Update Makefile * Release/0 5 1 (#74) * Update Documentation on master branch (#72) * Modified docs Signed-off-by: niki-1905 <[email protected]> * Remove jmeter submodule, literatebee key, and empty vendor folder. Signed-off-by: Arush Salil <[email protected]> * Update Dockerfile Signed-off-by: Arush Salil <[email protected]> * Update Readme Signed-off-by: Arush Salil <[email protected]> * Update AWS documentation Signed-off-by: Arush Salil <[email protected]> * Add lifecycle documentation. Signed-off-by: Arush Salil <[email protected]> * Fix typo Signed-off-by: Arush Salil <[email protected]> * TK8-47 add infrastructure only flag https://kubernauts.atlassian.net/browse/TK8-47 * Bug/version (#75) * #67 | modify | remove not needed requirements Signed-off-by: Manuel Müller <[email protected]> * #66 | fix | Getting started link Signed-off-by: Manuel Müller <[email protected]> * #66 | modify | change path relative Signed-off-by: Manuel Müller <[email protected]> * Update Documentation on master branch (#72) * Modified docs Signed-off-by: niki-1905 <[email protected]> * Remove jmeter submodule, literatebee key, and empty vendor folder. Signed-off-by: Arush Salil <[email protected]> * Update Dockerfile Signed-off-by: Arush Salil <[email protected]> * Update Readme Signed-off-by: Arush Salil <[email protected]> * Update AWS documentation Signed-off-by: Arush Salil <[email protected]> * Add lifecycle documentation. Signed-off-by: Arush Salil <[email protected]> * Fix typo Signed-off-by: Arush Salil <[email protected]> Signed-off-by: Manuel Müller <[email protected]> * Release/0 5 1 (#73) * Modified docs Signed-off-by: niki-1905 <[email protected]> * Remove jmeter submodule, literatebee key, and empty vendor folder. Signed-off-by: Arush Salil <[email protected]> * Update Dockerfile Signed-off-by: Arush Salil <[email protected]> * Update Readme Signed-off-by: Arush Salil <[email protected]> * Update AWS documentation Signed-off-by: Arush Salil <[email protected]> * Add lifecycle documentation. Signed-off-by: Arush Salil <[email protected]> * Fix typo Signed-off-by: Arush Salil <[email protected]> * Refactor and add tests Signed-off-by: Manuel Müller <[email protected]> * Update documentation * Update .gitignore * add pkg provisioner * Update Makefile * TK8-47 add infrastructure only flag https://kubernauts.atlassian.net/browse/TK8-47 Signed-off-by: Manuel Müller <[email protected]> * BUG | Fix Version display The version is not display like accepted This will fix it Signed-off-by: Manuel Müller <[email protected]> * Add rke provisioner related variables Signed-off-by: Shantanu Deshpande <[email protected]> * RKE provisioner changes (#81) * Add documentation for using rke provisioner Signed-off-by: Shantanu Deshpande <[email protected]> * Add changes for rke provisioner configuration Signed-off-by: Shantanu Deshpande <[email protected]> * update the documentation add tk8 addon install rancher Signed-off-by: Manuel Müller <[email protected]> * move common stuff to the main pkg Signed-off-by: Manuel Müller <[email protected]> * Fix doc path rke Signed-off-by: Manuel Müller <[email protected]> * RKE region issue fix Signed-off-by: Shantanu Deshpande <[email protected]> * Fixing typo (#84) Signed-off-by: Imran Pochi <[email protected]> * Bug/addon install bug (#87) * Release 0.6.0 (#83) * Modified docs Signed-off-by: niki-1905 <[email protected]> * Remove jmeter submodule, literatebee key, and empty vendor folder. Signed-off-by: Arush Salil <[email protected]> * Update Dockerfile Signed-off-by: Arush Salil <[email protected]> * Update Readme Signed-off-by: Arush Salil <[email protected]> * Update AWS documentation Signed-off-by: Arush Salil <[email protected]> * Add lifecycle documentation. Signed-off-by: Arush Salil <[email protected]> * Fix typo Signed-off-by: Arush Salil <[email protected]> * Refactor and add tests Signed-off-by: Manuel Müller <[email protected]> * Update documentation * Update .gitignore * add pkg provisioner * Update Makefile * Release/0 5 1 (#74) * Update Documentation on master branch (#72) * Modified docs Signed-off-by: niki-1905 <[email protected]> * Remove jmeter submodule, literatebee key, and empty vendor folder. Signed-off-by: Arush Salil <[email protected]> * Update Dockerfile Signed-off-by: Arush Salil <[email protected]> * Update Readme Signed-off-by: Arush Salil <[email protected]> * Update AWS documentation Signed-off-by: Arush Salil <[email protected]> * Add lifecycle documentation. Signed-off-by: Arush Salil <[email protected]> * Fix typo Signed-off-by: Arush Salil <[email protected]> * TK8-47 add infrastructure only flag https://kubernauts.atlassian.net/browse/TK8-47 * Bug/version (#75) * #67 | modify | remove not needed requirements Signed-off-by: Manuel Müller <[email protected]> * #66 | fix | Getting started link Signed-off-by: Manuel Müller <[email protected]> * #66 | modify | change path relative Signed-off-by: Manuel Müller <[email protected]> * Update Documentation on master branch (#72) * Modified docs Signed-off-by: niki-1905 <[email protected]> * Remove jmeter submodule, literatebee key, and empty vendor folder. Signed-off-by: Arush Salil <[email protected]> * Update Dockerfile Signed-off-by: Arush Salil <[email protected]> * Update Readme Signed-off-by: Arush Salil <[email protected]> * Update AWS documentation Signed-off-by: Arush Salil <[email protected]> * Add lifecycle documentation. Signed-off-by: Arush Salil <[email protected]> * Fix typo Signed-off-by: Arush Salil <[email protected]> Signed-off-by: Manuel Müller <[email protected]> * Release/0 5 1 (#73) * Modified docs Signed-off-by: niki-1905 <[email protected]> * Remove jmeter submodule, literatebee key, and empty vendor folder. Signed-off-by: Arush Salil <[email protected]> * Update Dockerfile Signed-off-by: Arush Salil <[email protected]> * Update Readme Signed-off-by: Arush Salil <[email protected]> * Update AWS documentation Signed-off-by: Arush Salil <[email protected]> * Add lifecycle documentation. Signed-off-by: Arush Salil <[email protected]> * Fix typo Signed-off-by: Arush Salil <[email protected]> * Refactor and add tests Signed-off-by: Manuel Müller <[email protected]> * Update documentation * Update .gitignore * add pkg provisioner * Update Makefile * TK8-47 add infrastructure only flag https://kubernauts.atlassian.net/browse/TK8-47 Signed-off-by: Manuel Müller <[email protected]> * BUG | Fix Version display The version is not display like accepted This will fix it Signed-off-by: Manuel Müller <[email protected]> * Add rke provisioner related variables Signed-off-by: Shantanu Deshpande <[email protected]> * RKE provisioner changes (#81) * Add documentation for using rke provisioner Signed-off-by: Shantanu Deshpande <[email protected]> * Add changes for rke provisioner configuration Signed-off-by: Shantanu Deshpande <[email protected]> * update the documentation add tk8 addon install rancher Signed-off-by: Manuel Müller <[email protected]> * move common stuff to the main pkg Signed-off-by: Manuel Müller <[email protected]> * Fix doc path rke Signed-off-by: Manuel Müller <[email protected]> * RKE region issue fix Signed-off-by: Shantanu Deshpande <[email protected]> * add signed #86 | BUG | Addon | fx addon bug Signed-off-by: Manuel Müller <[email protected]> * Tweaking addon addition/removal functionality (#89) * Adding functionality for addons where different main.sh is required for removal and installation. example: helm where installation and removal of tiller componenet happens with hte helm of helm init and helm reset and not yaml files Signed-off-by: Imran Pochi <[email protected]> * Cleanup - removing unnecessary print statements Signed-off-by: Imran Pochi <[email protected]> * WIP: Terraform Provider Rancher2 integration (#101) * Terraform Provider Rancher2 integration Signed-off-by: ishantanu <[email protected]> * Add disk size option Signed-off-by: Shantanu Deshpande <[email protected]> * Add distro vars in template Signed-off-by: Shantanu Deshpande <[email protected]>
kubernauts · Jun 7, 2019 · e2aa7c5 · e2aa7c5
1 parent 9a9bbf3
commit e2aa7c5
Show file tree

Hide file tree

Showing 6 changed files with 253 additions and 7 deletions.
diff --git a/cmd/cli/provisioner.go b/cmd/cli/provisioner.go
@@ -22,6 +22,7 @@ import (
 	aws "github.com/kubernauts/tk8-provisioner-aws"
 	azure "github.com/kubernauts/tk8-provisioner-azure"
 	baremetal "github.com/kubernauts/tk8-provisioner-baremetal"
+	cattleaws "github.com/kubernauts/tk8-provisioner-cattle-aws"
 	eks "github.com/kubernauts/tk8-provisioner-eks"
 	nutanix "github.com/kubernauts/tk8-provisioner-nutanix"
 	openstack "github.com/kubernauts/tk8-provisioner-openstack"
@@ -34,13 +35,14 @@ import (
 
 var name string
 var provisioners = map[string]provisioner.Provisioner{
-	"aws":       aws.NewAWS(),
-	"azure":     azure.NewAzure(),
-	"baremetal": baremetal.NewBaremetal(),
-	"eks":       eks.NewEKS(),
-	"nutanix":   nutanix.NewNutanix(),
-	"openstack": openstack.NewOpenstack(),
-	"rke":       rke.NewRKE(),
+	"aws":        aws.NewAWS(),
+	"azure":      azure.NewAzure(),
+	"baremetal":  baremetal.NewBaremetal(),
+	"cattle-aws": cattleaws.NewCattleAWS(),
+	"eks":        eks.NewEKS(),
+	"nutanix":    nutanix.NewNutanix(),
+	"openstack":  openstack.NewOpenstack(),
+	"rke":        rke.NewRKE(),
 }
 
 var provisionerInstallCmd = &cobra.Command{

diff --git a/config-cattle-aws-existing-vpc.yaml b/config-cattle-aws-existing-vpc.yaml
@@ -0,0 +1,28 @@
+cattle-aws:
+   root_disk_size: 20
+   iam_instance_profile_name: "rancher-controlplane-role"
+   iam_instance_profile_worker: # specify if overlap_cp_etcd_worker is false and existing_vpc is true
+   rancher_cluster_name: "cattle-aws-cluster"
+   rancher_api_url: "https://rancher.xyz.com/v3"
+   rancher_access_key:
+   rancher_secret_key:
+   rke_network_plugin: "canal"
+   region: "eu-central-1"
+   existing_vpc: "true"
+   vpc_id: "vpc-1abcdgggga72a691a"
+   subnet_id: "subnet-1f98d368767ge1e71"
+   security_group_name: "rancher-nodes"
+   os: "ubuntu"
+   instance_type: "t2.medium"
+   aws_secret_access_key:
+   aws_default_region: "eu-central-1"
+   overlap_cp_etcd_worker: "true"
+   overlap_node_pool:
+      hostname_prefix: "cattle-aws-cluster"
+      quantity: 1
+   master_node_pool:
+      hostname_prefix:
+      quantity:
+   worker_node_pool:
+      hostname_prefix:
+      quantity:
diff --git a/config-cattle-aws-novpc-nooverlap.yaml b/config-cattle-aws-novpc-nooverlap.yaml
@@ -0,0 +1,27 @@
+cattle-aws:
+   root_disk_size: 20
+   iam_instance_profile_name:
+   rancher_cluster_name: "cattle-aws-cluster"
+   rancher_api_url: "https://rancher.xyz.com/v3"
+   rancher_access_key:
+   rancher_secret_key:
+   rke_network_plugin: "canal"
+   region: "eu-central-1"
+   existing_vpc: "false"
+   vpc_id:
+   subnet_id:
+   security_group_name:
+   os: "ubuntu"
+   instance_type: "t2.medium"
+   aws_secret_access_key:
+   aws_default_region: "eu-central-1"
+   overlap_cp_etcd_worker: "false"
+   overlap_node_pool:
+      hostname_prefix:
+      quantity:
+   master_node_pool:
+      hostname_prefix: "cattle-aws-master"
+      quantity: 1
+   worker_node_pool:
+      hostname_prefix: "cattle-aws-worker"
+      quantity: 1
diff --git a/config-cattle-aws-novpc-overlap.yaml b/config-cattle-aws-novpc-overlap.yaml
@@ -0,0 +1,27 @@
+cattle-aws:
+   root_disk_size: 20
+   iam_instance_profile_name:
+   rancher_cluster_name: "cattle-aws-cluster"
+   rancher_api_url: "https://rancher.xyz.com/v3"
+   rancher_access_key:
+   rancher_secret_key:
+   rke_network_plugin: "canal"
+   region: "eu-central-1"
+   existing_vpc: "false"
+   vpc_id:
+   subnet_id:
+   security_group_name:
+   os: "ubuntu"
+   instance_type: "t2.medium"
+   aws_secret_access_key:
+   aws_default_region: "eu-central-1"
+   overlap_cp_etcd_worker: "true"
+   overlap_node_pool:
+      hostname_prefix: "cattle-aws-cluster"
+      quantity: 1
+   master_node_pool:
+      hostname_prefix:
+      quantity:
+   worker_node_pool:
+      hostname_prefix:
+      quantity:
diff --git a/pkg/templates/distos.go b/pkg/templates/distos.go
@@ -21,3 +21,24 @@ variable "ssh_user" {
   default = "{{.User}}"
 }
 `
+var DistVariablesCattleAWS = `
+data "aws_ami" "distro" {
+  most_recent = true
+
+  filter {
+    name   = "name"
+    values = ["{{.NodeOS}}"]
+  }
+
+  filter {
+    name   = "virtualization-type"
+    values = ["hvm"]
+  }
+
+  owners = ["{{.AmiOwner}}"]
+}
+
+variable "ssh_user" {
+  default = "{{.User}}"
+}
+`
diff --git a/pkg/templates/variables.go b/pkg/templates/variables.go
@@ -232,3 +232,144 @@ variable "default_tags" {
   type = "map"
 }
 `
+var VariablesCattleAWS = `
+variable "root_disk_size" {
+  default     = "{{.RootDiskSize}}"
+  description = "Root disk size for instances in GB"
+  type        = "string"
+}
+
+variable "iam_instance_profile_name_worker" {
+  default     = "{{.IAMInstanceProfileWorker}}"
+  description = "IAM instance profile name for worker"
+  type        = "string"
+}
+
+variable "iam_instance_profile_name" {
+  default     = "{{.IAMInstanceProfile}}"
+  description = "IAM instance profile name"
+  type        = "string"
+}
+
+variable "rancher_api_url" {
+  default     = "{{.RancherAPIURL}}"
+  description = "Rancher API URL"
+  type        = "string"
+}
+
+variable "rancher_access_key" {
+  description = "Rancher server's access key"
+}
+
+variable "rancher_secret_key" {
+  description = "Rancher server's secret key"
+}
+
+variable "rancher_cluster_name" {
+  default     = "{{.RancherClusterName}}"
+  description = "Rancher cluster name"
+  type        = "string"
+}
+
+variable "rke_network_plugin" {
+  default     = "{{.RKENetworkPlugin}}"
+  description = "Network plugin for cluster"
+  type        = "string"
+}
+
+variable "region" {
+  default     = "{{.Region}}"
+  description = "AWS region"
+  type        = "string"
+}
+
+variable "existing_vpc" {
+  default     = {{.ExistingVPC}}
+  description = "Use existing VPC for creating clusters"
+  type        = "string"
+}
+
+variable "vpc_id" {
+  default     = "{{.VPCID}}"
+  description = "VPC ID"
+  type        = "string"
+}
+
+variable "subnet_id" {
+  default     = "{{.SubnetID}}"
+  description = "subnet id"
+  type        = "string"
+}
+
+variable "security_group_name" {
+  default     = "{{.SecurityGroupName}}"
+  description = "security group id"
+  type        = "string"
+}
+
+variable "os" {
+  default     = "{{.OS}}"
+  description = "ami id - frankfurt"
+  type        = "string"
+}
+
+variable "instance_type" {
+  default     = "{{.InstanceType}}"
+  description = "Instance type"
+  type        = "string"
+}
+
+variable "overlap_cp_etcd_worker" {
+  default     = {{.OverlapCpEtcdWorker}}
+  description = "Overlapping planes for node template"
+  type        = "string"
+}
+
+variable "overlap_node_pool_hostname_prefix" {
+  default     = "{{.OverlapHostnamePrefix}}"
+  description = "Hostname prefix for overlapped node pools"
+  type        = "string"
+}
+
+variable "no_overlap_nodepool_master_hostname_prefix" {
+  default     = "{{.MasterHostnamePrefix}}"
+  description = "Hostname prefix for master node pool"
+  type        = "string"
+}
+
+variable "no_overlap_nodepool_worker_hostname_prefix" {
+  default     = "{{.WorkerHostnamePrefix}}"
+  description = "Hostname prefix for worker node pool"
+  type        = "string"
+}
+
+variable "no_overlap_nodepool_master_quantity" {
+  default     = "{{.MasterQuantity}}"
+  description = "Node pool master quantity for non-overlapped planes"
+  type        = "string"
+}
+
+variable "no_overlap_nodepool_worker_quantity" {
+  default     = "{{.WorkerQuantity}}"
+  description = "Node pool worker quantity for non-overlapped planes"
+  type        = "string"
+}
+
+variable "overlap_node_pool_quantity" {
+  default     = "{{.OverlapQuantity}}"
+  description = "Node pool quantity for overlap planes"
+  type        = "string"
+}
+
+variable "AWS_ACCESS_KEY_ID" {
+  description = "AWS access key"
+}
+
+variable "AWS_SECRET_ACCESS_KEY" {
+  description = "AWS secret key"
+}
+
+variable "AWS_DEFAULT_REGION" {
+  description = "AWS default region"
+}
+`