Merge pull request #103 from wandera/JSC-49867

JSC-49867 Add support for AdditionalUserData and ChainInsertMode
wandera · Jan 27, 2023 · 8fce8e8 · 8fce8e8
2 parents 2aedf4d + a31f44f
commit 8fce8e8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/aws/cluster/variables.tf b/aws/cluster/variables.tf
@@ -269,6 +269,7 @@ variable "container-networking-params-amazonvpc" {
 
 variable "container-networking-params-calico" {
   type = object({
+    chainInsertMode                 = string
     crossSubnet                     = bool
     bpfEnabled                      = bool
     bpfExternalServiceMode          = string
@@ -288,6 +289,7 @@ variable "container-networking-params-calico" {
   description = "Calico CNI params"
 
   default = {
+    chainInsertMode                 = "insert"
     crossSubnet                     = true
     bpfEnabled                      = false
     bpfExternalServiceMode          = "Tunnel"

diff --git a/aws/ig/main.tf b/aws/ig/main.tf
@@ -17,6 +17,7 @@ locals {
       maxSize                = var.max-size
       minSize                = var.min-size
       externalLoadBalancers  = var.external-load-balancers
+      additionalUserData     = var.user-data
       role                   = "Node"
       rootVolumeSize         = var.volume-size
       rootVolumeType         = var.volume-type

diff --git a/aws/ig/variables.tf b/aws/ig/variables.tf
@@ -188,3 +188,13 @@ variable "warm-pool" {
 
   nullable = true
 }
+
+variable "user-data" {
+  type = list(object({
+    name    = string
+    type    = string
+    content = string
+  }))
+  description = "UserData defines a user-data section to be passed to the host"
+  default     = []
+}