Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
anmolnagpal committed Jul 14, 2020
1 parent 3a4c5c8 commit d78400e
Show file tree
Hide file tree
Showing 7 changed files with 1 addition and 40 deletions.
4 changes: 1 addition & 3 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ module "eks_cluster" {
allowed_cidr_blocks = var.allowed_cidr_blocks_cluster
enabled_cluster_log_types = var.enabled_cluster_log_types
public_access_cidrs = var.public_access_cidrs
kms_key_arn = var.kms_key_arn
resources = var.resources

}

#Module : EKS Worker
Expand Down Expand Up @@ -74,7 +73,6 @@ module "eks_workers" {
max_price = var.max_price
volume_size = var.volume_size
ebs_encryption = var.ebs_encryption
kms_key_arn = var.kms_key_arn
volume_type = var.volume_type
spot_instance_type = var.spot_instance_type
wait_for_capacity_timeout = var.wait_for_capacity_timeout
Expand Down
2 changes: 0 additions & 2 deletions modules/autoscaling/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ resource "aws_launch_template" "on_demand" {
ebs {
volume_size = var.volume_size
encrypted = var.ebs_encryption
kms_key_id = var.kms_key_arn
volume_type = var.volume_type
}
}
Expand Down Expand Up @@ -82,7 +81,6 @@ resource "aws_launch_template" "spot" {
ebs {
volume_size = var.volume_size
encrypted = var.ebs_encryption
kms_key_id = var.kms_key_arn
volume_type = var.volume_type
}
}
Expand Down
6 changes: 0 additions & 6 deletions modules/eks/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,6 @@ resource "aws_eks_cluster" "default" {
public_access_cidrs = var.public_access_cidrs
}

encryption_config {
provider {
key_arn = var.kms_key_arn
}
resources = var.resources
}

depends_on = [
aws_iam_role_policy_attachment.amazon_eks_cluster_policy,
Expand Down
12 changes: 0 additions & 12 deletions modules/eks/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -113,15 +113,3 @@ variable "public_access_cidrs" {
default = []
description = "The list of cidr blocks to access AWS EKS cluster endpoint. Default [`0.0.0.0/0`]"
}

variable "resources" {
type = list(string)
default = []
description = "List of strings with resources to be encrypted. Valid values: secrets"
}

variable "kms_key_arn" {
type = string
default = ""
description = "The ARN of the KMS Key"
}
1 change: 0 additions & 1 deletion modules/worker/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,6 @@ module "autoscale_group" {
max_price = var.max_price
volume_size = var.volume_size
ebs_encryption = var.ebs_encryption
kms_key_arn = var.kms_key_arn
volume_type = var.volume_type
spot_instance_type = var.spot_instance_type
associate_public_ip_address = var.associate_public_ip_address
Expand Down
5 changes: 0 additions & 5 deletions modules/worker/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -410,11 +410,6 @@ variable "ebs_encryption" {
description = "Enables EBS encryption on the volume (Default: false). Cannot be used with snapshot_id."
}

variable "kms_key_arn" {
type = string
default = ""
description = "AWS Key Management Service (AWS KMS) customer master key (CMK) to use when creating the encrypted volume. encrypted must be set to true when this is set."
}

###Spot
variable "spot_enabled" {
Expand Down
11 changes: 0 additions & 11 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -380,12 +380,6 @@ variable "public_access_cidrs" {
description = "The list of cidr blocks to access AWS EKS cluster endpoint. Default [`0.0.0.0/0`]"
}

variable "resources" {
type = list(string)
default = []
description = "List of strings with resources to be encrypted. Valid values: secrets"
}

variable "fargate_enabled" {
type = bool
default = false
Expand All @@ -404,11 +398,6 @@ variable "number_of_node_groups" {
description = "Number of node groups"
}

variable "kms_key_arn" {
type = string
default = ""
description = "The ARN of the KMS Key"
}

variable "node_security_group_ids" {
type = list(string)
Expand Down

0 comments on commit d78400e

Please sign in to comment.