diff --git a/examples/terraform/bootkube-install/README.md b/examples/terraform/bootkube-install/README.md index e4c55225..39b17e28 100644 --- a/examples/terraform/bootkube-install/README.md +++ b/examples/terraform/bootkube-install/README.md @@ -68,7 +68,6 @@ You may set certain optional variables to override defaults. Set `networking` to # cached_install = "false" # install_disk = "/dev/sda" # container_linux_oem = "" -# experimental_self_hosted_etcd = "false" # networking = "flannel" ``` diff --git a/examples/terraform/bootkube-install/cluster.tf b/examples/terraform/bootkube-install/cluster.tf index 0b29802b..a02e9d12 100644 --- a/examples/terraform/bootkube-install/cluster.tf +++ b/examples/terraform/bootkube-install/cluster.tf @@ -1,6 +1,6 @@ // Kubernetes cluster module "cluster" { - source = "git::https://github.com/poseidon/typhoon//bare-metal/container-linux/kubernetes?ref=0d6410505d8d65cef94a1a3f2f921327e88adfd2" + source = "git::https://github.com/poseidon/typhoon//bare-metal/container-linux/kubernetes?ref=f7dd959e9c444ce1b2759a214b99990b89705ac4" # install matchbox_http_endpoint = "${var.matchbox_http_endpoint}" @@ -28,5 +28,4 @@ module "cluster" { cached_install = "${var.cached_install}" install_disk = "${var.install_disk}" container_linux_oem = "${var.container_linux_oem}" - experimental_self_hosted_etcd = "${var.experimental_self_hosted_etcd}" } diff --git a/examples/terraform/bootkube-install/multi-controller.tfvars.example b/examples/terraform/bootkube-install/multi-controller.tfvars.example index b44b602e..1eeae137 100644 --- a/examples/terraform/bootkube-install/multi-controller.tfvars.example +++ b/examples/terraform/bootkube-install/multi-controller.tfvars.example @@ -20,4 +20,3 @@ asset_dir = "assets" # Optional # container_linux_oem = "" -# experimental_self_hosted_etcd = "true" diff --git a/examples/terraform/bootkube-install/terraform.tfvars.example b/examples/terraform/bootkube-install/terraform.tfvars.example index e76d6f65..1763efb7 100644 --- a/examples/terraform/bootkube-install/terraform.tfvars.example +++ b/examples/terraform/bootkube-install/terraform.tfvars.example @@ -22,5 +22,4 @@ asset_dir = "assets" cached_install = "true" # install_disk = "/dev/sda" # container_linux_oem = "" -# experimental_self_hosted_etcd = "false" # networking = "flannel" diff --git a/examples/terraform/bootkube-install/variables.tf b/examples/terraform/bootkube-install/variables.tf index 42374aaf..d2006410 100644 --- a/examples/terraform/bootkube-install/variables.tf +++ b/examples/terraform/bootkube-install/variables.tf @@ -108,8 +108,3 @@ variable "container_linux_oem" { default = "" description = "Specify an OEM image id to use as base for the installation (e.g. ami, vmware_raw, xen) or leave blank for the default image" } - -variable "experimental_self_hosted_etcd" { - default = "false" - description = "Create self-hosted etcd cluster as pods on Kubernetes, instead of on-hosts" -}