Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature: add several new features from latest release #5

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
Binary file not shown.
20 changes: 18 additions & 2 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,24 @@ 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,
"dryRun" = var.dryRun,
"logLevel" = var.logLevel,
"logFormat" = var.logFormat,
"replicaCount" = var.replicaCount
},
{
for i, zone in concat(var.hostedzones, data.aws_route53_zone.main.*.name) :
Expand Down
101 changes: 100 additions & 1 deletion variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand All @@ -69,3 +69,102 @@ variable "vpc_id" {
default = null
description = "An ID of the existing AWS VPC"
}


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 "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 "replicaCount" {
type = number
description = "Desired number of ExternalDNS replicas"
default = 1
}