From a011bb897b65bb5fccad977dffa3914db6b8da3c Mon Sep 17 00:00:00 2001 From: Seokho Son Date: Wed, 23 Sep 2026 15:42:19 +0900 Subject: [PATCH] Apply CB-TB v0.13.4 Signed-off-by: Seokho Son --- .../assets/k8sclusterinfo.yaml | 50 ++++++++++++++----- .../mc-infra-manager/assets/rdbmsinfo.yaml | 8 ++- .../mc-infra-manager/conf/cloud_conf.yaml | 4 +- conf/docker/docker-compose.yaml | 9 ++-- 4 files changed, 51 insertions(+), 20 deletions(-) diff --git a/conf/docker/conf/mc-infra-manager/assets/k8sclusterinfo.yaml b/conf/docker/conf/mc-infra-manager/assets/k8sclusterinfo.yaml index 6c12f0e0..ecdb7a64 100644 --- a/conf/docker/conf/mc-infra-manager/assets/k8sclusterinfo.yaml +++ b/conf/docker/conf/mc-infra-manager/assets/k8sclusterinfo.yaml @@ -13,6 +13,14 @@ # - name: "1.30" [available version name (use double quotes)] # id: "1.30" [available version name (use double quotes)] # nodeGroupNamingRule: [regular expression or no restriction if empty] +# initialNodeGroupManagedByCluster: [true/false, default false] +# The node group created together with the cluster is lifecycle-bound to it and +# cannot be deleted independently via the node group API. +# autoScalingOffNodeSize: [{min: N, max: N}, default none] +# The node-size floor the CSP still demands while autoscaling is disabled. +# Most CSPs ignore Min/Max in that state - omit the key for those. Some even reject +# a non-zero MinNodeSize when autoscaling is off, so never set min unless the CSP +# demands it. A field left out keeps the value the client requested. # k8scluster: @@ -113,20 +121,17 @@ k8scluster: initialNodeGroupManagedByCluster: true version: # ServiceUnavailable or NotSupportedSLB - - region: [me-east-1, cn-zhangjiakou, cn-hangzhou, cn-shenzhen, cn-chengdu, ap-south-1, ap-sourtheast-2] + - region: [me-east-1, cn-zhangjiakou, cn-hangzhou, cn-shenzhen, cn-chengdu, ap-south-1, ap-southeast-2] # ap-northeast-1,ap-northeast-2,ap-southeast-1,ap-southeast-3,ap-southeast-5,us-west-1,us-east-1,eu-central-1,eu-west-1,cn-beijing,cn-hongkong,cn-shanghai,cn-huhehaote,cn-heyuan,cn-wulanchabu,cn-guangzhou - region: [common] + # Verified against ap-northeast-2 on 2026-09-14 (allowed: 1.36.2 / 1.35.7 / 1.34.10). available: + - name: "1.36" + id: "1.36.2-aliyun.1" - name: "1.35" - id: "1.35.2-aliyun.1" + id: "1.35.7-aliyun.1" - name: "1.34" - id: "1.34.3-aliyun.1" - - name: "1.33" - id: "1.33.3-aliyun.1" - - name: "1.32" - id: "1.32.7-aliyun.1" - - name: "1.31" - id: "1.31.9-aliyun.1" + id: "1.34.10-aliyun.1" rootDisk: - region: [common] type: @@ -136,6 +141,10 @@ k8scluster: min: 10 max: 40 nhn: + # CSP constraint: the NKS nodegroup API rejects max_node_count 0 (verified 2026-09-10, + # HTTP 400 "Value should be greater or equal to 1"). Min stays unset because the + # CB-Spider driver rejects a non-zero Min while autoscaling is off. + autoScalingOffNodeSize: {max: 1} nodeGroupsOnCreation: true nodeImageDesignation: true requiredSubnetCount: 1 @@ -161,6 +170,14 @@ k8scluster: nodeImageDesignation: true requiredSubnetCount: 1 initialNodeGroupManagedByCluster: true + # Not a CSP constraint: TKE itself accepts MinSize 0 - its CreateClusterNodePool reference + # uses "MinSize":0 in the request example + # (https://intl.cloud.tencent.com/document/product/457/38781). The floor exists only + # because validateAtAddNodeGroup in the CB-Spider driver rejects anything below 1, while + # the driver forwards Min/Max/Desired to TKE as AutoScalingGroup parameters regardless of + # EnableAutoscale. Drop this once that check is fixed upstream. Nothing scales while + # autoscaling is off, so max needs no headroom. + autoScalingOffNodeSize: {min: 1, max: 1} version: # ServiceUnavailable - region: [ap-mumbai, eu-moscow, na-toronto] @@ -202,18 +219,25 @@ k8scluster: min: 10 max: 40 ibm: + # Not a CSP constraint: the driver only sends Min/Max to IKS inside its + # `if OnAutoScaling` branch, so IKS never sees them while autoscaling is off. The floor + # exists solely because validateAtCreateCluster/validateAtAddNodeGroup reject anything + # below 1 with no OnAutoScaling guard. Drop this once that check is fixed upstream. + autoScalingOffNodeSize: {min: 1, max: 1} nodeGroupsOnCreation: true nodeImageDesignation: false requiredSubnetCount: 1 version: - region: [common] - available: # Updated: 2026-06-12 + available: # Updated: 2026-09-14 + - name: "1.36" + id: "1.36.3" - name: "1.35" - id: "1.35.5" + id: "1.35.7" - name: "1.34" - id: "1.34.8" + id: "1.34.10" - name: "1.33" - id: "1.33.12" + id: "1.33.13" rootDisk: - region: [common] type: diff --git a/conf/docker/conf/mc-infra-manager/assets/rdbmsinfo.yaml b/conf/docker/conf/mc-infra-manager/assets/rdbmsinfo.yaml index 8a28ede2..5236553f 100644 --- a/conf/docker/conf/mc-infra-manager/assets/rdbmsinfo.yaml +++ b/conf/docker/conf/mc-infra-manager/assets/rdbmsinfo.yaml @@ -267,8 +267,8 @@ dbms: storageTypeSelectable: true storageTypes: cloud_auto: - name: Auto-selected Storage Type - description: Alibaba Cloud automatically selects the optimal storage type based on region and instance specification. Recommended for simplicity. + name: Auto-selected Storage Type (SSD) + description: Alibaba Cloud automatically selects optimal SSD storage (General ESSD / PL1) based on region and instance specification. Recommended for simplicity. recommendationLevel: recommended requiresIops: false minStorageSize: 20 @@ -476,6 +476,8 @@ dbms: name: SSD (automatic) description: "NCP G3 automatically applies SSD storage (starts at 10GB and auto-scales by 10GB increments up to 6000GB). Storage size and type are not user-configurable." recommendationLevel: standard + minStorageSize: 10 + maxStorageSize: 6000 note: "Verified: 2026-08-03 (Spider storage-type-test SKIP). NCP G3 applies SSD automatically; storage type cannot be specified." dbmsRequirements: @@ -529,6 +531,7 @@ dbms: recommendationLevel: standard requiresIops: false minStorageSize: 20 + maxStorageSize: 2048 note: "Verified: 2026-08-03 (Spider storage-type-test, elapsed 10m7s)" General_SSD: @@ -537,6 +540,7 @@ dbms: recommendationLevel: recommended requiresIops: false minStorageSize: 20 + maxStorageSize: 2048 note: "Verified: 2026-08-03 (Spider storage-type-test, elapsed 11m7s)" dbmsRequirements: diff --git a/conf/docker/conf/mc-infra-manager/conf/cloud_conf.yaml b/conf/docker/conf/mc-infra-manager/conf/cloud_conf.yaml index a4003c2f..5d6ed1a8 100644 --- a/conf/docker/conf/mc-infra-manager/conf/cloud_conf.yaml +++ b/conf/docker/conf/mc-infra-manager/conf/cloud_conf.yaml @@ -100,6 +100,6 @@ nlbsw: commandNlbDeploy: "sudo ~/deployNlb.sh" commandNlbAddTargetNode: "sudo ~/addTargetNode.sh" commandNlbApplyConfig: "sudo ~/applyConfig.sh" - nlbInfraSpecId: "aws-ap-northeast-2-t2-small" - nlbInfraImageId: "ubuntu18.04" + nlbInfraSpecId: "aws+ap-northeast-2+t2.small" + nlbInfraImageId: "ubuntu 22.04" nlbInfraNodeGroupSize: 2 diff --git a/conf/docker/docker-compose.yaml b/conf/docker/docker-compose.yaml index 1d2f1faa..d9abf061 100644 --- a/conf/docker/docker-compose.yaml +++ b/conf/docker/docker-compose.yaml @@ -23,7 +23,7 @@ services: ##### MC-INFRA-CONNECTOR ######################################################################################################################### mc-infra-connector: - image: cloudbaristaorg/cb-spider:0.13.2 + image: cloudbaristaorg/cb-spider:0.13.9 pull_policy: missing container_name: mc-infra-connector restart: unless-stopped @@ -83,7 +83,7 @@ services: ##### MC-INFRA-MANAGER ######################################################################################################################### mc-infra-manager: - image: cloudbaristaorg/cb-tumblebug:0.13.2 + image: cloudbaristaorg/cb-tumblebug:0.13.4 container_name: mc-infra-manager restart: unless-stopped pull_policy: missing @@ -193,6 +193,9 @@ services: - stderr - --auth-token - simple + - --quota-backend-bytes=8589934592 + - --auto-compaction-mode=periodic + - --auto-compaction-retention=1h healthcheck: test: [ "CMD", "etcdctl", "endpoint", "health", "--endpoints=http://localhost:2379"] <<: *default-health-check @@ -254,7 +257,7 @@ services: # CB-MapUI is a Web-based test client (disable it for production use) cb-mapui: - image: cloudbaristaorg/cb-mapui:0.13.6 + image: cloudbaristaorg/cb-mapui:0.13.11 container_name: cb-mapui networks: - mc-infra-manager-network