Skip to content

Commit

Permalink
Merge pull request #1564 from sykim-etri/update-conf-env-for-alibaba
Browse files Browse the repository at this point in the history 
Update conf.env for alibaba
  • Loading branch information
@seokho-son
seokho-son committed May 14, 2024
2 parents 04fdf24 + 8ccbd06 commit de9aaa1
Showing 1 changed file with 56 additions and 8 deletions.
64 changes: 56 additions & 8 deletions src/testclient/scripts/conf.env
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ ProviderName[$IX]=ALIBABA
DriverLibFileName[$IX]=alibaba-driver-v1.0.so
DriverName[$IX]=alibaba-driver01
ClusterType[$IX]=type1
CommonImage[$IX]=ubuntu_22_04_x64_20G_alibase_20240220.vhd
CommonImage[$IX]=ubuntu_22_04_x64_20G_alibase_20240322.vhd
CommonImageType[$IX]="Ubuntu 22.04"
# optional
CommonImage02[$IX]=${CommonImage[$IX]}
Expand All @@ -316,13 +316,13 @@ CommonSpec[$IX]=ecs.g7.large
# AlibabaCnQingdao AlibabaCnZhangjiakou AlibabaCnHuhehaote AlibabaApSoutheast5 AlibabaCnChengdu
CommonSpec02[$IX]=ecs.g6.large
# AlibabaMeEast1
CommonSpec03[$IX]=ecs.sn2.medium
CommonSpec03[$IX]=ecs.g6.large
# AlibabaCnGuangzhou
CommonSpec04[$IX]=ecs.g7a.large
# AlibabaApNortheast1 AlibabaApNortheast2
CommonSpec05[$IX]=ecs.g6e.large
# for K8s Cluster
CommonSpec06[$IX]=ecs.g6e.xlarge
CommonSpec06[$IX]=ecs.hfr6.xlarge

# most of alibaba specs use cloud_essd type
CommonDiskType[$IX]=cloud_essd
Expand All @@ -332,11 +332,11 @@ CommonDiskSize[$IX]=40
CommonDiskType02[$IX]=cloud_ssd
CommonDiskSize02[$IX]=40

CommonK8sVersion[$IX]=1.26.3-aliyun.1 # 1.24.6-aliyun.1 1.26.3-aliyun.1 1.28.3-aliyun.1
CommonK8sUpgradeVersion[$IX]=1.28.3-aliyun.1 # 1.24.6-aliyun.1 1.26.3-aliyun.1 1.28.3-aliyun.1
K8sCreateType[$IX]=type1

CommonK8sVersion[$IX]=1.26.15-aliyun.1 # 1.24.6-aliyun.1 1.26.15-aliyun.1 1.28.9-aliyun.1
CommonK8sUpgradeVersion[$IX]=1.28.9-aliyun.1 # 1.24.6-aliyun.1 1.26.15-aliyun.1 1.28.9-aliyun.1

CommonImageTypeContainerAlibabaCloudLinux3[$IX]="Alibaba Cloud Linux 3.2104 LTS 64 bit"
CommonImageNameContainerAlibabaCloudLinux3[$IX]="aliyun_3_9_x64_20G_alibase_20231219.vhd"

# region01
IY=$AlibabaApNortheast1
Expand All @@ -351,6 +351,8 @@ DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]}
DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]}
K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]}
K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]}
CONTAINER_IMAGE_NAME[$IX,$IY]=${CommonImageNameContainerAlibabaCloudLinux3[$IX]}
CONTAINER_IMAGE_TYPE[$IX,$IY]=${CommonImageTypeContainerAlibabaCloudLinux3[$IX]}

# region02
IY=$AlibabaApSouth1
Expand All @@ -365,6 +367,8 @@ DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]}
DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]}
K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]}
K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]}
CONTAINER_IMAGE_NAME[$IX,$IY]=${CommonImageNameContainerAlibabaCloudLinux3[$IX]}
CONTAINER_IMAGE_TYPE[$IX,$IY]=${CommonImageTypeContainerAlibabaCloudLinux3[$IX]}

# region03
IY=$AlibabaApSoutheast1
Expand All @@ -379,6 +383,8 @@ DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]}
DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]}
K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]}
K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]}
CONTAINER_IMAGE_NAME[$IX,$IY]=${CommonImageNameContainerAlibabaCloudLinux3[$IX]}
CONTAINER_IMAGE_TYPE[$IX,$IY]=${CommonImageTypeContainerAlibabaCloudLinux3[$IX]}

# region04
IY=$AlibabaApSoutheast2
Expand All @@ -393,6 +399,8 @@ DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]}
DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]}
K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]}
K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]}
CONTAINER_IMAGE_NAME[$IX,$IY]=${CommonImageNameContainerAlibabaCloudLinux3[$IX]}
CONTAINER_IMAGE_TYPE[$IX,$IY]=${CommonImageTypeContainerAlibabaCloudLinux3[$IX]}

