Skip to content

TKE needs #543

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Nov 5, 2020
Merged

TKE needs #543

merged 10 commits into from
Nov 5, 2020

Conversation

gailwang
Copy link
Contributor

@gailwang gailwang commented Nov 4, 2020

ENHANCEMENTS:

  • Resource: tencentcloud_kubernetes_cluster add new argument kube_config.
  • Resource: tencentcloud_kubernetes_cluster add new argument mount_target to support set disk mount path.
  • Resource: tencentcloud_kubernetes_cluster add new argument docker_graph_path to support set docker graph path.
  • Resource: tencentcloud_clb_redirection add new argument delete_all_auto_rewirte to delete all auto-associated redirection when destroying the resource.
  • Data Source: tencentcloud_kubernetes_clusters add new argument kube_config.
  • Data Source: tencentcloud_availability_regions support getting local region info by setting argument name with value default.

BUG FIXES:

  • Resource: tencentcloud_clb_redirection fix inconsistent bugs when creating more than one auto redirection.

@gailwang
Copy link
Contributor Author

gailwang commented Nov 4, 2020

kube config see this tfstate file

  "ignore_cluster_cidr_conflict": false,
                "is_non_static_ip_mode": false,
                "kube_config": "apiVersion: v1\nclusters:\n- cluster:\n    certificate-authority-data: L
                "kube_proxy_mode": ""

