From 7075f7c1cde87b4eae413771086be1ae94a2e035 Mon Sep 17 00:00:00 2001 From: Mher Nahapetyan Date: Mon, 4 Jul 2022 10:15:09 +0400 Subject: [PATCH 1/7] initial commit --- .DS_Store | Bin 0 -> 6148 bytes main.tf | 25 +++++++++- variables.tf | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 150 insertions(+), 3 deletions(-) create mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..26dd81d914fe881809cfaca65dfa0a332b64977c GIT binary patch literal 6148 zcmeHKOHRW;47E!ng4k4u1v>2^LL8WT|t6&xL4_(H@lI*^fB#L2S8dNG;Zw9RG^ z>4x9RfIPd5&S*g^x=o+o{cGRXv{hBF+Zwj~?&9eD;q>V;_0PZcZe(MM;%8E^(V z2ITutKm|*~pcp?L7~&BCn86$cb2&>$PGMLY21R%vtf@dvWjkW9{fe=s!(Uo_P}Fqd zSQ+bBWwsLv$Lg>bF`T$m^wAk`22uw0^l~iy|7!R7KTYy0XTTZwQw(rc&8jJG$$IPH v=A_pa&}*oO#0AAJ1(Vo{5i70u1R4eQLMFh{Fet(T@gIRmgAdNYk23HE1Fl6M literal 0 HcmV?d00001 diff --git a/main.tf b/main.tf index c8d29eb..326eabf 100644 --- a/main.tf +++ b/main.tf @@ -148,8 +148,29 @@ locals { "resources.limits.memory" = "300Mi", "resources.requests.cpu" = "100m", "resources.requests.memory" = "300Mi", - "aws.region" = data.aws_region.current.name - "serviceAccount.annotations.eks\\.amazonaws\\.com/role-arn" = module.iam_assumable_role_admin.this_iam_role_arn + "aws.region" = data.aws_region.current.name, + "serviceAccount.annotations.eks\\.amazonaws\\.com/role-arn" = module.iam_assumable_role_admin.this_iam_role_arn, + "livenessProbe.enabled" = var.livenessProbe_enabled, + "livenessProbe.initialDelaySeconds" = var.livenessProbe_initialDelaySeconds, + "livenessProbe.periodSeconds" = var.livenessProbe_periodSeconds, + "livenessProbe.timeoutSeconds" = var.livenessProbe_timeoutSeconds, + "livenessProbe.failureThreshold" = var.livenessProbe_failureThreshold, + "livenessProbe.successThreshold" = var.livenessProbe_successThreshold, + "readinessProbe.enabled " = var.readinessProbe_enabled , + "readinessProbe.initialDelaySeconds" = var.readinessProbe_initialDelaySeconds, + "readinessProbe.periodSeconds" = var.readinessProbe_periodSeconds, + "readinessProbe.timeoutSeconds" = var.readinessProbe_timeoutSeconds, + "readinessProbe.failureThreshold" = var.readinessProbe_failureThreshold, + "readinessProbe.successThreshold" = var.readinessProbe_successThreshold, + "extraVolumes" = var.extraVolumes, + "extraVolumeMounts" = var.extraVolumeMounts, + "annotationFilter" = var.annotationFilter, + "labelFilter" = var.labelFilter, + "dryRun" = var.dryRun, + "logLevel" = var.logLevel, + "logFormat" = var.logFormat, + "schedulerName" = var.schedulerName, + "replicaCount" = var.replicaCount }, { for i, zone in concat(var.hostedzones, data.aws_route53_zone.main.*.name) : diff --git a/variables.tf b/variables.tf index d479918..263c516 100644 --- a/variables.tf +++ b/variables.tf @@ -55,7 +55,7 @@ variable "cluster_name" { variable "chart_version" { type = string description = "A Helm Chart version" - default = "3.4.1" + default = "6.5.6" } variable "tags" { @@ -69,3 +69,129 @@ variable "vpc_id" { default = null description = "An ID of the existing AWS VPC" } + +variable "extraVolumes" { + type = list(string) + description = " A list of volumes to be added to the pod" + default = [] +} + +variable "extraVolumeMounts" { + type = list(string) + description = "A list of volume mounts to be added to the pod" + default = [] +} + +variable "livenessProbe_enabled" { + type = bool + description = "Enable livenessProbe" + default = true +} + +variable "livenessProbe_initialDelaySeconds" { + type = number + description = "Initial delay seconds for livenessProbe" + default = 10 +} + +variable "livenessProbe_periodSeconds" { + type = number + description = "Period seconds for livenessProbe" + default = 10 +} + +variable "livenessProbe_timeoutSeconds" { + type = number + description = "Timeout seconds for livenessProbe" + default = 5 +} + +variable "livenessProbe_failureThreshold" { + type = number + description = "Failure threshold for livenessProbe" + default = 2 +} + +variable "livenessProbe_successThreshold" { + type = number + description = "Failure threshold for livenessProbe" + default = 1 +} + +variable "readinessProbe_enabled" { + type = bool + description = "Enable readinessProbe" + default = true +} + +variable "readinessProbe_initialDelaySeconds" { + type = number + description = "Initial delay seconds for readinessProbe" + default = 5 +} + +variable "readinessProbe_periodSeconds" { + type = number + description = "Period seconds for readinessProbe" + default = 10 +} + +variable "readinessProbe_timeoutSeconds" { + type = number + description = "Timeout seconds for readinessProbe" + default = 5 +} + +variable "readinessProbe_failureThreshold" { + type = number + description = "Failure threshold for readinessProbe" + default = 6 +} + +variable "readinessProbe_successThreshold" { + type = number + description = "Failure threshold for readinessProbe" + default = 1 +} + +variable "annotationFilter" { + type = string + description = "Filter sources managed by external-dns via annotation using label selector" + default = "" +} + +variable "labelFilter" { + type = string + description = "Select sources managed by external-dns using label selector" + default = "" +} + +variable "dryRun" { + type = bool + description = "When enabled, prints DNS record changes rather than actually performing them" + default = false +} + +variable "logLevel" { + type = string + description = "Verbosity of the logs (options: panic, debug, info, warning, error, fatal, trace)" + default = "info" +} + +variable "logFormat" { + type = string + description = "Which format to output logs in (options: text, json)" + default = "text" +} + +variable "schedulerName" { + type = string + description = "Alternative scheduler" + default = "" +} + +variable "replicaCount" { + type = number + description = "Alternative scheduler" + default = 1 +} From a611c316435684396748066f1cd30703ff9cff7b Mon Sep 17 00:00:00 2001 From: Mher Nahapetyan Date: Wed, 6 Jul 2022 17:16:12 +0400 Subject: [PATCH 2/7] remove 2 configs --- main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.tf b/main.tf index 326eabf..19f06ae 100644 --- a/main.tf +++ b/main.tf @@ -162,8 +162,8 @@ locals { "readinessProbe.timeoutSeconds" = var.readinessProbe_timeoutSeconds, "readinessProbe.failureThreshold" = var.readinessProbe_failureThreshold, "readinessProbe.successThreshold" = var.readinessProbe_successThreshold, - "extraVolumes" = var.extraVolumes, - "extraVolumeMounts" = var.extraVolumeMounts, + # "extraVolumes" = var.extraVolumes, + # "extraVolumeMounts" = var.extraVolumeMounts, "annotationFilter" = var.annotationFilter, "labelFilter" = var.labelFilter, "dryRun" = var.dryRun, From cc45c5076c873ab3176ddb9c687efc12d02dbf33 Mon Sep 17 00:00:00 2001 From: Mher Nahapetyan Date: Thu, 7 Jul 2022 11:41:08 +0400 Subject: [PATCH 3/7] remove variables --- variables.tf | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/variables.tf b/variables.tf index 263c516..81119c5 100644 --- a/variables.tf +++ b/variables.tf @@ -70,17 +70,17 @@ variable "vpc_id" { description = "An ID of the existing AWS VPC" } -variable "extraVolumes" { - type = list(string) - description = " A list of volumes to be added to the pod" - default = [] -} - -variable "extraVolumeMounts" { - type = list(string) - description = "A list of volume mounts to be added to the pod" - default = [] -} +# variable "extraVolumes" { +# type = list(string) +# description = " A list of volumes to be added to the pod" +# default = [] +# } + +# variable "extraVolumeMounts" { +# type = list(string) +# description = "A list of volume mounts to be added to the pod" +# default = [] +# } variable "livenessProbe_enabled" { type = bool From 1d5821ece113e5ea938f0454904410795166f33a Mon Sep 17 00:00:00 2001 From: Mher Nahapetyan Date: Thu, 7 Jul 2022 11:49:15 +0400 Subject: [PATCH 4/7] remove several params --- main.tf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/main.tf b/main.tf index 19f06ae..b2b1872 100644 --- a/main.tf +++ b/main.tf @@ -164,12 +164,12 @@ locals { "readinessProbe.successThreshold" = var.readinessProbe_successThreshold, # "extraVolumes" = var.extraVolumes, # "extraVolumeMounts" = var.extraVolumeMounts, - "annotationFilter" = var.annotationFilter, - "labelFilter" = var.labelFilter, + # "annotationFilter" = var.annotationFilter, + # "labelFilter" = var.labelFilter, "dryRun" = var.dryRun, "logLevel" = var.logLevel, "logFormat" = var.logFormat, - "schedulerName" = var.schedulerName, + # "schedulerName" = var.schedulerName, "replicaCount" = var.replicaCount }, { From 142f0017996ea8a134879a0ee933faddf76ce5e3 Mon Sep 17 00:00:00 2001 From: Mher Nahapetyan Date: Thu, 7 Jul 2022 12:02:10 +0400 Subject: [PATCH 5/7] test push --- variables.tf | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/variables.tf b/variables.tf index 81119c5..3baf489 100644 --- a/variables.tf +++ b/variables.tf @@ -70,17 +70,6 @@ variable "vpc_id" { description = "An ID of the existing AWS VPC" } -# variable "extraVolumes" { -# type = list(string) -# description = " A list of volumes to be added to the pod" -# default = [] -# } - -# variable "extraVolumeMounts" { -# type = list(string) -# description = "A list of volume mounts to be added to the pod" -# default = [] -# } variable "livenessProbe_enabled" { type = bool @@ -154,17 +143,7 @@ variable "readinessProbe_successThreshold" { default = 1 } -variable "annotationFilter" { - type = string - description = "Filter sources managed by external-dns via annotation using label selector" - default = "" -} -variable "labelFilter" { - type = string - description = "Select sources managed by external-dns using label selector" - default = "" -} variable "dryRun" { type = bool @@ -184,12 +163,6 @@ variable "logFormat" { default = "text" } -variable "schedulerName" { - type = string - description = "Alternative scheduler" - default = "" -} - variable "replicaCount" { type = number description = "Alternative scheduler" From 263ed561a6731047c4f9cfa742c61b50a27bbd61 Mon Sep 17 00:00:00 2001 From: Mher Nahapetyan Date: Thu, 7 Jul 2022 12:07:40 +0400 Subject: [PATCH 6/7] fix all conflicts --- main.tf | 5 ----- 1 file changed, 5 deletions(-) diff --git a/main.tf b/main.tf index b2b1872..362e953 100644 --- a/main.tf +++ b/main.tf @@ -162,14 +162,9 @@ locals { "readinessProbe.timeoutSeconds" = var.readinessProbe_timeoutSeconds, "readinessProbe.failureThreshold" = var.readinessProbe_failureThreshold, "readinessProbe.successThreshold" = var.readinessProbe_successThreshold, - # "extraVolumes" = var.extraVolumes, - # "extraVolumeMounts" = var.extraVolumeMounts, - # "annotationFilter" = var.annotationFilter, - # "labelFilter" = var.labelFilter, "dryRun" = var.dryRun, "logLevel" = var.logLevel, "logFormat" = var.logFormat, - # "schedulerName" = var.schedulerName, "replicaCount" = var.replicaCount }, { From b96c51b1f27152a240757d615f0cbd345a0fae2a Mon Sep 17 00:00:00 2001 From: Mher Nahapetyan Date: Thu, 7 Jul 2022 12:11:42 +0400 Subject: [PATCH 7/7] fix all conflicts --- variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/variables.tf b/variables.tf index 3baf489..c1546cd 100644 --- a/variables.tf +++ b/variables.tf @@ -165,6 +165,6 @@ variable "logFormat" { variable "replicaCount" { type = number - description = "Alternative scheduler" + description = "Desired number of ExternalDNS replicas" default = 1 }