# region05
IY=$AlibabaApSoutheast3
Expand All @@ -407,6 +415,8 @@ DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]}
DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]}
K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]}
K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]}
CONTAINER_IMAGE_NAME[$IX,$IY]=${CommonImageNameContainerAlibabaCloudLinux3[$IX]}
CONTAINER_IMAGE_TYPE[$IX,$IY]=${CommonImageTypeContainerAlibabaCloudLinux3[$IX]}

# region06
IY=$AlibabaApSoutheast5
Expand All @@ -421,6 +431,8 @@ DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]}
DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]}
K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]}
K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]}
CONTAINER_IMAGE_NAME[$IX,$IY]=${CommonImageNameContainerAlibabaCloudLinux3[$IX]}
CONTAINER_IMAGE_TYPE[$IX,$IY]=${CommonImageTypeContainerAlibabaCloudLinux3[$IX]}

# region07
IY=$AlibabaUsWest1
Expand All @@ -435,6 +447,8 @@ DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]}
DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]}
K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]}
K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]}
CONTAINER_IMAGE_NAME[$IX,$IY]=${CommonImageNameContainerAlibabaCloudLinux3[$IX]}
CONTAINER_IMAGE_TYPE[$IX,$IY]=${CommonImageTypeContainerAlibabaCloudLinux3[$IX]}

# region08
IY=$AlibabaUsEast1
Expand All @@ -449,6 +463,8 @@ DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]}
DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]}
K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]}
K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]}
CONTAINER_IMAGE_NAME[$IX,$IY]=${CommonImageNameContainerAlibabaCloudLinux3[$IX]}
CONTAINER_IMAGE_TYPE[$IX,$IY]=${CommonImageTypeContainerAlibabaCloudLinux3[$IX]}

# region09
IY=$AlibabaEuCentral1
Expand All @@ -463,6 +479,8 @@ DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]}
DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]}
K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]}
K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]}
CONTAINER_IMAGE_NAME[$IX,$IY]=${CommonImageNameContainerAlibabaCloudLinux3[$IX]}
CONTAINER_IMAGE_TYPE[$IX,$IY]=${CommonImageTypeContainerAlibabaCloudLinux3[$IX]}

# region10
IY=$AlibabaEuWest1
Expand All @@ -477,6 +495,8 @@ DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]}
DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]}
K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]}
K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]}
CONTAINER_IMAGE_NAME[$IX,$IY]=${CommonImageNameContainerAlibabaCloudLinux3[$IX]}
CONTAINER_IMAGE_TYPE[$IX,$IY]=${CommonImageTypeContainerAlibabaCloudLinux3[$IX]}

# region11
IY=$AlibabaMeEast1
Expand All @@ -486,11 +506,13 @@ RegionNativeName[$IX,$IY]=me-east-1
CONN_CONFIG[$IX,$IY]=alibaba-me-east-1
IMAGE_NAME[$IX,$IY]=${CommonImage[$IX]}
IMAGE_TYPE[$IX,$IY]=${CommonImageType[$IX]}
SPEC_NAME[$IX,$IY]=${CommonSpec03[$IX]}
SPEC_NAME[$IX,$IY]=${CommonSpec02[$IX]}
DISK_TYPE[$IX,$IY]=${CommonDiskType02[$IX]}
DISK_SIZE[$IX,$IY]=${CommonDiskSize02[$IX]}
K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]}
K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]}
CONTAINER_IMAGE_NAME[$IX,$IY]=${CommonImageNameContainerAlibabaCloudLinux3[$IX]}
CONTAINER_IMAGE_TYPE[$IX,$IY]=${CommonImageTypeContainerAlibabaCloudLinux3[$IX]}

# region12
IY=$AlibabaCnHongkong
Expand All @@ -505,6 +527,8 @@ DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]}
DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]}
K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]}
K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]}
CONTAINER_IMAGE_NAME[$IX,$IY]=${CommonImageNameContainerAlibabaCloudLinux3[$IX]}
CONTAINER_IMAGE_TYPE[$IX,$IY]=${CommonImageTypeContainerAlibabaCloudLinux3[$IX]}

# region13
IY=$AlibabaCnShanghai
Expand All @@ -519,6 +543,8 @@ DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]}
DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]}
K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]}
K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]}
CONTAINER_IMAGE_NAME[$IX,$IY]=${CommonImageNameContainerAlibabaCloudLinux3[$IX]}
CONTAINER_IMAGE_TYPE[$IX,$IY]=${CommonImageTypeContainerAlibabaCloudLinux3[$IX]}

# region14
IY=$AlibabaCnBeijing
Expand All @@ -533,6 +559,8 @@ DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]}
DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]}
K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]}
K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]}
CONTAINER_IMAGE_NAME[$IX,$IY]=${CommonImageNameContainerAlibabaCloudLinux3[$IX]}
CONTAINER_IMAGE_TYPE[$IX,$IY]=${CommonImageTypeContainerAlibabaCloudLinux3[$IX]}

