From 76b5757cf0e2a6fd7d5ad2ed57ff659a59fda730 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Tue, 27 Nov 2018 13:00:10 -0800
Subject: [PATCH] data/data/aws/variables-aws: Drop
 tectonic_aws_worker_ec2_type, etc.

The last consumers for these were removed by 124ac351 (*: Use
machine-api-operator to deploy worker nodes, 2018-09-04, #119).
---
 data/data/aws/variables-aws.tf | 52 ----------------------------------
 pkg/tfvars/aws/aws.go          | 15 ++--------
 pkg/tfvars/tfvars.go           |  6 ----
 3 files changed, 2 insertions(+), 71 deletions(-)

diff --git a/data/data/aws/variables-aws.tf b/data/data/aws/variables-aws.tf
index 615e9a19045..8d86735f16c 100644
--- a/data/data/aws/variables-aws.tf
+++ b/data/data/aws/variables-aws.tf
@@ -13,12 +13,6 @@ variable "tectonic_aws_master_ec2_type" {
   default     = "t2.medium"
 }
 
-variable "tectonic_aws_worker_ec2_type" {
-  type        = "string"
-  description = "Instance size for the worker node(s). Example: `t2.medium`."
-  default     = "t2.medium"
-}
-
 variable "tectonic_aws_ec2_ami_override" {
   type        = "string"
   description = "(optional) AMI override for all nodes. Example: `ami-foobar123`."
@@ -36,17 +30,6 @@ EOF
   default = []
 }
 
-variable "tectonic_aws_worker_extra_sg_ids" {
-  description = <<EOF
-(optional) List of additional security group IDs for worker nodes.
-
-Example: `["sg-51530134", "sg-b253d7cc"]`
-EOF
-
-  type    = "list"
-  default = []
-}
-
 variable "tectonic_aws_vpc_cidr_block" {
   type = "string"
 
@@ -149,28 +132,6 @@ Ignored if the volume type is not io1.
 EOF
 }
 
-variable "tectonic_aws_worker_root_volume_type" {
-  type        = "string"
-  default     = "gp2"
-  description = "The type of volume for the root block device of worker nodes."
-}
-
-variable "tectonic_aws_worker_root_volume_size" {
-  type        = "string"
-  default     = "30"
-  description = "The size of the volume in gigabytes for the root block device of worker nodes."
-}
-
-variable "tectonic_aws_worker_root_volume_iops" {
-  type    = "string"
-  default = "100"
-
-  description = <<EOF
-The amount of provisioned IOPS for the root block device of worker nodes.
-Ignored if the volume type is not io1.
-EOF
-}
-
 variable "tectonic_aws_master_custom_subnets" {
   type    = "map"
   default = {}
@@ -239,16 +200,3 @@ Example:
  * Role Name = tectonic-installer
 EOF
 }
-
-variable "tectonic_aws_worker_load_balancers" {
-  type    = "list"
-  default = []
-
-  description = <<EOF
-(optional) List of ELBs to attach all worker instances to.
-This is useful for exposing NodePort services via load-balancers managed separately from the cluster.
-
-Example:
- * `["ingress-nginx"]`
-EOF
-}
diff --git a/pkg/tfvars/aws/aws.go b/pkg/tfvars/aws/aws.go
index 24de057bcdb..84993c8b6fb 100644
--- a/pkg/tfvars/aws/aws.go
+++ b/pkg/tfvars/aws/aws.go
@@ -55,17 +55,6 @@ type MasterRootVolume struct {
 
 // Worker converts worker related config.
 type Worker struct {
-	CustomSubnets    map[string]string `json:"tectonic_aws_worker_custom_subnets,omitempty"`
-	EC2Type          string            `json:"tectonic_aws_worker_ec2_type,omitempty"`
-	ExtraSGIDs       []string          `json:"tectonic_aws_worker_extra_sg_ids,omitempty"`
-	IAMRoleName      string            `json:"tectonic_aws_worker_iam_role_name,omitempty"`
-	LoadBalancers    []string          `json:"tectonic_aws_worker_load_balancers,omitempty"`
-	WorkerRootVolume `json:",inline"`
-}
-
-// WorkerRootVolume converts worker rool volume related config.
-type WorkerRootVolume struct {
-	IOPS int    `json:"tectonic_aws_worker_root_volume_iops,omitempty"`
-	Size int    `json:"tectonic_aws_worker_root_volume_size,omitempty"`
-	Type string `json:"tectonic_aws_worker_root_volume_type,omitempty"`
+	CustomSubnets map[string]string `json:"tectonic_aws_worker_custom_subnets,omitempty"`
+	IAMRoleName   string            `json:"tectonic_aws_worker_iam_role_name,omitempty"`
 }
diff --git a/pkg/tfvars/tfvars.go b/pkg/tfvars/tfvars.go
index b7a608f8e78..bfbbddebf7d 100644
--- a/pkg/tfvars/tfvars.go
+++ b/pkg/tfvars/tfvars.go
@@ -67,13 +67,7 @@ func TFVars(cfg *types.InstallConfig, bootstrapIgn, masterIgn string) ([]byte, e
 			config.Workers += replicas
 			if m.Platform.AWS != nil {
 				config.AWS.Worker = aws.Worker{
-					EC2Type:     m.Platform.AWS.InstanceType,
 					IAMRoleName: m.Platform.AWS.IAMRoleName,
-					WorkerRootVolume: aws.WorkerRootVolume{
-						IOPS: m.Platform.AWS.EC2RootVolume.IOPS,
-						Size: m.Platform.AWS.EC2RootVolume.Size,
-						Type: m.Platform.AWS.EC2RootVolume.Type,
-					},
 				}
 			}
 		default: