Skip to content

Commit

Permalink
feat: Cluster version is now a required variable.
Browse files Browse the repository at this point in the history
BREAKING CHANGES: `cluster_version` variable is now required.
  • Loading branch information
dpiddock committed Aug 12, 2020
1 parent 415cfca commit 7450a42
Show file tree
Hide file tree
Showing 9 changed files with 32 additions and 26 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ MIT Licensed. See [LICENSE](https://github.com/terraform-aws-modules/terraform-a
| cluster\_log\_retention\_in\_days | Number of days to retain log events. Default retention - 90 days. | `number` | `90` | no |
| cluster\_name | Name of the EKS cluster. Also used as a prefix in names of related resources. | `string` | n/a | yes |
| cluster\_security\_group\_id | If provided, the EKS cluster will be attached to this security group. If not given, a security group will be created with necessary ingress/egress to work with the workers | `string` | `""` | no |
| cluster\_version | Kubernetes version to use for the EKS cluster. | `string` | `"1.16"` | no |
| cluster\_version | Kubernetes version to use for the EKS cluster. | `string` | n/a | yes |
| config\_output\_path | Where to save the Kubectl config file (if `write_kubeconfig = true`). Assumed to be a directory if the value ends with a forward slash `/`. | `string` | `"./"` | no |
| create\_eks | Controls if EKS resources should be created (it affects almost all resources) | `bool` | `true` | no |
| eks\_oidc\_root\_ca\_thumbprint | Thumbprint of Root CA for EKS OIDC, Valid until 2037 | `string` | `"9e99a48a9960b14926bb7f3b02e22da2b0ab7280"` | no |
Expand Down
7 changes: 4 additions & 3 deletions examples/basic/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,10 @@ module "vpc" {
}

module "eks" {
source = "../.."
cluster_name = local.cluster_name
subnets = module.vpc.private_subnets
source = "../.."
cluster_name = local.cluster_name
cluster_version = "1.17"
subnets = module.vpc.private_subnets

tags = {
Environment = "test"
Expand Down
5 changes: 3 additions & 2 deletions examples/create_false/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@ provider "kubernetes" {
}

module "eks" {
source = "../.."
create_eks = false
source = "../.."
create_eks = false
cluster_version = ""

vpc_id = ""
cluster_name = ""
Expand Down
11 changes: 6 additions & 5 deletions examples/irsa/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,12 @@ module "vpc" {
}

module "eks" {
source = "../.."
cluster_name = local.cluster_name
subnets = module.vpc.public_subnets
vpc_id = module.vpc.vpc_id
enable_irsa = true
source = "../.."
cluster_name = local.cluster_name
cluster_version = "1.17"
subnets = module.vpc.public_subnets
vpc_id = module.vpc.vpc_id
enable_irsa = true

worker_groups = [
{
Expand Down
9 changes: 5 additions & 4 deletions examples/launch_templates/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,11 @@ module "vpc" {
}

module "eks" {
source = "../.."
cluster_name = local.cluster_name
subnets = module.vpc.public_subnets
vpc_id = module.vpc.vpc_id
source = "../.."
cluster_name = local.cluster_name
cluster_version = "1.17"
subnets = module.vpc.public_subnets
vpc_id = module.vpc.vpc_id

worker_groups_launch_template = [
{
Expand Down
7 changes: 4 additions & 3 deletions examples/managed_node_groups/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,10 @@ module "vpc" {
}

module "eks" {
source = "../.."
cluster_name = local.cluster_name
subnets = module.vpc.private_subnets
source = "../.."
cluster_name = local.cluster_name
cluster_version = "1.17"
subnets = module.vpc.private_subnets

tags = {
Environment = "test"
Expand Down
7 changes: 4 additions & 3 deletions examples/secrets_encryption/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,10 @@ module "vpc" {
}

module "eks" {
source = "../.."
cluster_name = local.cluster_name
subnets = module.vpc.private_subnets
source = "../.."
cluster_name = local.cluster_name
cluster_version = "1.17"
subnets = module.vpc.private_subnets

cluster_encryption_config = [
{
Expand Down
9 changes: 5 additions & 4 deletions examples/spot_instances/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,11 @@ module "vpc" {
}

module "eks" {
source = "../.."
cluster_name = local.cluster_name
subnets = module.vpc.public_subnets
vpc_id = module.vpc.vpc_id
source = "../.."
cluster_name = local.cluster_name
cluster_version = "1.17"
subnets = module.vpc.public_subnets
vpc_id = module.vpc.vpc_id

worker_groups_launch_template = [
{
Expand Down
1 change: 0 additions & 1 deletion variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ variable "cluster_security_group_id" {
variable "cluster_version" {
description = "Kubernetes version to use for the EKS cluster."
type = string
default = "1.16"
}

variable "config_output_path" {
Expand Down

0 comments on commit 7450a42

Please sign in to comment.