region by default see this tfstate file

    {
      "mode": "data",
      "type": "tencentcloud_availability_regions",
      "name": "my_favourite_region",
      "provider": "provider.tencentcloud",
      "instances": [
        {
          "schema_version": 0,
          "attributes": {
            "id": "4152970696",
            "include_unavailable": null,
            "name": "default",
            "regions": [
              {
                "description": "ap-guangzhou",
                "name": "ap-guangzhou",
                "state": "AVAILABLE"
              }
            ],
            "result_output_file": null
          }
        }
      ]

clb redirection see this
before
企业微信截图_16044888783861
企业微信截图_16044888833894

after
企业微信截图_16044939804649
企业微信截图_1604494010832

tlinux and iptables support see this

image

mount target and docker graph path see the code

@gailwang
Copy link
Contributor Author

gailwang commented Nov 4, 2020

redis update mem size see this

type = 8

terraform apply
2020/11/04 21:27:32 [WARN] Log levels other than TRACE are currently unreliable, and are supported only for backward compatibility.
  Use TF_LOG=TRACE to see Terraform's internal logs.
  ----
data.tencentcloud_clb_instances.foo: Refreshing state...
data.tencentcloud_availability_regions.my_favourite_region: Refreshing state...
data.tencentcloud_redis_zone_config.zone: Refreshing state...
tencentcloud_redis_instance.redis_instance_test_2: Refreshing state... [id=crs-qb8lbw5o]

An execution plan has been generated and is shown below.
Resource actions are indicated with the following symbols:
  ~ update in-place

Terraform will perform the following actions:

  # tencentcloud_redis_instance.redis_instance_test_2 will be updated in-place
  ~ resource "tencentcloud_redis_instance" "redis_instance_test_2" {
        availability_zone  = "ap-guangzhou-3"
        charge_type        = "POSTPAID"
        create_time        = "2020-11-04 21:26:55"
        force_delete       = false
        id                 = "crs-qb8lbw5o"
        ip                 = "10.66.170.110"
      ~ mem_size           = 2048 -> 8192
        name               = "terrform_test"
        password           = (sensitive value)
        port               = 6379
        project_id         = 0
        redis_replicas_num = 1
        redis_shard_num    = 1
        status             = "online"
        tags               = {}
        type_id            = 8
    }

Plan: 0 to add, 1 to change, 0 to destroy.

Do you want to perform these actions?
  Terraform will perform the actions described above.
  Only 'yes' will be accepted to approve.

  Enter a value: yes

tencentcloud_redis_instance.redis_instance_test_2: Modifying... [id=crs-qb8lbw5o]
tencentcloud_redis_instance.redis_instance_test_2: Still modifying... [id=crs-qb8lbw5o, 10s elapsed]
tencentcloud_redis_instance.redis_instance_test_2: Still modifying... [id=crs-qb8lbw5o, 20s elapsed]
tencentcloud_redis_instance.redis_instance_test_2: Still modifying... [id=crs-qb8lbw5o, 30s elapsed]
tencentcloud_redis_instance.redis_instance_test_2: Still modifying... [id=crs-qb8lbw5o, 40s elapsed]
tencentcloud_redis_instance.redis_instance_test_2: Still modifying... [id=crs-qb8lbw5o, 50s elapsed]
tencentcloud_redis_instance.redis_instance_test_2: Still modifying... [id=crs-qb8lbw5o, 1m0s elapsed]
tencentcloud_redis_instance.redis_instance_test_2: Still modifying... [id=crs-qb8lbw5o, 1m10s elapsed]
tencentcloud_redis_instance.redis_instance_test_2: Still modifying... [id=crs-qb8lbw5o, 1m20s elapsed]
tencentcloud_redis_instance.redis_instance_test_2: Still modifying... [id=crs-qb8lbw5o, 1m30s elapsed]
tencentcloud_redis_instance.redis_instance_test_2: Still modifying... [id=crs-qb8lbw5o, 1m41s elapsed]
tencentcloud_redis_instance.redis_instance_test_2: Still modifying... [id=crs-qb8lbw5o, 1m51s elapsed]
tencentcloud_redis_instance.redis_instance_test_2: Still modifying... [id=crs-qb8lbw5o, 2m1s elapsed]
tencentcloud_redis_instance.redis_instance_test_2: Still modifying... [id=crs-qb8lbw5o, 2m11s elapsed]
tencentcloud_redis_instance.redis_instance_test_2: Still modifying... [id=crs-qb8lbw5o, 2m21s elapsed]
tencentcloud_redis_instance.redis_instance_test_2: Still modifying... [id=crs-qb8lbw5o, 2m31s elapsed]
tencentcloud_redis_instance.redis_instance_test_2: Modifications complete after 2m31s [id=crs-qb8lbw5o]

Apply complete! Resources: 0 added, 1 changed, 0 destroyed.

type = 2

terraform apply
2020/11/04 21:24:27 [WARN] Log levels other than TRACE are currently unreliable, and are supported only for backward compatibility.
  Use TF_LOG=TRACE to see Terraform's internal logs.
  ----
data.tencentcloud_availability_regions.my_favourite_region: Refreshing state...
data.tencentcloud_redis_zone_config.zone: Refreshing state...
data.tencentcloud_clb_instances.foo: Refreshing state...
tencentcloud_redis_instance.redis_instance_test_2: Refreshing state... [id=crs-m2vhn7du]

An execution plan has been generated and is shown below.
Resource actions are indicated with the following symbols:
  ~ update in-place

Terraform will perform the following actions:

  # tencentcloud_redis_instance.redis_instance_test_2 will be updated in-place
  ~ resource "tencentcloud_redis_instance" "redis_instance_test_2" {
        availability_zone  = "ap-guangzhou-3"
        charge_type        = "POSTPAID"
        create_time        = "2020-11-04 21:22:16"
        force_delete       = false
        id                 = "crs-m2vhn7du"
        ip                 = "10.66.119.17"
      ~ mem_size           = 1024 -> 2048
        name               = "terrform_test"
        password           = (sensitive value)
        port               = 6379
        project_id         = 0
        redis_replicas_num = 1
        redis_shard_num    = 1
        status             = "online"
        tags               = {}
        type_id            = 2
    }

Plan: 0 to add, 1 to change, 0 to destroy.

Do you want to perform these actions?
  Terraform will perform the actions described above.
  Only 'yes' will be accepted to approve.

  Enter a value: yes

tencentcloud_redis_instance.redis_instance_test_2: Modifying... [id=crs-m2vhn7du]
tencentcloud_redis_instance.redis_instance_test_2: Modifications complete after 5s [id=crs-m2vhn7du]

Apply complete! Resources: 0 added, 1 changed, 0 destroyed.

@gailwang
Copy link
Contributor Author

gailwang commented Nov 4, 2020

tf file

data "tencentcloud_kubernetes_clusters" "name" {
  #examples have been created to serve other resources
  cluster_name = "ttt"
}

resource "tencentcloud_clb_redirection" "foo" {
  clb_id             = "lb-dqsss4yw"
  target_listener_id = "lbl-gp3i96rw"
  target_rule_id     = "loc-70wqxb2g"
  is_auto_rewrite    = true
  delete_all_auto_rewrite = true
}

variable "availability_zone_first" {
  default = "ap-guangzhou-3"
}

variable "availability_zone_second" {
  default = "ap-guangzhou-4"
}

variable "cluster_cidr" {
  default = "10.31.0.0/16"
}

variable "default_instance_type" {
  default = "SA2.2XLARGE16"
}

data "tencentcloud_vpc_subnets" "vpc_first" {
  is_default        = true
  availability_zone = var.availability_zone_first
}

data "tencentcloud_vpc_subnets" "vpc_second" {
  is_default        = true
  availability_zone = var.availability_zone_second
}

resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
  vpc_id                                     = data.tencentcloud_vpc_subnets.vpc_first.instance_list.0.vpc_id
  cluster_cidr                               = var.cluster_cidr
  cluster_max_pod_num                        = 32
  cluster_name                               = "test"
  cluster_desc                               = "test cluster desc"
  cluster_max_service_num                    = 32
  cluster_internet                           = true
  managed_cluster_internet_security_policies = ["3.3.3.3", "1.1.1.1"]
  cluster_deploy_type                        = "MANAGED_CLUSTER"
cluster_os = "tlinux2.4x86_64"
cluster_ipvs = false
cluster_version = "1.18.4"
mount_target = "/var/lib/docker"
	docker_graph_path = "/var/lib/docker"
  worker_config {
    count                      = 1
    availability_zone          = var.availability_zone_first
    instance_type              = var.default_instance_type
    system_disk_type           = "CLOUD_SSD"
    system_disk_size           = 60
    internet_charge_type       = "TRAFFIC_POSTPAID_BY_HOUR"
    internet_max_bandwidth_out = 100
    public_ip_assigned         = true
    subnet_id                  = data.tencentcloud_vpc_subnets.vpc_first.instance_list.0.subnet_id

    data_disk {
      disk_type = "CLOUD_PREMIUM"
      disk_size = 50
    }

	
    enhanced_security_service = false
    enhanced_monitor_service  = false
    user_data                 = "dGVzdA=="
    password                  = "ZZXXccvv1212"
  }

  worker_config {
    count                      = 1
    availability_zone          = var.availability_zone_second
    instance_type              = var.default_instance_type
    system_disk_type           = "CLOUD_SSD"
    system_disk_size           = 60
    internet_charge_type       = "TRAFFIC_POSTPAID_BY_HOUR"
    internet_max_bandwidth_out = 100
    public_ip_assigned         = true
    subnet_id                  = data.tencentcloud_vpc_subnets.vpc_second.instance_list.0.subnet_id

    data_disk {
      disk_type = "CLOUD_PREMIUM"
      disk_size = 50
    }

    enhanced_security_service = false
    enhanced_monitor_service  = false
    user_data                 = "dGVzdA=="
    password                  = "ZZXXccvv1212"
	cam_role_name			  = "CVM_QcsRole"
  }

  labels = {
    "test1" = "test1",
    "test2" = "test2",
  }
}



@oliverpei oliverpei merged commit e455cc2 into tencentcloudstack:master Nov 5, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants