From d5483c8ec724fc78b7b7be82be5c4b9030e724e9 Mon Sep 17 00:00:00 2001 From: Sylvain Houdusse Date: Wed, 13 Dec 2023 17:06:58 +0100 Subject: [PATCH] feat(cce node): Add runtime parameter --- README.md | 6 ++++-- main.tf | 2 ++ variables.tf | 6 ++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e20a565..e8caa8e 100644 --- a/README.md +++ b/README.md @@ -23,8 +23,9 @@ module "cce2_cluster" { network_id = "" //Caution here, you have to use NETWORK_ID even if argument is "subnet_id". Will be fixed soon cluster_version = "v1.15.6-r1" - node_os = "CentOS 7.5" // Can be "EulerOS 2.5" or "CentOS 7.5" - key_pair = "my-key" + node_os = "CentOS 7.5" // Can be "EulerOS 2.5" or "CentOS 7.5" + node_runtime = "containerd // Valid values are docker and containerd" + key_pair = "my-key" nodes_list = [ { @@ -149,6 +150,7 @@ inputs = { cluster_flavor = "cce.s1.small" cluster_version = "v1.15.6-r1" node_os = "CentOS 7.5" // Can be "EulerOS 2.5" or "CentOS 7.5" + node_runtime = "containerd // Valid values are docker and containerd" key_pair = "my-key" nodes_list = [ diff --git a/main.tf b/main.tf index b00c92f..32607d5 100644 --- a/main.tf +++ b/main.tf @@ -28,6 +28,7 @@ resource "flexibleengine_cce_node_v3" "cce_cluster_node" { name = each.value.node_name flavor_id = each.value.node_flavor os = var.node_os + runtime = var.node_runtime availability_zone = each.value.availability_zone key_pair = var.key_pair @@ -69,6 +70,7 @@ resource "flexibleengine_cce_node_pool_v3" "cce_node_pool" { cluster_id = flexibleengine_cce_cluster_v3.cce_cluster.id name = each.value.node_pool_name os = var.node_os + runtime = var.node_runtime flavor_id = each.value.node_flavor availability_zone = each.value.availability_zone diff --git a/variables.tf b/variables.tf index 250ec15..d913b90 100644 --- a/variables.tf +++ b/variables.tf @@ -65,6 +65,12 @@ variable "node_os" { type = string } +variable "node_runtime" { + description = "Runtime of the CCE Worker Node. Valid values are docker and containerd." + type = string + default = "containerd" +} + variable "key_pair" { description = "Name of the SSH key pair" type = string