Merge pull request #289 from aws-samples/fix/k8s-taint-updates

Update k8s_taints documentation and taints fixes
aws-ia · Feb 26, 2022 · 8a29e2c · 8a29e2c
2 parents 303ad25 + b61d23a
commit 8a29e2c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/docs/node-groups.md b/docs/node-groups.md
@@ -20,7 +20,7 @@ The below example demonstrates the minimum configuration required to deploy a ma
     }
 ```
 
-The below example demonstrates advanced configuration options for a manged node group.
+The below example demonstrates advanced configuration options for a managed node group.
 
 ```hcl
     managed_node_groups = {
@@ -49,6 +49,8 @@ The below example demonstrates advanced configuration options for a manged node
         # 4> Node Group network configuration
         subnet_ids     = []                          # Mandatory - # Define private/public subnets list with comma separated ["subnet1","subnet2","subnet3"]
         k8s_taints     = []
+        # optionally, configure a taint on the node group:
+        # k8s_taints = [{key= "purpose", value="execution", "effect"="NO_SCHEDULE"}]
         k8s_labels     = {
           Environment = "preprod"
           Zone        = "dev"

diff --git a/examples/advanced/live/preprod/eu-west-1/application_acct/dev/main.tf b/examples/advanced/live/preprod/eu-west-1/application_acct/dev/main.tf
@@ -235,7 +235,7 @@ module "aws-eks-accelerator-for-terraform" {
 
       subnet_ids  = []        # Define your private/public subnets list with comma seprated subnet_ids  = ['subnet1','subnet2','subnet3']
 
-      k8s_taints = {}
+      k8s_taints = []
       k8s_labels = {
         Environment = "preprod"
         Zone        = "dev"
@@ -334,7 +334,6 @@ module "aws-eks-accelerator-for-terraform" {
 
       subnet_ids  = []        # Define your private/public subnets list with comma seprated subnet_ids  = ['subnet1','subnet2','subnet3']
 
-      k8s_taints = []
       k8s_labels = {
         Environment = "preprod"
         Zone        = "dev"
@@ -373,8 +372,6 @@ module "aws-eks-accelerator-for-terraform" {
 
       subnet_ids  = []        # Define your private/public subnets list with comma seprated subnet_ids  = ['subnet1','subnet2','subnet3']
 
-      k8s_taints = []
-
       k8s_labels = {
         Environment = "preprod"
         Zone        = "dev"

diff --git a/modules/aws-eks-fargate-profiles/locals.tf b/modules/aws-eks-fargate-profiles/locals.tf
@@ -5,7 +5,6 @@ locals {
     fargate_profile_namespaces = []
     create_iam_role            = true
     k8s_labels                 = {}
-    k8s_taints                 = []
     additional_tags            = {}
     subnet_ids                 = []
   }

diff --git a/modules/aws-eks-managed-node-groups/README.md b/modules/aws-eks-managed-node-groups/README.md
@@ -43,6 +43,8 @@ This module allows you to create ON-DEMAND, SPOT and BOTTLEROCKET(with custom am
       subnet_ids  = []        # Define your private/public subnets list with comma seprated subnet_ids  = ['subnet1','subnet2','subnet3']
 
       k8s_taints = []
+      # optionally, configure a taint on the node group:
+      # k8s_taints = [{key= "purpose", value="execution", "effect"="NO_SCHEDULE"}]
 
       k8s_labels = {
         Environment = "preprod"