diff --git a/VARIABLES.md b/VARIABLES.md index 95508f81..4dd1faf1 100644 --- a/VARIABLES.md +++ b/VARIABLES.md @@ -117,7 +117,7 @@ | extra\_tags | (Optional) Extra AWS tags to be applied to the resources. | map | `` | no | | hostzone | (Optional) The cluster private hostname. If not specified, .com will be used. | string | `""` | no | | kubelet\_flag\_extra\_flags | Extra user-provided flags to kubelet. | list | `` | no | -| kubernetes\_version | (Optional) Desired Kubernetes master version. If you do not specify a value, the latest available version is used. | string | `"v1.13.4"` | no | +| kubernetes\_version | (Optional) Desired Kubernetes master version. If you do not specify a value, the latest available version is used. | string | `"v1.13.12"` | no | | lb\_security\_group\_ids | (Optional) List of security group IDs for the cross-account elastic network interfaces to use to allow communication to the kubernetes api server load balancer. | list | `` | no | | master\_config | (Optional) Desired master nodes configuration. | map | `` | no | | name | (Required) Name of the cluster. | string | n/a | yes | @@ -156,7 +156,7 @@ | kube\_node\_taints | Register the node with the given list of taints ("=:"). | list | `` | no | | kube\_service\_cidr | | string | n/a | yes | | kubelet\_flag\_extra\_flags | Extra user-provided flags to kubelet. | list | `` | no | -| kubernetes\_version | Desired Kubernetes kubelet version. If you do not specify a value, the latest available version is used. | string | `"v1.13.4"` | no | +| kubernetes\_version | Desired Kubernetes kubelet version. If you do not specify a value, the latest available version is used. | string | `"v1.13.12"` | no | | load\_balancer\_ids | A list of elastic load balancer names to add to the autoscaling group names. Only valid for classic load balancers. For ALBs, use target_group_arns instead. | list | `` | no | | reboot\_strategy | CoreOS reboot strategies on updates, two option here: etcd-lock or off | string | `"etcd-lock"` | no | | role\_name | The Amazon Resource Name of the IAM role that provides permissions for the Kubernetes control plane to make calls to AWS API operations on your behalf. | string | `""` | no | diff --git a/examples/aws-iam-authenticator/main.tf b/examples/aws-iam-authenticator/main.tf index 775dfd1f..e9990c10 100644 --- a/examples/aws-iam-authenticator/main.tf +++ b/examples/aws-iam-authenticator/main.tf @@ -1,9 +1,9 @@ locals { - project = "elastikube" - phase = "auth" - cluster_name = "${local.phase}-${local.project}" - hostzone = "${local.cluster_name}.cluster" - kubernetes_version = "v1.13.4" + project = "elastikube" + phase = "auth" + cluster_name = "${local.phase}-${local.project}" + hostzone = "${local.cluster_name}.cluster" + kubernetes_version = "v1.13.12" } # --------------------------------------------------------------------------------------------------------------------- diff --git a/examples/elastikube-cluster/main.tf b/examples/elastikube-cluster/main.tf index da7fdbf9..88e8830f 100644 --- a/examples/elastikube-cluster/main.tf +++ b/examples/elastikube-cluster/main.tf @@ -1,7 +1,7 @@ locals { cluster_name = "${var.phase}-${var.project}" - kubernetes_version = "v1.13.4" + kubernetes_version = "v1.13.12" } provider "aws" { @@ -61,7 +61,7 @@ module "kubernetes" { private_subnet_ids = ["${module.network.private_subnet_ids}"] public_subnet_ids = ["${module.network.public_subnet_ids}"] ssh_key = "${var.key_pair_name}" - reboot_strategy = "off" + reboot_strategy = "off" extra_tags = "${merge(map( "Phase", "${var.phase}", diff --git a/examples/elastikube-cluster/variables.tf b/examples/elastikube-cluster/variables.tf index 15cc0420..affa0fa7 100644 --- a/examples/elastikube-cluster/variables.tf +++ b/examples/elastikube-cluster/variables.tf @@ -22,19 +22,19 @@ variable "key_pair_name" { } variable "project" { - type = "string" - default = "elastikube" - description = "(Optional) project name, used to compose the resource name" + type = "string" + default = "elastikube" + description = "(Optional) project name, used to compose the resource name" } variable "phase" { - type = "string" - default = "test" + type = "string" + default = "test" description = "(Optional) phase name, used to compose the resource name" } variable "endpoint_public_access" { - default = false + default = false description = "(Optional) kubernetes apiserver endpoint" } diff --git a/modules/aws/elastikube/variables.tf b/modules/aws/elastikube/variables.tf index 45e9175a..dd58ae72 100644 --- a/modules/aws/elastikube/variables.tf +++ b/modules/aws/elastikube/variables.tf @@ -56,13 +56,13 @@ EOF } variable "endpoint_public_access" { - default = false + default = false description = "(Optional) kubernetes apiserver endpoint" } variable "kubernetes_version" { type = "string" - default = "v1.13.4" + default = "v1.13.12" description = "(Optional) Desired Kubernetes master version. If you do not specify a value, the latest available version is used." } @@ -94,6 +94,7 @@ variable "master_config" { description = "(Optional) Desired master nodes configuration." } + variable "etcd_config" { type = "map" @@ -139,8 +140,8 @@ variable "hostzone" { } variable "reboot_strategy" { - type = "string" - default = "off" + type = "string" + default = "off" description = "(Optional) CoreOS reboot strategies on updates, two option here: etcd-lock or off" } @@ -208,15 +209,17 @@ variable "audit_policy_path" { } variable "audit_log_backend" { - type = "map" - default = { + type = "map" + + default = { path = "" maxage = "" maxbackup = "" maxsize = "" } + description = <