Skip to content

Commit

Permalink
Formatting fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
1nval1dctf committed Feb 17, 2024
1 parent c8ea75b commit 3178f4f
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 24 deletions.
2 changes: 1 addition & 1 deletion modules/eks-extras/vpc_cni.tf
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ resource "kubernetes_config_map_v1_data" "amazon_vpc_cni" {
enable-network-policy-controller = true
}
force = true
}
}
14 changes: 6 additions & 8 deletions modules/eks/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,9 @@ module "eks" {
}

instance_types = [var.eks_instance_type]

min_size = var.eks_autoscaling_group_linux_min_size
max_size = var.eks_autoscaling_group_linux_max_size
desired_size = var.eks_autoscaling_group_linux_desired_capacity
min_size = var.eks_autoscaling_group_linux_min_size
max_size = var.eks_autoscaling_group_linux_max_size
desired_size = var.eks_autoscaling_group_linux_desired_capacity
}
windows = {
# By default, the module creates a launch template to ensure tags are propagated to instances, etc.,
Expand All @@ -47,10 +46,9 @@ module "eks" {
"k8s.io/cluster-autoscaler/${var.eks_cluster_name}" = "owned"
}
instance_types = [var.eks_instance_type]

min_size = var.eks_autoscaling_group_windows_min_size
max_size = var.eks_autoscaling_group_windows_max_size
desired_size = var.eks_autoscaling_group_windows_desired_capacity
min_size = var.eks_autoscaling_group_windows_min_size
max_size = var.eks_autoscaling_group_windows_max_size
desired_size = var.eks_autoscaling_group_windows_desired_capacity
}
}
cluster_addons = {
Expand Down
25 changes: 12 additions & 13 deletions modules/vpc/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,18 @@ data "aws_availability_zones" "available" {}

# Create a VPC to launch our instances into
module "vpc" {
source = "terraform-aws-modules/vpc/aws"
version = "5.5.2"
name = "${var.eks_cluster_name}-vpc"
cidr = var.vpc_cidr_block
azs = data.aws_availability_zones.available.names
private_subnets = ["10.0.1.0/24", "10.0.2.0/24", "10.0.3.0/24"]
public_subnets = ["10.0.4.0/24", "10.0.5.0/24", "10.0.6.0/24"]
enable_dns_hostnames = true
enable_dns_support = true
enable_nat_gateway = true
single_nat_gateway = true
map_public_ip_on_launch = true

source = "terraform-aws-modules/vpc/aws"
version = "5.5.2"
name = "${var.eks_cluster_name}-vpc"
cidr = var.vpc_cidr_block
azs = data.aws_availability_zones.available.names
private_subnets = ["10.0.1.0/24", "10.0.2.0/24", "10.0.3.0/24"]
public_subnets = ["10.0.4.0/24", "10.0.5.0/24", "10.0.6.0/24"]
enable_dns_hostnames = true
enable_dns_support = true
enable_nat_gateway = true
single_nat_gateway = true
map_public_ip_on_launch = true
enable_flow_log = true
create_flow_log_cloudwatch_iam_role = true
create_flow_log_cloudwatch_log_group = true
Expand Down
3 changes: 1 addition & 2 deletions test/fixture/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,7 @@ resource "kubernetes_deployment" "windows" {
}
spec {
container {
image = "mcr.microsoft.com/windows/servercore/iis:latest"

image = "mcr.microsoft.com/windows/servercore/iis:latest"
name = "windows"
image_pull_policy = "Always"
port {
Expand Down

0 comments on commit 3178f4f

Please sign in to comment.