Skip to content

fix: sync k8s versions and root disk defaults #79

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.

Sign up for GitHub

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
st-yclee merged 1 commit into from
Oct 3, 2026
Merged

fix: sync k8s versions and root disk defaults #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ K8s defaults are separate from VM defaults. An empty image ID (`""`) for Azure,
| K8s Spec | `alibaba+ap-northeast-2+ecs.c9i.xlarge` / `ecs.c9i.xlarge` | `aws+ap-northeast-2+c8i.xlarge` / `c8i.xlarge` | `azure+koreacentral+Standard_D4ls_v6` / `Standard_D4ls_v6` | `gcp+asia-northeast3+c3-highcpu-4` / `c3-highcpu-4` | `ibm+jp-tok+cx2-4x8` / `cx2-4x8` | Not yet | `ncp+kr+c4-g3` / `c4-g3` | `nhn+kr1+m2.c4m8` / `m2.c4m8` | Not Support | `tencent+ap-seoul+S5.LARGE8` / `S5.LARGE8` |
| K8s Image | `Ubuntu` | `AL2023_x86_64_STANDARD` | `""` (provider-managed) | `UBUNTU_CONTAINERD` | `""` (provider-managed) | Not yet | `""` (provider-managed) | `107cc02d-02d8-44fd-84d6-6c316045b817` | Not Support | `ubuntu22.04x86_64` |
| K8s Zone | `ap-northeast-2a` | `ap-northeast-2a` | `1` | `asia-northeast3-a` | `jp-tok-1` | Not yet | `KR-1` | `kr-pub-a` | Not Support | `ap-seoul-1` |
| K8s Version | `1.35.7-aliyun.1` | `1.35` | `1.35.7` | `1.34.10-gke.1236000` | `1.35.7` | Not yet | `1.34.3-nks.1` | `v1.34.3` | Not Support | `1.34.1` |
| K8s Version | `1.35.7-aliyun.1` | `1.35` | `1.35.7` | `1.35.6-gke.1250000` | `1.35.7` | Not yet | `1.35.3-nks.2` | `v1.35.5` | Not Support | `1.34.1` |

## Requirements

