From b503e2b396156c86c05bf99a626e834bccc2e924 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mudrini=C4=87?= Date: Tue, 16 Aug 2022 17:04:54 +0200 Subject: [PATCH 1/3] Remove defaulting for provisioning utility in AWS configs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marko Mudrinić --- examples/terraform/aws/variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/terraform/aws/variables.tf b/examples/terraform/aws/variables.tf index 5f419abb0..1c35399ff 100644 --- a/examples/terraform/aws/variables.tf +++ b/examples/terraform/aws/variables.tf @@ -259,7 +259,7 @@ variable "control_plane_vm_count" { variable "provisioning_utility" { description = "provisioning utility to be used for Flatcar worker nodes" - default = "ignition" + default = "" type = string } From c2cd42445d653718711300945f35a1d66ed9c27e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mudrini=C4=87?= Date: Tue, 16 Aug 2022 17:08:59 +0200 Subject: [PATCH 2/3] Unset provisioning_utility in the E2E tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marko Mudrinić --- testv2/e2e/tests_definitions.go | 1 - 1 file changed, 1 deletion(-) diff --git a/testv2/e2e/tests_definitions.go b/testv2/e2e/tests_definitions.go index 2b8e0bde9..2018a816b 100644 --- a/testv2/e2e/tests_definitions.go +++ b/testv2/e2e/tests_definitions.go @@ -133,7 +133,6 @@ var ( "os=flatcar", "ssh_username=core", "bastion_user=core", - "provisioning_utility=cloud-init", "worker_deploy_ssh_key=false", }, }, From 83b228814906962507019a9ecf4e83f6baf3357a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mudrini=C4=87?= Date: Tue, 16 Aug 2022 17:26:30 +0200 Subject: [PATCH 3/3] Update Terraform docs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marko Mudrinić --- examples/terraform/aws/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/terraform/aws/README.md b/examples/terraform/aws/README.md index e1febcdcc..a16d3b8af 100644 --- a/examples/terraform/aws/README.md +++ b/examples/terraform/aws/README.md @@ -73,7 +73,7 @@ No modules. | [initial\_machinedeployment\_spotinstances\_max\_price](#input\_initial\_machinedeployment\_spotinstances\_max\_price) | used to specify max spot instance price for initial machine-deployment | `number` | `0` | no | | [internal\_api\_lb](#input\_internal\_api\_lb) | make kubernetes API loadbalancer internal (reachible only from inside the VPC) | `bool` | `false` | no | | [os](#input\_os) | Operating System to use in AMI filtering and MachineDeployment | `string` | `"ubuntu"` | no | -| [provisioning\_utility](#input\_provisioning\_utility) | provisioning utility to be used for Flatcar worker nodes | `string` | `"ignition"` | no | +| [provisioning\_utility](#input\_provisioning\_utility) | provisioning utility to be used for Flatcar worker nodes | `string` | `""` | no | | [ssh\_agent\_socket](#input\_ssh\_agent\_socket) | SSH Agent socket, default to grab from $SSH\_AUTH\_SOCK | `string` | `"env:SSH_AUTH_SOCK"` | no | | [ssh\_port](#input\_ssh\_port) | SSH port to be used to provision instances | `number` | `22` | no | | [ssh\_private\_key\_file](#input\_ssh\_private\_key\_file) | SSH private key file used to access instances | `string` | `""` | no |