fix(ci): fix terraform scripts

chart/templates/cello-configmap.yaml

@@ -24,7 +24,7 @@ data:
       ],
       {{- end -}}
       {{- if .Values.cello.iamRole }}
-      "ramRole: "{{.Values.cello.iamRole | quote }}",
+      "ramRole": "{{.Values.cello.iamRole | quote }}",
       {{- end }}
       "credentialAccessKeyId": "{{ .Values.cello.accessKey }}",
       "credentialAccessKeySecret": "{{ .Values.cello.secretKey }}",

ci/README.md

@@ -6,10 +6,10 @@ Edit cluster variables in file `ci/tf/example.tfvars` and run:
 ``` bash
 ./provision.sh
 ```
-kubectl config file locates at `ci/kube/config-public`.
+kubectl config file locates at `ci/playbook/kube/config-public`.
 
 ```bash
-export KUBECONFIG=ci/kube/config-public
+export KUBECONFIG=ci/playbook/kube/config-public
 kubectl get nodes -A -o wide
 ```
 

ci/provision.sh

@@ -13,7 +13,6 @@ pushd tf > /dev/null
 terraform init $extra_args
 terraform apply -auto-approve -var-file=example.tfvars
 popd > /dev/null
-
 pushd playbook > /dev/null
 ansible-playbook -i ../tf/hosts.yaml k8s.yaml
 popd > /dev/null

ci/tf/example.tfvars

@@ -4,6 +4,7 @@ key_pair_name=""
 key_pair_path=""
 zone_id=""
 region=""
+instance_type="ecs.g3i.xlarge"
 vpc_name="my-ci-test"
 vpc_cidr="172.16.0.0/16"
 node_subnet_name="my-ci-node-subnet"
@@ -14,3 +15,4 @@ control_plane_node_name="my-ci-control-plane"
 worker_node_name="my-ci-worker"
 worker2_node_name="my-ci-worker2"
 control_eip_name="my-ci-eip"
+project_name="default"

ci/tf/hosts.tftpl

@@ -13,5 +13,6 @@ all:
     ansible_ssh_common_args: -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ProxyCommand="ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -W %h:%p -q -i ${key_pair_path} root@${jump_host}"
     ansible_ssh_private_key_file: ${key_pair_path}
     host_key_checking: false
+    ansible_python_interpreter: python3
     ansible_user: root
     k8s_api_server_ip: ${jump_host}

ci/tf/main.tf

@@ -32,6 +32,10 @@ variable "zone_id" {
   type = string
 }
 
+variable "instance_type" {
+  type = string
+}
+
 variable "vpc_name" {
   type = string
 }
@@ -72,6 +76,11 @@ variable "control_eip_name" {
   type = string
 }
 
+
+variable "project_name" {
+  type = string
+}
+
 # Configure the Volcengine Provider
 provider "volcengine" {
   access_key = var.access_key
@@ -82,6 +91,7 @@ provider "volcengine" {
 resource "volcengine_vpc" "vpc_cello" {
   vpc_name   = var.vpc_name
   cidr_block = var.vpc_cidr
+  project_name = var.project_name
   enable_ipv6 = true
 }
 
@@ -121,7 +131,7 @@ resource "volcengine_security_group_rule" "sg_rule_allow_api_server" {
 resource "volcengine_ecs_instance" "control_plane" {
   zone_id              = var.zone_id
   image_id             = "image-ybqi99s7yq8rx7mnk44b"
-  instance_type        = "ecs.g2i.xlarge"
+  instance_type        = var.instance_type
   instance_name        = var.control_plane_node_name
   description          = var.control_plane_node_name
   host_name            = var.control_plane_node_name
@@ -132,13 +142,13 @@ resource "volcengine_ecs_instance" "control_plane" {
   subnet_id            = volcengine_subnet.subnet_node.id
   ipv6_address_count   = 1
   security_group_ids   = [data.volcengine_security_groups.sg_default.security_groups[0].id]
-
+  project_name = var.project_name
 }
 
 resource "volcengine_ecs_instance" "worker" {
   zone_id              = var.zone_id
   image_id             = "image-ybqi99s7yq8rx7mnk44b"
-  instance_type        = "ecs.g2i.xlarge"
+  instance_type        = var.instance_type
   instance_name        = var.worker_node_name
   description          = var.worker_node_name
   host_name            = var.worker_node_name
@@ -149,12 +159,13 @@ resource "volcengine_ecs_instance" "worker" {
   subnet_id            = volcengine_subnet.subnet_node.id
   ipv6_address_count   = 1
   security_group_ids   = [data.volcengine_security_groups.sg_default.security_groups[0].id]
+  project_name = var.project_name
 }
 
 resource "volcengine_ecs_instance" "worker2" {
   zone_id              = var.zone_id
   image_id             = "image-ybqi99s7yq8rx7mnk44b"
-  instance_type        = "ecs.g2i.xlarge"
+  instance_type        = var.instance_type
   instance_name        = var.worker2_node_name
   description          = var.worker2_node_name
   host_name            = var.worker2_node_name
@@ -165,13 +176,15 @@ resource "volcengine_ecs_instance" "worker2" {
   subnet_id            = volcengine_subnet.subnet_node.id
   ipv6_address_count   = 1
   security_group_ids   = [data.volcengine_security_groups.sg_default.security_groups[0].id]
+  project_name = var.project_name
 }
 
 resource "volcengine_eip_address" "control_plane" {
   billing_type = "PostPaidByBandwidth"
   bandwidth    = 10
   name         = var.control_eip_name
   description  = "EIP for control-plane node"
+  project_name = var.project_name
 }
 
 resource "volcengine_eip_associate" "foo" {