Expand Down
10 changes: 5 additions & 5 deletions src/main/java/kr/co/mcmp/workflowStage/dto/WorkflowStageDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ private static List<WorkflowParamDto> defaultParamsFor(String stageName) {
param("K8S_MIN_NODE_SIZE", "1"),
param("K8S_MAX_NODE_SIZE", "3"),
param("ROOT_DISK_TYPE", "default"),
param("ROOT_DISK_SIZE", "30"),
param("ROOT_DISK_SIZE", "40"),
param("K8S_CREATE_OPTION", ""),
param("K8S_NODEGROUP_CREATE_IF_MISSING", "true"),
param("K8S_STATUS_MAX_ATTEMPTS", "60"),
Expand Down Expand Up @@ -428,7 +428,7 @@ private static List<WorkflowParamDto> multiCspK8sParams() {
param("K8S_MIN_NODE_SIZE", "1"),
param("K8S_MAX_NODE_SIZE", "3"),
param("ROOT_DISK_TYPE", "default"),
param("ROOT_DISK_SIZE", "30"),
param("ROOT_DISK_SIZE", "40"),
param("K8S_CREATE_OPTION", ""),
param("K8S_STATUS_MAX_ATTEMPTS", "360"),
param("K8S_STATUS_INTERVAL_SECONDS", "10"),
Expand All @@ -441,13 +441,13 @@ private static List<WorkflowParamDto> multiCspK8sParams() {
addCspK8sParams(result, "AZURE", "koreacentral", "azure-koreacentral", "1",
"azure+koreacentral+Standard_D4ls_v6", "", "1.35.7");
addCspK8sParams(result, "GCP", "asia-northeast3", "gcp-asia-northeast3", "asia-northeast3-a",
"gcp+asia-northeast3+c3-highcpu-4", "UBUNTU_CONTAINERD", "1.34.10-gke.1236000");
"gcp+asia-northeast3+c3-highcpu-4", "UBUNTU_CONTAINERD", "1.35.6-gke.1250000");
addCspK8sParams(result, "IBM", "jp-tok", "ibm-jp-tok", "jp-tok-1",
"ibm+jp-tok+cx2-4x8", "", "1.35.7");
addCspK8sParams(result, "NCP", "kr", "ncp-kr", "KR-1",
"ncp+kr+c4-g3", "", "1.34.3-nks.1");
"ncp+kr+c4-g3", "", "1.35.3-nks.2");
addCspK8sParams(result, "NHN", "kr1", "nhn-kr1", "kr-pub-a",
"nhn+kr1+m2.c4m8", "107cc02d-02d8-44fd-84d6-6c316045b817", "v1.34.3");
"nhn+kr1+m2.c4m8", "107cc02d-02d8-44fd-84d6-6c316045b817", "v1.35.5");
addCspK8sParams(result, "TENCENT", "ap-seoul", "tencent-ap-seoul", "ap-seoul-1",
"tencent+ap-seoul+S5.LARGE8", "ubuntu22.04x86_64", "1.34.1");
return result;
Expand Down
45 changes: 34 additions & 11 deletions src/main/resources/import.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ INSERT INTO workflow_stage (workflow_stage_idx, workflow_stage_type_idx, workflo
"connectionName": "gcp-asia-northeast3", \
"name": "${CLUSTER}", \
"nodeGroupName": "k8sng03", \
"version": "1.34.10-gke.1236000" \
"version": "1.35.6-gke.1250000" \
}"""
} else if (CPS == "aws") {
call_tumblebug_create_cluster_payload = """{ \
Expand Down Expand Up @@ -1207,6 +1207,14 @@ INSERT INTO workflow_stage (workflow_stage_idx, workflow_stage_type_idx, workflo
}
return diskType
}
def resolveK8sRootDiskSize = { csp ->
def diskSize = (params.ROOT_DISK_SIZE ?: "40").toInteger()
if (csp?.equalsIgnoreCase("ncp") && diskSize < 100) {
echo "NCP NKS root disk size ${diskSize}GB is below the KVM minimum. Use 100GB."
return 100
}
return diskSize
}
if (!payload) {
def provider = params.CSP ?: params.PROVIDER ?: ""
def region = params.REGION ?: ""
Expand Down Expand Up @@ -1234,7 +1242,7 @@ INSERT INTO workflow_stage (workflow_stage_idx, workflow_stage_type_idx, workflo
minNodeSize: minNodeSize,
maxNodeSize: maxNodeSize,
rootDiskType: rootDiskType,
rootDiskSize: (params.ROOT_DISK_SIZE ?: "30").toInteger()
rootDiskSize: resolveK8sRootDiskSize(provider)
]
if (imageId) {
payloadMap.imageId = imageId
Expand Down Expand Up @@ -1412,7 +1420,7 @@ INSERT INTO workflow_stage (workflow_stage_idx, workflow_stage_type_idx, workflo
minNodeSize: minNodeSize,
maxNodeSize: maxNodeSize,
rootDiskType: nodeGroupRootDiskType,
rootDiskSize: (params.ROOT_DISK_SIZE ?: "30").toInteger()
rootDiskSize: resolveK8sRootDiskSize(params.CSP ?: params.PROVIDER ?: "")
]
if (params.IMAGE_ID?.trim()) {
nodeGroupMap.imageId = params.IMAGE_ID.trim()
Expand Down Expand Up @@ -1526,6 +1534,11 @@ INSERT INTO workflow_stage (workflow_stage_idx, workflow_stage_type_idx, workflo
if (provider?.equalsIgnoreCase("alibaba") && rootDiskType.equalsIgnoreCase("default")) {
rootDiskType = "cloud_essd"
}
def rootDiskSize = (params.ROOT_DISK_SIZE ?: "40").toInteger()
if (provider?.equalsIgnoreCase("ncp") && rootDiskSize < 100) {
echo "NCP NKS root disk size ${rootDiskSize}GB is below the KVM minimum. Use 100GB."
rootDiskSize = 100
}
def usesProviderManagedK8sImage = provider?.equalsIgnoreCase("azure") || provider?.equalsIgnoreCase("ibm") || provider?.equalsIgnoreCase("ncp") || provider?.equalsIgnoreCase("tencent")
if (!params.SPEC_ID?.trim()) {
error "SPEC_ID is required"
Expand All @@ -1541,7 +1554,7 @@ INSERT INTO workflow_stage (workflow_stage_idx, workflow_stage_type_idx, workflo
minNodeSize: (params.K8S_MIN_NODE_SIZE ?: "1").toInteger(),
maxNodeSize: (params.K8S_MAX_NODE_SIZE ?: "3").toInteger(),
rootDiskType: rootDiskType,
rootDiskSize: (params.ROOT_DISK_SIZE ?: "30").toInteger()
rootDiskSize: rootDiskSize
]
if (imageId) {
payloadMap.imageId = imageId
Expand Down Expand Up @@ -1746,6 +1759,11 @@ INSERT INTO workflow_stage (workflow_stage_idx, workflow_stage_type_idx, workflo
if (csp?.equalsIgnoreCase("alibaba") && rootDiskType.equalsIgnoreCase("default")) {
rootDiskType = "cloud_essd"
}
def rootDiskSize = (params.ROOT_DISK_SIZE ?: "40").toInteger()
if (csp?.equalsIgnoreCase("ncp") && rootDiskSize < 100) {
echo "NCP NKS root disk size ${rootDiskSize}GB is below the KVM minimum. Use 100GB."
rootDiskSize = 100
}
def usesProviderManagedK8sImage = csp?.equalsIgnoreCase("azure") || csp?.equalsIgnoreCase("ibm") || csp?.equalsIgnoreCase("ncp") || csp?.equalsIgnoreCase("tencent")
if (!specId) {
error "SPEC_ID is required for ${csp}"
Expand All @@ -1768,7 +1786,7 @@ INSERT INTO workflow_stage (workflow_stage_idx, workflow_stage_type_idx, workflo
minNodeSize: (params.K8S_MIN_NODE_SIZE ?: "1").toInteger(),
maxNodeSize: (params.K8S_MAX_NODE_SIZE ?: "3").toInteger(),
rootDiskType: rootDiskType,
rootDiskSize: (params.ROOT_DISK_SIZE ?: "30").toInteger()
rootDiskSize: rootDiskSize
]
if (imageId) {
payloadMap.imageId = imageId
Expand Down Expand Up @@ -4738,6 +4756,11 @@ pipeline {
if (csp?.equalsIgnoreCase("alibaba") && rootDiskType.equalsIgnoreCase("default")) {
rootDiskType = "cloud_essd"
}
def rootDiskSize = (params.ROOT_DISK_SIZE ?: "40").toInteger()
if (csp?.equalsIgnoreCase("ncp") && rootDiskSize < 100) {
echo "NCP NKS root disk size ${rootDiskSize}GB is below the KVM minimum. Use 100GB."
rootDiskSize = 100
}
def usesProviderManagedK8sImage = csp?.equalsIgnoreCase("azure") || csp?.equalsIgnoreCase("ibm") || csp?.equalsIgnoreCase("ncp") || csp?.equalsIgnoreCase("tencent")
if (!specId) {
error "SPEC_ID is required for ${csp}"
Expand All @@ -4760,7 +4783,7 @@ pipeline {
minNodeSize: (params.K8S_MIN_NODE_SIZE ?: "1").toInteger(),
maxNodeSize: (params.K8S_MAX_NODE_SIZE ?: "3").toInteger(),
rootDiskType: rootDiskType,
rootDiskSize: (params.ROOT_DISK_SIZE ?: "30").toInteger()
rootDiskSize: rootDiskSize
]
if (imageId) {
payloadMap.imageId = imageId
Expand Down Expand Up @@ -5007,7 +5030,7 @@ INSERT INTO workflow_param (workflow_idx, param_key, param_value, event_listener
(103, 'K8S_MIN_NODE_SIZE', '1', 'N'),
(103, 'K8S_MAX_NODE_SIZE', '3', 'N'),
(103, 'ROOT_DISK_TYPE', 'default', 'N'),
(103, 'ROOT_DISK_SIZE', '30', 'N'),
(103, 'ROOT_DISK_SIZE', '40', 'N'),
(103, 'K8S_CREATE_OPTION', '', 'N'),
(103, 'K8S_NODEGROUP_CREATE_IF_MISSING', 'true', 'N'),
(103, 'K8S_STATUS_MAX_ATTEMPTS', '60', 'N'),
Expand Down Expand Up @@ -5052,7 +5075,7 @@ INSERT INTO workflow_param (workflow_idx, param_key, param_value, event_listener
(104, 'K8S_MIN_NODE_SIZE', '1', 'N'),
(104, 'K8S_MAX_NODE_SIZE', '3', 'N'),
(104, 'ROOT_DISK_TYPE', 'default', 'N'),
(104, 'ROOT_DISK_SIZE', '30', 'N'),
(104, 'ROOT_DISK_SIZE', '40', 'N'),
(104, 'K8S_CREATE_OPTION', '', 'N'),
(104, 'K8S_STATUS_MAX_ATTEMPTS', '360', 'N'),
(104, 'K8S_STATUS_INTERVAL_SECONDS', '10', 'N'),
Expand Down Expand Up @@ -5080,7 +5103,7 @@ INSERT INTO workflow_param (workflow_idx, param_key, param_value, event_listener
(104, 'GCP_ZONE', 'asia-northeast3-a', 'N'),
(104, 'GCP_SPEC_ID', 'gcp+asia-northeast3+c3-highcpu-4', 'N'),
(104, 'GCP_IMAGE_ID', 'UBUNTU_CONTAINERD', 'N'),
(104, 'GCP_K8S_VERSION', '1.34.10-gke.1236000', 'N'),
(104, 'GCP_K8S_VERSION', '1.35.6-gke.1250000', 'N'),
(104, 'IBM_REGION', 'jp-tok', 'N'),
(104, 'IBM_CONNECTION_NAME', 'ibm-jp-tok', 'N'),
(104, 'IBM_ZONE', 'jp-tok-1', 'N'),
Expand All @@ -5092,13 +5115,13 @@ INSERT INTO workflow_param (workflow_idx, param_key, param_value, event_listener
(104, 'NCP_ZONE', 'KR-1', 'N'),
(104, 'NCP_SPEC_ID', 'ncp+kr+c4-g3', 'N'),
(104, 'NCP_IMAGE_ID', '', 'N'),
(104, 'NCP_K8S_VERSION', '1.34.3-nks.1', 'N'),
(104, 'NCP_K8S_VERSION', '1.35.3-nks.2', 'N'),
(104, 'NHN_REGION', 'kr1', 'N'),
(104, 'NHN_CONNECTION_NAME', 'nhn-kr1', 'N'),
(104, 'NHN_ZONE', 'kr-pub-a', 'N'),
(104, 'NHN_SPEC_ID', 'nhn+kr1+m2.c4m8', 'N'),
(104, 'NHN_IMAGE_ID', '107cc02d-02d8-44fd-84d6-6c316045b817', 'N'),
(104, 'NHN_K8S_VERSION', 'v1.34.3', 'N'),
(104, 'NHN_K8S_VERSION', 'v1.35.5', 'N'),
(104, 'TENCENT_REGION', 'ap-seoul', 'N'),
(104, 'TENCENT_CONNECTION_NAME', 'tencent-ap-seoul', 'N'),
(104, 'TENCENT_ZONE', 'ap-seoul-1', 'N'),
Expand Down
Loading
Loading