# region15
IY=$AlibabaCnQingdao
Expand All @@ -547,6 +575,8 @@ DISK_TYPE[$IX,$IY]=${CommonDiskType02[$IX]}
DISK_SIZE[$IX,$IY]=${CommonDiskSize02[$IX]}
K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]}
K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]}
CONTAINER_IMAGE_NAME[$IX,$IY]=${CommonImageNameContainerAlibabaCloudLinux3[$IX]}
CONTAINER_IMAGE_TYPE[$IX,$IY]=${CommonImageTypeContainerAlibabaCloudLinux3[$IX]}

# region16
IY=$AlibabaCnZhangjiakou
Expand All @@ -561,6 +591,8 @@ DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]}
DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]}
K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]}
K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]}
CONTAINER_IMAGE_NAME[$IX,$IY]=${CommonImageNameContainerAlibabaCloudLinux3[$IX]}
CONTAINER_IMAGE_TYPE[$IX,$IY]=${CommonImageTypeContainerAlibabaCloudLinux3[$IX]}

# region17
IY=$AlibabaCnHuhehaote
Expand All @@ -575,6 +607,8 @@ DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]}
DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]}
K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]}
K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]}
CONTAINER_IMAGE_NAME[$IX,$IY]=${CommonImageNameContainerAlibabaCloudLinux3[$IX]}
CONTAINER_IMAGE_TYPE[$IX,$IY]=${CommonImageTypeContainerAlibabaCloudLinux3[$IX]}

# region18
IY=$AlibabaCnHangzhou
Expand All @@ -589,6 +623,8 @@ DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]}
DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]}
K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]}
K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]}
CONTAINER_IMAGE_NAME[$IX,$IY]=${CommonImageNameContainerAlibabaCloudLinux3[$IX]}
CONTAINER_IMAGE_TYPE[$IX,$IY]=${CommonImageTypeContainerAlibabaCloudLinux3[$IX]}

# region19
IY=$AlibabaCnShenzhen
Expand All @@ -603,6 +639,8 @@ DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]}
DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]}
K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]}
K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]}
CONTAINER_IMAGE_NAME[$IX,$IY]=${CommonImageNameContainerAlibabaCloudLinux3[$IX]}
CONTAINER_IMAGE_TYPE[$IX,$IY]=${CommonImageTypeContainerAlibabaCloudLinux3[$IX]}

# region20
IY=$AlibabaCnHeyuan
Expand All @@ -617,6 +655,8 @@ DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]}
DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]}
K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]}
K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]}
CONTAINER_IMAGE_NAME[$IX,$IY]=${CommonImageNameContainerAlibabaCloudLinux3[$IX]}
CONTAINER_IMAGE_TYPE[$IX,$IY]=${CommonImageTypeContainerAlibabaCloudLinux3[$IX]}

# region21
IY=$AlibabaCnChengdu
Expand All @@ -631,6 +671,8 @@ DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]}
DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]}
K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]}
K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]}
CONTAINER_IMAGE_NAME[$IX,$IY]=${CommonImageNameContainerAlibabaCloudLinux3[$IX]}
CONTAINER_IMAGE_TYPE[$IX,$IY]=${CommonImageTypeContainerAlibabaCloudLinux3[$IX]}

# region22
IY=$AlibabaCnWulanchabu
Expand All @@ -645,6 +687,8 @@ DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]}
DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]}
K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]}
K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]}
CONTAINER_IMAGE_NAME[$IX,$IY]=${CommonImageNameContainerAlibabaCloudLinux3[$IX]}
CONTAINER_IMAGE_TYPE[$IX,$IY]=${CommonImageTypeContainerAlibabaCloudLinux3[$IX]}

# region23
IY=$AlibabaCnGuangzhou
Expand All @@ -659,6 +703,8 @@ DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]}
DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]}
K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]}
K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]}
CONTAINER_IMAGE_NAME[$IX,$IY]=${CommonImageNameContainerAlibabaCloudLinux3[$IX]}
CONTAINER_IMAGE_TYPE[$IX,$IY]=${CommonImageTypeContainerAlibabaCloudLinux3[$IX]}

# region24
IY=$AlibabaApNortheast2
Expand All @@ -673,6 +719,8 @@ DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]}
DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]}
K8S_VERSION[$IX,$IY]=${CommonK8sVersion[$IX]}
K8S_UPGRADE_VERSION[$IX,$IY]=${CommonK8sUpgradeVersion[$IX]}
CONTAINER_IMAGE_NAME[$IX,$IY]=${CommonImageNameContainerAlibabaCloudLinux3[$IX]}
CONTAINER_IMAGE_TYPE[$IX,$IY]=${CommonImageTypeContainerAlibabaCloudLinux3[$IX]}



Expand Down

0 comments on commit de9aaa1

Please sign in to comment.