Adding more infar stuff

This commit is contained in:
jenkins-x-bot 2020-09-10 10:46:18 +08:00
parent de8133d306
commit 6d0f0f360e

10
main.tf
View File

@ -9,6 +9,12 @@ variable "workers_additional_policies" {
variable "sys_worker_group_name" {} variable "sys_worker_group_name" {}
variable "sys_instance_type" {} variable "sys_instance_type" {}
variable "sys_asg_capacity" {} variable "sys_asg_capacity" {}
variable "sys_kubelet_args" {}
variable "infra_worker_group_name" {}
variable "infra_instance_type" {}
variable "infra_asg_max_size" {}
variable "infra_kubelet_args" {}
variable "infra_spot_price" {}
data "aws_availability_zones" "available" {} data "aws_availability_zones" "available" {}
@ -43,8 +49,8 @@ module "vpc" {
module "eks" { module "eks" {
source = "terraform-aws-modules/eks/aws" source = "terraform-aws-modules/eks/aws"
version = "7.0.1"
cluster_name = var.eks_cluster_name cluster_name = var.eks_cluster_name
cluster_version = "1.16"
subnets = module.vpc.private_subnets subnets = module.vpc.private_subnets
vpc_id = module.vpc.vpc_id vpc_id = module.vpc.vpc_id
@ -59,7 +65,7 @@ module "eks" {
suspended_processes = ["AZRebalance"] suspended_processes = ["AZRebalance"]
}, },
{ {
name = var.infra.worker_group_name name = var.infra_worker_group_name
instance_type = var.infra_instance_type instance_type = var.infra_instance_type
asg_max_size = var.infra_asg_max_size asg_max_size = var.infra_asg_max_size
kubelet_extra_args = var.infra_kubelet_args kubelet_extra_args = var.infra_kubelet_args