diff --git a/VERSION b/VERSION index dd7315dff..df8103dd7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.72-release +1.2.73-release diff --git a/examples/generic/pom.xml b/examples/generic/pom.xml index a163f6699..24b281df2 100644 --- a/examples/generic/pom.xml +++ b/examples/generic/pom.xml @@ -7,7 +7,7 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 @@ -19,7 +19,7 @@ cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/examples/uhost/pom.xml b/examples/uhost/pom.xml index 4b4e513c6..5e7fd6b78 100644 --- a/examples/uhost/pom.xml +++ b/examples/uhost/pom.xml @@ -7,7 +7,7 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 @@ -19,7 +19,7 @@ cn.ucloud ucloud-sdk-java-uhost - 1.2.72-release + 1.2.73-release diff --git a/pom.xml b/pom.xml index 2e32cc4b9..2ec47d405 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ cn.ucloud ucloud-sdk-java pom - 1.2.72-release + 1.2.73-release ucloud-sdk-java-common ucloud-sdk-java-cloudwatch @@ -58,7 +58,6 @@ ucloud-sdk-java-uvms ucloud-sdk-java-uwsc ucloud-sdk-java-vpc - ucloud-sdk-java-vpc ucloud-sdk-java diff --git a/ucloud-sdk-java-cloudwatch/pom.xml b/ucloud-sdk-java-cloudwatch/pom.xml index 81fe3cd60..ce8ea4503 100644 --- a/ucloud-sdk-java-cloudwatch/pom.xml +++ b/ucloud-sdk-java-cloudwatch/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-cloudwatch ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-common/pom.xml b/ucloud-sdk-java-common/pom.xml index 1e40eb5c5..2173662af 100644 --- a/ucloud-sdk-java-common/pom.xml +++ b/ucloud-sdk-java-common/pom.xml @@ -7,13 +7,13 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-common ucloud-sdk-java - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-cube/pom.xml b/ucloud-sdk-java-cube/pom.xml index d8117fcd2..18d3cf5cf 100644 --- a/ucloud-sdk-java-cube/pom.xml +++ b/ucloud-sdk-java-cube/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-cube ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-ipsecvpn/pom.xml b/ucloud-sdk-java-ipsecvpn/pom.xml index 4eae1908c..d2d209b26 100644 --- a/ucloud-sdk-java-ipsecvpn/pom.xml +++ b/ucloud-sdk-java-ipsecvpn/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-ipsecvpn ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-label/pom.xml b/ucloud-sdk-java-label/pom.xml index 59a88dc5f..b6aa6f2a9 100644 --- a/ucloud-sdk-java-label/pom.xml +++ b/ucloud-sdk-java-label/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-label ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-nlb/pom.xml b/ucloud-sdk-java-nlb/pom.xml index a0353a65b..e3efdd851 100644 --- a/ucloud-sdk-java-nlb/pom.xml +++ b/ucloud-sdk-java-nlb/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-nlb ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-pathx/pom.xml b/ucloud-sdk-java-pathx/pom.xml index e6cc2e291..3d9046794 100644 --- a/ucloud-sdk-java-pathx/pom.xml +++ b/ucloud-sdk-java-pathx/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-pathx ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-sts/pom.xml b/ucloud-sdk-java-sts/pom.xml index 9134a1b21..0978ac8f5 100644 --- a/ucloud-sdk-java-sts/pom.xml +++ b/ucloud-sdk-java-sts/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-sts ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-tidb/pom.xml b/ucloud-sdk-java-tidb/pom.xml index 5a38fe400..4a08ce15e 100644 --- a/ucloud-sdk-java-tidb/pom.xml +++ b/ucloud-sdk-java-tidb/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-tidb ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-uaccount/pom.xml b/ucloud-sdk-java-uaccount/pom.xml index 847a0d39b..fc375e61a 100644 --- a/ucloud-sdk-java-uaccount/pom.xml +++ b/ucloud-sdk-java-uaccount/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-uaccount ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-uai_modelverse/pom.xml b/ucloud-sdk-java-uai_modelverse/pom.xml index f00e5162e..6a97c8a33 100644 --- a/ucloud-sdk-java-uai_modelverse/pom.xml +++ b/ucloud-sdk-java-uai_modelverse/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-uai_modelverse ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-uas/pom.xml b/ucloud-sdk-java-uas/pom.xml index c1e406f9e..182cdd993 100644 --- a/ucloud-sdk-java-uas/pom.xml +++ b/ucloud-sdk-java-uas/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-uas ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-ubill/pom.xml b/ucloud-sdk-java-ubill/pom.xml index fec22384d..efcf49de5 100644 --- a/ucloud-sdk-java-ubill/pom.xml +++ b/ucloud-sdk-java-ubill/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-ubill ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-ucdn/pom.xml b/ucloud-sdk-java-ucdn/pom.xml index d9717ee16..108f882b5 100644 --- a/ucloud-sdk-java-ucdn/pom.xml +++ b/ucloud-sdk-java-ucdn/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-ucdn ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-uclickhouse/pom.xml b/ucloud-sdk-java-uclickhouse/pom.xml index 24866c1a7..e1c2c1695 100644 --- a/ucloud-sdk-java-uclickhouse/pom.xml +++ b/ucloud-sdk-java-uclickhouse/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-uclickhouse ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-ucompshare/pom.xml b/ucloud-sdk-java-ucompshare/pom.xml index 4baec98a9..e6b680ad0 100644 --- a/ucloud-sdk-java-ucompshare/pom.xml +++ b/ucloud-sdk-java-ucompshare/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-ucompshare ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-udb/pom.xml b/ucloud-sdk-java-udb/pom.xml index 9215fd17f..9dc891fbb 100644 --- a/ucloud-sdk-java-udb/pom.xml +++ b/ucloud-sdk-java-udb/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-udb ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-udbproxy/pom.xml b/ucloud-sdk-java-udbproxy/pom.xml index c37f24a85..c13321afa 100644 --- a/ucloud-sdk-java-udbproxy/pom.xml +++ b/ucloud-sdk-java-udbproxy/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-udbproxy ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-udi/pom.xml b/ucloud-sdk-java-udi/pom.xml index 307ac8c5a..db5d2c03a 100644 --- a/ucloud-sdk-java-udi/pom.xml +++ b/ucloud-sdk-java-udi/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-udi ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-udisk/pom.xml b/ucloud-sdk-java-udisk/pom.xml index d84571ff2..f82eb78d5 100644 --- a/ucloud-sdk-java-udisk/pom.xml +++ b/ucloud-sdk-java-udisk/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-udisk ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-udns/pom.xml b/ucloud-sdk-java-udns/pom.xml index b4852b63e..891d63c1a 100644 --- a/ucloud-sdk-java-udns/pom.xml +++ b/ucloud-sdk-java-udns/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-udns ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-udpn/pom.xml b/ucloud-sdk-java-udpn/pom.xml index 93a25e0f2..fd544f858 100644 --- a/ucloud-sdk-java-udpn/pom.xml +++ b/ucloud-sdk-java-udpn/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-udpn ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-uec/pom.xml b/ucloud-sdk-java-uec/pom.xml index 6f31cdcd0..8793c4ebf 100644 --- a/ucloud-sdk-java-uec/pom.xml +++ b/ucloud-sdk-java-uec/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-uec ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-ues/pom.xml b/ucloud-sdk-java-ues/pom.xml index cf4f1235e..320c7cf24 100644 --- a/ucloud-sdk-java-ues/pom.xml +++ b/ucloud-sdk-java-ues/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-ues ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-uewaf/pom.xml b/ucloud-sdk-java-uewaf/pom.xml index b6a732f88..575e0e850 100644 --- a/ucloud-sdk-java-uewaf/pom.xml +++ b/ucloud-sdk-java-uewaf/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-uewaf ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-ufile/pom.xml b/ucloud-sdk-java-ufile/pom.xml index 9512e5faa..5108a611e 100644 --- a/ucloud-sdk-java-ufile/pom.xml +++ b/ucloud-sdk-java-ufile/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-ufile ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-ufs/pom.xml b/ucloud-sdk-java-ufs/pom.xml index 7d54c8235..543e97138 100644 --- a/ucloud-sdk-java-ufs/pom.xml +++ b/ucloud-sdk-java-ufs/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-ufs ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-uhadoop/pom.xml b/ucloud-sdk-java-uhadoop/pom.xml index f9240e59f..4ade22c0b 100644 --- a/ucloud-sdk-java-uhadoop/pom.xml +++ b/ucloud-sdk-java-uhadoop/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-uhadoop ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-uhids/pom.xml b/ucloud-sdk-java-uhids/pom.xml index 1adb20f0e..d1b9de924 100644 --- a/ucloud-sdk-java-uhids/pom.xml +++ b/ucloud-sdk-java-uhids/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-uhids ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-uhost/pom.xml b/ucloud-sdk-java-uhost/pom.xml index 622d36e58..510d531fb 100644 --- a/ucloud-sdk-java-uhost/pom.xml +++ b/ucloud-sdk-java-uhost/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-uhost ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-uk8s/pom.xml b/ucloud-sdk-java-uk8s/pom.xml index 2bb7ea49b..dcabff80f 100644 --- a/ucloud-sdk-java-uk8s/pom.xml +++ b/ucloud-sdk-java-uk8s/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-uk8s ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/client/UK8SClient.java b/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/client/UK8SClient.java index 987776bd7..acd568424 100644 --- a/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/client/UK8SClient.java +++ b/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/client/UK8SClient.java @@ -37,6 +37,10 @@ import cn.ucloud.uk8s.models.DescribeUK8SImageResponse; import cn.ucloud.uk8s.models.DescribeUK8SNodeRequest; import cn.ucloud.uk8s.models.DescribeUK8SNodeResponse; +import cn.ucloud.uk8s.models.GetClusterConfigRequest; +import cn.ucloud.uk8s.models.GetClusterConfigResponse; +import cn.ucloud.uk8s.models.GetUK8SVersionsRequest; +import cn.ucloud.uk8s.models.GetUK8SVersionsResponse; import cn.ucloud.uk8s.models.ListUK8SClusterNodeV2Request; import cn.ucloud.uk8s.models.ListUK8SClusterNodeV2Response; import cn.ucloud.uk8s.models.ListUK8SClusterV2Request; @@ -176,6 +180,30 @@ public DescribeUK8SNodeResponse describeUK8SNode(DescribeUK8SNodeRequest request return (DescribeUK8SNodeResponse) this.invoke(request, DescribeUK8SNodeResponse.class); } + /** + * GetClusterConfig - 获取集群配置文件 + * + * @param request Request object + * @throws UCloudException Exception + */ + public GetClusterConfigResponse getClusterConfig(GetClusterConfigRequest request) + throws UCloudException { + request.setAction("GetClusterConfig"); + return (GetClusterConfigResponse) this.invoke(request, GetClusterConfigResponse.class); + } + + /** + * GetUK8SVersions - 获取支持创建的UK8S集群版本 + * + * @param request Request object + * @throws UCloudException Exception + */ + public GetUK8SVersionsResponse getUK8SVersions(GetUK8SVersionsRequest request) + throws UCloudException { + request.setAction("GetUK8SVersions"); + return (GetUK8SVersionsResponse) this.invoke(request, GetUK8SVersionsResponse.class); + } + /** * ListUK8SClusterNodeV2 - 获取UK8S集群节点信息 * diff --git a/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/client/UK8SClientInterface.java b/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/client/UK8SClientInterface.java index 7facba87f..760085d83 100644 --- a/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/client/UK8SClientInterface.java +++ b/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/client/UK8SClientInterface.java @@ -35,6 +35,10 @@ import cn.ucloud.uk8s.models.DescribeUK8SImageResponse; import cn.ucloud.uk8s.models.DescribeUK8SNodeRequest; import cn.ucloud.uk8s.models.DescribeUK8SNodeResponse; +import cn.ucloud.uk8s.models.GetClusterConfigRequest; +import cn.ucloud.uk8s.models.GetClusterConfigResponse; +import cn.ucloud.uk8s.models.GetUK8SVersionsRequest; +import cn.ucloud.uk8s.models.GetUK8SVersionsResponse; import cn.ucloud.uk8s.models.ListUK8SClusterNodeV2Request; import cn.ucloud.uk8s.models.ListUK8SClusterNodeV2Response; import cn.ucloud.uk8s.models.ListUK8SClusterV2Request; @@ -137,6 +141,24 @@ public DescribeUK8SImageResponse describeUK8SImage(DescribeUK8SImageRequest requ public DescribeUK8SNodeResponse describeUK8SNode(DescribeUK8SNodeRequest request) throws UCloudException; + /** + * GetClusterConfig - 获取集群配置文件 + * + * @param request Request object + * @throws UCloudException Exception + */ + public GetClusterConfigResponse getClusterConfig(GetClusterConfigRequest request) + throws UCloudException; + + /** + * GetUK8SVersions - 获取支持创建的UK8S集群版本 + * + * @param request Request object + * @throws UCloudException Exception + */ + public GetUK8SVersionsResponse getUK8SVersions(GetUK8SVersionsRequest request) + throws UCloudException; + /** * ListUK8SClusterNodeV2 - 获取UK8S集群节点信息 * diff --git a/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/AddUK8SUHostNodeRequest.java b/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/AddUK8SUHostNodeRequest.java index 7ca197195..2009edd17 100644 --- a/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/AddUK8SUHostNodeRequest.java +++ b/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/AddUK8SUHostNodeRequest.java @@ -13,11 +13,12 @@ */ package cn.ucloud.uk8s.models; - import cn.ucloud.common.annotation.NotEmpty; import cn.ucloud.common.annotation.UCloudParam; import cn.ucloud.common.request.Request; +import java.util.List; + public class AddUK8SUHostNodeRequest extends Request { /** 可用区。参见 [可用区列表](https://docs.ucloud.cn/api/summary/regionlist) */ @@ -52,14 +53,6 @@ public class AddUK8SUHostNodeRequest extends Request { @UCloudParam("Count") private Integer count; - /** - * Node节点密码。请遵照[[api:uhost-api:specification|字段规范]]设定密码。密码需使用base64进行编码,如下:# echo -n Password1 | - * base64 - */ - @NotEmpty - @UCloudParam("Password") - private String password; - /** 内存大小。单位:MB。范围 :[4096, 262144],取值为1024的倍数(可选范围参考控制台)。默认值:8192 */ @NotEmpty @UCloudParam("Mem") @@ -73,6 +66,13 @@ public class AddUK8SUHostNodeRequest extends Request { @UCloudParam("ChargeType") private String chargeType; + /** + * Node节点密码。请遵照[[api:uhost-api:specification|字段规范]]设定密码。密码需使用base64进行编码,如下:# echo -n Password1 | + * base64 + */ + @UCloudParam("Password") + private String password; + /** 磁盘类型。请参考[[api:uhost-api:disk_type|磁盘类型]]。默认为SSD云盘 */ @UCloudParam("BootDiskType") private String bootDiskType; @@ -157,6 +157,52 @@ public class AddUK8SUHostNodeRequest extends Request { @UCloudParam("NodeGroupId") private String nodeGroupId; + /** 主机安全模式。Firewall:防火墙;SecGroup:安全组;默认值:Firewall。 */ + @UCloudParam("SecurityMode") + private String securityMode; + + /** 自定义主机名前缀。完整的自定义主机名为{NamePrefix}-{NodeIP}。 */ + @UCloudParam("NamePrefix") + private String namePrefix; + + /** + * 网络增强特性。枚举值:Normal,不开启; Super,开启网络增强1.0; Ultra,开启网络增强2.0;Extreme,开启网络增强3.0; Infiniband, + * 开启网络增强4.0(详情参考主机官网文档) + */ + @UCloudParam("NetCapability") + private String netCapability; + + /** 弹性网卡特性。开启了弹性网卡权限位,此特性才生效,默认 false 未开启,true 开启。 */ + @UCloudParam("UNIFeature") + private Boolean uniFeature; + + /** */ + @UCloudParam("NetworkInterface") + private List networkInterface; + + /** + * 防火墙ID,默认:Web推荐防火墙。如何查询SecurityGroupId请参见 + * [DescribeFirewall](api/unet-api/describe_firewall.html)。 + */ + @UCloudParam("SecurityGroupId") + private String securityGroupId; + + /** */ + @UCloudParam("SecGroupId") + private List secGroupId; + + /** 主机规格族 */ + @UCloudParam("UHostFamily") + private String uHostFamily; + + /** */ + @UCloudParam("UserLabels") + private List userLabels; + + /** */ + @UCloudParam("KubeletConfiguration") + private KubeletConfiguration kubeletConfiguration; + public String getZone() { return zone; } @@ -205,14 +251,6 @@ public void setCount(Integer count) { this.count = count; } - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - public Integer getMem() { return mem; } @@ -229,6 +267,14 @@ public void setChargeType(String chargeType) { this.chargeType = chargeType; } + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + public String getBootDiskType() { return bootDiskType; } @@ -388,4 +434,257 @@ public String getNodeGroupId() { public void setNodeGroupId(String nodeGroupId) { this.nodeGroupId = nodeGroupId; } + + public String getSecurityMode() { + return securityMode; + } + + public void setSecurityMode(String securityMode) { + this.securityMode = securityMode; + } + + public String getNamePrefix() { + return namePrefix; + } + + public void setNamePrefix(String namePrefix) { + this.namePrefix = namePrefix; + } + + public String getNetCapability() { + return netCapability; + } + + public void setNetCapability(String netCapability) { + this.netCapability = netCapability; + } + + public Boolean getUNIFeature() { + return uniFeature; + } + + public void setUNIFeature(Boolean uniFeature) { + this.uniFeature = uniFeature; + } + + public List getNetworkInterface() { + return networkInterface; + } + + public void setNetworkInterface(List networkInterface) { + this.networkInterface = networkInterface; + } + + public String getSecurityGroupId() { + return securityGroupId; + } + + public void setSecurityGroupId(String securityGroupId) { + this.securityGroupId = securityGroupId; + } + + public List getSecGroupId() { + return secGroupId; + } + + public void setSecGroupId(List secGroupId) { + this.secGroupId = secGroupId; + } + + public String getUHostFamily() { + return uHostFamily; + } + + public void setUHostFamily(String uHostFamily) { + this.uHostFamily = uHostFamily; + } + + public List getUserLabels() { + return userLabels; + } + + public void setUserLabels(List userLabels) { + this.userLabels = userLabels; + } + + public KubeletConfiguration getKubeletConfiguration() { + return kubeletConfiguration; + } + + public void setKubeletConfiguration(KubeletConfiguration kubeletConfiguration) { + this.kubeletConfiguration = kubeletConfiguration; + } + + public static class KubeletConfiguration extends Request { + + /** + * 全量KubeletConfiguration.XXX定义参考AddUK8SNodeGroup接口: + * https://uxiao.ucloudadmin.com/#/api-manager/api/detail/UK8S/AddUK8SNodeGroup + */ + @UCloudParam("ContainerLogMaxFiles") + private String containerLogMaxFiles; + + public String getContainerLogMaxFiles() { + return containerLogMaxFiles; + } + + public void setContainerLogMaxFiles(String containerLogMaxFiles) { + this.containerLogMaxFiles = containerLogMaxFiles; + } + } + + public static class NetworkInterface extends Request { + + /** */ + @UCloudParam("EIP") + private NetworkInterfaceEIP eip; + + public NetworkInterfaceEIP getEIP() { + return eip; + } + + public void setEIP(NetworkInterfaceEIP eip) { + this.eip = eip; + } + } + + public static class NetworkInterfaceEIP extends Request { + + /** + * 【若绑定EIP,此参数必填】弹性IP的外网带宽, 单位为Mbps. 共享带宽模式下非必传, 非共享带宽模式必须指定非0Mbps带宽. 各地域非共享带宽的带宽范围如下: + * 流量计费[1-300],带宽计费[1-800] + */ + @UCloudParam("Bandwidth") + private Integer bandwidth; + + /** + * 弹性IP的计费模式. 枚举值: "Traffic", 流量计费; "Bandwidth", 带宽计费; "ShareBandwidth",共享带宽模式. + * "Free":免费带宽模式,默认为 "Bandwidth" + */ + @UCloudParam("PayMode") + private String payMode; + + /** 绑定的共享带宽Id,仅当PayMode为ShareBandwidth时有效 */ + @UCloudParam("ShareBandwidthId") + private String shareBandwidthId; + + /** + * 【若绑定EIP,此参数必填】弹性IP的线路。枚举值: 国际: International,BGP: Bgp。 各地域允许的线路参数如下: cn-sh1: Bgp cn-sh2: + * Bgp cn-gd: Bgp cn-bj1: Bgp cn-bj2: Bgp hk: International us-ca: International th-bkk: + * International kr-seoul:International us-ws:International ge-fra:International + * sg:International tw-kh:International.其他海外线路均为 International + */ + @UCloudParam("OperatorName") + private String operatorName; + + /** 当前EIP代金券id。请通过DescribeCoupon接口查询,或登录用户中心查看。 */ + @UCloudParam("CouponId") + private String couponId; + + public Integer getBandwidth() { + return bandwidth; + } + + public void setBandwidth(Integer bandwidth) { + this.bandwidth = bandwidth; + } + + public String getPayMode() { + return payMode; + } + + public void setPayMode(String payMode) { + this.payMode = payMode; + } + + public String getShareBandwidthId() { + return shareBandwidthId; + } + + public void setShareBandwidthId(String shareBandwidthId) { + this.shareBandwidthId = shareBandwidthId; + } + + public String getOperatorName() { + return operatorName; + } + + public void setOperatorName(String operatorName) { + this.operatorName = operatorName; + } + + public String getCouponId() { + return couponId; + } + + public void setCouponId(String couponId) { + this.couponId = couponId; + } + } + + public static class SecGroupId extends Request { + + /** 安全组 ID。至多可以同时绑定5个安全组。 */ + @UCloudParam("Id") + private String id; + + /** 安全组优先级。取值范围[1, 5] */ + @UCloudParam("Priority") + private String priority; + + /** 安全组名称。 */ + @UCloudParam("Name") + private String name; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPriority() { + return priority; + } + + public void setPriority(String priority) { + this.priority = priority; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + } + + public static class UserLabels extends Request { + + /** UK8S用户资源标签的键值 */ + @UCloudParam("Key") + private String key; + + /** UK8S用户资源标签的值 */ + @UCloudParam("Value") + private String value; + + public String getKey() { + return key; + } + + public void setKey(String key) { + this.key = key; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } } diff --git a/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/CreateUK8SClusterV2Request.java b/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/CreateUK8SClusterV2Request.java index a8c1c4cb3..6d33f2040 100644 --- a/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/CreateUK8SClusterV2Request.java +++ b/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/CreateUK8SClusterV2Request.java @@ -146,6 +146,22 @@ public class CreateUK8SClusterV2Request extends Request { @UCloudParam("Tag") private String tag; + /** Master节点的镜像 ID,不填则使用ImageId参数。支持用户自定义镜像。 */ + @UCloudParam("MasterImageId") + private String masterImageId; + + /** master lb 类型默认ulb,可选ulb nlb */ + @UCloudParam("LbClass") + private String lbClass; + + /** LbClass为nlb的时候支持的源ip转发模式,目前只支持Toa,为空则不开源ip功能 枚举:"",Toa */ + @UCloudParam("ForwardSrcIPMethod") + private String forwardSrcIPMethod; + + /** UK8S用户标签,key=value形式,多组用”,“隔开,最多5组。 如env=pro,type=game */ + @UCloudParam("UserLabels") + private String userLabels; + public String getRegion() { return region; } @@ -370,6 +386,38 @@ public void setTag(String tag) { this.tag = tag; } + public String getMasterImageId() { + return masterImageId; + } + + public void setMasterImageId(String masterImageId) { + this.masterImageId = masterImageId; + } + + public String getLbClass() { + return lbClass; + } + + public void setLbClass(String lbClass) { + this.lbClass = lbClass; + } + + public String getForwardSrcIPMethod() { + return forwardSrcIPMethod; + } + + public void setForwardSrcIPMethod(String forwardSrcIPMethod) { + this.forwardSrcIPMethod = forwardSrcIPMethod; + } + + public String getUserLabels() { + return userLabels; + } + + public void setUserLabels(String userLabels) { + this.userLabels = userLabels; + } + public static class KubeProxy extends Request { /** 集群kube-proxy模式。支持iptables和ipvs,默认为iptables。 */ @@ -395,6 +443,10 @@ public static class Master extends Request { @UCloudParam("Zone") private String zone; + /** */ + @UCloudParam("SecGroupId") + private List secGroupId; + public String getZone() { return zone; } @@ -402,6 +454,53 @@ public String getZone() { public void setZone(String zone) { this.zone = zone; } + + public List getSecGroupId() { + return secGroupId; + } + + public void setSecGroupId(List secGroupId) { + this.secGroupId = secGroupId; + } + } + + public static class MasterSecGroupId extends Request { + + /** 安全组 ID。至多可以同时绑定5个安全组。 */ + @UCloudParam("Id") + private String id; + + /** 安全组优先级。取值范围[1, 5] */ + @UCloudParam("Priority") + private String priority; + + /** 安全组名称。 */ + @UCloudParam("Name") + private String name; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPriority() { + return priority; + } + + public void setPriority(String priority) { + this.priority = priority; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } } public static class Nodes extends Request { @@ -481,6 +580,37 @@ public static class Nodes extends Request { @UCloudParam("Taints") private String taints; + /** 主机安全模式。Firewall:防火墙;SecGroup:安全组;默认值:Firewall。 */ + @UCloudParam("SecurityMode") + private String securityMode; + + /** 一组Node的自定义主机名前缀。 完整的自定义主机名为{NamePrefix}-{NodeIP}。 */ + @UCloudParam("NamePrefix") + private String namePrefix; + + /** Node节点的镜像 ID,不填则使用ImageId参数。支持用户自定义镜像。 */ + @UCloudParam("ImageId") + private String imageId; + + /** 弹性网卡特性。开启了弹性网卡权限位,此特性才生效,默认 false 未开启,true 开启。 */ + @UCloudParam("UNIFeature") + private String uniFeature; + + /** */ + @UCloudParam("NetworkInterface") + private List networkInterface; + + /** + * 防火墙ID,默认:Web推荐防火墙。如何查询SecurityGroupId请参见 + * [DescribeFirewall](api/unet-api/describe_firewall.html)。 + */ + @UCloudParam("SecurityGroupId") + private String securityGroupId; + + /** */ + @UCloudParam("SecGroupId") + private List secGroupId; + public String getZone() { return zone; } @@ -608,5 +738,189 @@ public String getTaints() { public void setTaints(String taints) { this.taints = taints; } + + public String getSecurityMode() { + return securityMode; + } + + public void setSecurityMode(String securityMode) { + this.securityMode = securityMode; + } + + public String getNamePrefix() { + return namePrefix; + } + + public void setNamePrefix(String namePrefix) { + this.namePrefix = namePrefix; + } + + public String getImageId() { + return imageId; + } + + public void setImageId(String imageId) { + this.imageId = imageId; + } + + public String getUNIFeature() { + return uniFeature; + } + + public void setUNIFeature(String uniFeature) { + this.uniFeature = uniFeature; + } + + public List getNetworkInterface() { + return networkInterface; + } + + public void setNetworkInterface(List networkInterface) { + this.networkInterface = networkInterface; + } + + public String getSecurityGroupId() { + return securityGroupId; + } + + public void setSecurityGroupId(String securityGroupId) { + this.securityGroupId = securityGroupId; + } + + public List getSecGroupId() { + return secGroupId; + } + + public void setSecGroupId(List secGroupId) { + this.secGroupId = secGroupId; + } + } + + public static class NodesNetworkInterface extends Request { + + /** */ + @UCloudParam("EIP") + private NodesNetworkInterfaceEIP eip; + + public NodesNetworkInterfaceEIP getEIP() { + return eip; + } + + public void setEIP(NodesNetworkInterfaceEIP eip) { + this.eip = eip; + } + } + + public static class NodesNetworkInterfaceEIP extends Request { + + /** + * 【若绑定EIP,此参数必填】弹性IP的外网带宽, 单位为Mbps. 共享带宽模式下非必传, 非共享带宽模式必须指定非0Mbps带宽. 各地域非共享带宽的带宽范围如下: + * 流量计费[1-300],带宽计费[1-800] + */ + @UCloudParam("Bandwidth") + private Integer bandwidth; + + /** + * 弹性IP的计费模式. 枚举值: "Traffic", 流量计费; "Bandwidth", 带宽计费; "ShareBandwidth",共享带宽模式. + * "Free":免费带宽模式,默认为 "Bandwidth" + */ + @UCloudParam("PayMode") + private String payMode; + + /** 绑定的共享带宽Id,仅当PayMode为ShareBandwidth时有效 */ + @UCloudParam("ShareBandwidthId") + private String shareBandwidthId; + + /** + * 【若绑定EIP,此参数必填】弹性IP的线路。枚举值: 国际: International BGP: Bgp 各地域允许的线路参数如下: cn-sh1: Bgp cn-sh2: + * Bgp cn-gd: Bgp cn-bj1: Bgp cn-bj2: Bgp hk: International us-ca: International th-bkk: + * International kr-seoul:International us-ws:International ge-fra:International + * sg:International tw-kh:International.其他海外线路均为 International + */ + @UCloudParam("OperatorName") + private String operatorName; + + /** 当前EIP代金券id。请通过DescribeCoupon接口查询,或登录用户中心查看。 */ + @UCloudParam("CouponId") + private String couponId; + + public Integer getBandwidth() { + return bandwidth; + } + + public void setBandwidth(Integer bandwidth) { + this.bandwidth = bandwidth; + } + + public String getPayMode() { + return payMode; + } + + public void setPayMode(String payMode) { + this.payMode = payMode; + } + + public String getShareBandwidthId() { + return shareBandwidthId; + } + + public void setShareBandwidthId(String shareBandwidthId) { + this.shareBandwidthId = shareBandwidthId; + } + + public String getOperatorName() { + return operatorName; + } + + public void setOperatorName(String operatorName) { + this.operatorName = operatorName; + } + + public String getCouponId() { + return couponId; + } + + public void setCouponId(String couponId) { + this.couponId = couponId; + } + } + + public static class NodesSecGroupId extends Request { + + /** 安全组 ID。至多可以同时绑定5个安全组。 */ + @UCloudParam("Id") + private String id; + + /** 安全组优先级。取值范围[1, 5] */ + @UCloudParam("Priority") + private String priority; + + /** 安全组名称。 */ + @UCloudParam("Name") + private String name; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPriority() { + return priority; + } + + public void setPriority(String priority) { + this.priority = priority; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } } } diff --git a/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/DescribeUK8SClusterResponse.java b/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/DescribeUK8SClusterResponse.java index 6badc85d9..a3288c9fa 100644 --- a/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/DescribeUK8SClusterResponse.java +++ b/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/DescribeUK8SClusterResponse.java @@ -105,6 +105,74 @@ public class DescribeUK8SClusterResponse extends Response { @SerializedName("MasterResourceStatus") private String masterResourceStatus; + /** CNI模式,可选值VPC/Calico */ + @SerializedName("CNIMode") + private String cniMode; + + /** 集群的监控类型:no无监控;cloudwatch统一监控平台;prometheus内置监控 */ + @SerializedName("MonitorType") + private String monitorType; + + /** 集群的节点伸缩(CA)配置 */ + @SerializedName("Autoscaler") + private Autoscaler autoscaler; + + /** 是否开启了授权管理功能 */ + @SerializedName("EnableUserAuth") + private Boolean enableUserAuth; + + /** Pod是否使用独立子网 */ + @SerializedName("DedicatedPodSubnet") + private Boolean dedicatedPodSubnet; + + /** Pod使用的独立子网列表 */ + @SerializedName("PodSubnetIds") + private List podSubnetIds; + + /** 删除保护开关。0表示不开启,1表示开启。默认不开启 */ + @SerializedName("DeleteProtection") + private Integer deleteProtection; + + /** Pod独立子网内的ip使用的安全组 */ + @SerializedName("PodSubnetSecGroups") + private List podSubnetSecGroups; + + /** 节点网段 */ + @SerializedName("NodeCIDR") + private String nodeCIDR; + + /** 外部 API Server 负载均衡实例 ID */ + @SerializedName("ExternalUlb") + private String externalUlb; + + /** 内部 API Server 负载均衡实例 ID */ + @SerializedName("InternalUlb") + private String internalUlb; + + /** 更新时间 */ + @SerializedName("UpdateTime") + private Integer updateTime; + + /** 负载均衡类型 */ + @SerializedName("LbClass") + private String lbClass; + + /** 容器运行时名称 */ + @SerializedName("RuntimeName") + private String runtimeName; + + /** 容器运行时版本 */ + @SerializedName("RuntimeVersion") + private String runtimeVersion; + + /** 集群版本 */ + @SerializedName("ClusterType") + private String clusterType; + + /** API Server 回环客户端证书 */ + @SerializedName("LoopbackClientCert") + private LoopbackClientCert loopbackClientCert; + public String getClusterName() { return clusterName; } @@ -273,6 +341,229 @@ public void setMasterResourceStatus(String masterResourceStatus) { this.masterResourceStatus = masterResourceStatus; } + public String getCNIMode() { + return cniMode; + } + + public void setCNIMode(String cniMode) { + this.cniMode = cniMode; + } + + public String getMonitorType() { + return monitorType; + } + + public void setMonitorType(String monitorType) { + this.monitorType = monitorType; + } + + public Autoscaler getAutoscaler() { + return autoscaler; + } + + public void setAutoscaler(Autoscaler autoscaler) { + this.autoscaler = autoscaler; + } + + public Boolean getEnableUserAuth() { + return enableUserAuth; + } + + public void setEnableUserAuth(Boolean enableUserAuth) { + this.enableUserAuth = enableUserAuth; + } + + public Boolean getDedicatedPodSubnet() { + return dedicatedPodSubnet; + } + + public void setDedicatedPodSubnet(Boolean dedicatedPodSubnet) { + this.dedicatedPodSubnet = dedicatedPodSubnet; + } + + public List getPodSubnetIds() { + return podSubnetIds; + } + + public void setPodSubnetIds(List podSubnetIds) { + this.podSubnetIds = podSubnetIds; + } + + public Integer getDeleteProtection() { + return deleteProtection; + } + + public void setDeleteProtection(Integer deleteProtection) { + this.deleteProtection = deleteProtection; + } + + public List getPodSubnetSecGroups() { + return podSubnetSecGroups; + } + + public void setPodSubnetSecGroups(List podSubnetSecGroups) { + this.podSubnetSecGroups = podSubnetSecGroups; + } + + public String getNodeCIDR() { + return nodeCIDR; + } + + public void setNodeCIDR(String nodeCIDR) { + this.nodeCIDR = nodeCIDR; + } + + public String getExternalUlb() { + return externalUlb; + } + + public void setExternalUlb(String externalUlb) { + this.externalUlb = externalUlb; + } + + public String getInternalUlb() { + return internalUlb; + } + + public void setInternalUlb(String internalUlb) { + this.internalUlb = internalUlb; + } + + public Integer getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Integer updateTime) { + this.updateTime = updateTime; + } + + public String getLbClass() { + return lbClass; + } + + public void setLbClass(String lbClass) { + this.lbClass = lbClass; + } + + public String getRuntimeName() { + return runtimeName; + } + + public void setRuntimeName(String runtimeName) { + this.runtimeName = runtimeName; + } + + public String getRuntimeVersion() { + return runtimeVersion; + } + + public void setRuntimeVersion(String runtimeVersion) { + this.runtimeVersion = runtimeVersion; + } + + public String getClusterType() { + return clusterType; + } + + public void setClusterType(String clusterType) { + this.clusterType = clusterType; + } + + public LoopbackClientCert getLoopbackClientCert() { + return loopbackClientCert; + } + + public void setLoopbackClientCert(LoopbackClientCert loopbackClientCert) { + this.loopbackClientCert = loopbackClientCert; + } + + public static class Autoscaler extends Response { + + /** 缩容触发延时 */ + @SerializedName("ScaleDownUnneededTime") + private String scaleDownUnneededTime; + + /** CPU缩容阈值 */ + @SerializedName("ScaleDownUtilizationThreshold") + private String scaleDownUtilizationThreshold; + + /** 静默时间 */ + @SerializedName("ScaleDownDelayAfterAdd") + private String scaleDownDelayAfterAdd; + + /** 打开/关闭 */ + @SerializedName("Enabled") + private Integer enabled; + + /** 伸缩器版本 */ + @SerializedName("Version") + private String version; + + /** */ + @SerializedName("UpdateTime") + private Integer updateTime; + + /** GPU缩容阈值 */ + @SerializedName("ScaleDownGpuUtilizationThreshold") + private String scaleDownGpuUtilizationThreshold; + + public String getScaleDownUnneededTime() { + return scaleDownUnneededTime; + } + + public void setScaleDownUnneededTime(String scaleDownUnneededTime) { + this.scaleDownUnneededTime = scaleDownUnneededTime; + } + + public String getScaleDownUtilizationThreshold() { + return scaleDownUtilizationThreshold; + } + + public void setScaleDownUtilizationThreshold(String scaleDownUtilizationThreshold) { + this.scaleDownUtilizationThreshold = scaleDownUtilizationThreshold; + } + + public String getScaleDownDelayAfterAdd() { + return scaleDownDelayAfterAdd; + } + + public void setScaleDownDelayAfterAdd(String scaleDownDelayAfterAdd) { + this.scaleDownDelayAfterAdd = scaleDownDelayAfterAdd; + } + + public Integer getEnabled() { + return enabled; + } + + public void setEnabled(Integer enabled) { + this.enabled = enabled; + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + + public Integer getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Integer updateTime) { + this.updateTime = updateTime; + } + + public String getScaleDownGpuUtilizationThreshold() { + return scaleDownGpuUtilizationThreshold; + } + + public void setScaleDownGpuUtilizationThreshold(String scaleDownGpuUtilizationThreshold) { + this.scaleDownGpuUtilizationThreshold = scaleDownGpuUtilizationThreshold; + } + } + public static class DiskSet extends Response { /** 磁盘类型。系统盘: Boot,数据盘: Data,网络盘:Udisk */ @@ -418,6 +709,26 @@ public static class IPSet extends Response { @SerializedName("Default") private String fDefault; + /** IP 地址分配模式 */ + @SerializedName("IPMode") + private String ipMode; + + /** IP 所属的 VPC Id */ + @SerializedName("VPCId") + private String vpcId; + + /** IP 所在的 子网 Id */ + @SerializedName("SubnetId") + private String subnetId; + + /** 网卡的 MAC 地址 */ + @SerializedName("Mac") + private String mac; + + /** 虚拟网卡 Id */ + @SerializedName("NetworkInterfaceId") + private String networkInterfaceId; + public String getType() { return type; } @@ -457,6 +768,46 @@ public String getDefault() { public void setDefault(String fDefault) { this.fDefault = fDefault; } + + public String getIPMode() { + return ipMode; + } + + public void setIPMode(String ipMode) { + this.ipMode = ipMode; + } + + public String getVPCId() { + return vpcId; + } + + public void setVPCId(String vpcId) { + this.vpcId = vpcId; + } + + public String getSubnetId() { + return subnetId; + } + + public void setSubnetId(String subnetId) { + this.subnetId = subnetId; + } + + public String getMac() { + return mac; + } + + public void setMac(String mac) { + this.mac = mac; + } + + public String getNetworkInterfaceId() { + return networkInterfaceId; + } + + public void setNetworkInterfaceId(String networkInterfaceId) { + this.networkInterfaceId = networkInterfaceId; + } } public static class KubeProxy extends Response { @@ -474,6 +825,72 @@ public void setMode(String mode) { } } + public static class LoopbackClientCert extends Response { + + /** 证书到期时间 */ + @SerializedName("ExpireTime") + private Integer expireTime; + + /** 证书是否进入过期告警状态 */ + @SerializedName("Warn") + private Boolean warn; + + public Integer getExpireTime() { + return expireTime; + } + + public void setExpireTime(Integer expireTime) { + this.expireTime = expireTime; + } + + public Boolean getWarn() { + return warn; + } + + public void setWarn(Boolean warn) { + this.warn = warn; + } + } + + public static class SecGroupId extends Response { + + /** 安全组名称 */ + @SerializedName("Id") + private String id; + + /** 安全组id */ + @SerializedName("Name") + private String name; + + /** 安全组优先级 */ + @SerializedName("Priority") + private String priority; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPriority() { + return priority; + } + + public void setPriority(String priority) { + this.priority = priority; + } + } + public static class UhostInfo extends Response { /** 所在机房 */ @@ -524,6 +941,34 @@ public static class UhostInfo extends Response { @SerializedName("NodeType") private String nodeType; + /** GPU 数量 */ + @SerializedName("GPU") + private Integer gpu; + + /** GPU 型号 */ + @SerializedName("GpuType") + private String gpuType; + + /** 基础镜像名称 */ + @SerializedName("BasicImageName") + private String basicImageName; + + /** 操作系统类型 */ + @SerializedName("OsType") + private String osType; + + /** 节点总磁盘空间 */ + @SerializedName("TotalDiskSpace") + private Integer totalDiskSpace; + + /** 主机机型类别 */ + @SerializedName("MachineType") + private String machineType; + + /** 节点关联的安全组列表 */ + @SerializedName("SecGroupId") + private List secGroupId; + public String getZone() { return zone; } @@ -619,5 +1064,61 @@ public String getNodeType() { public void setNodeType(String nodeType) { this.nodeType = nodeType; } + + public Integer getGPU() { + return gpu; + } + + public void setGPU(Integer gpu) { + this.gpu = gpu; + } + + public String getGpuType() { + return gpuType; + } + + public void setGpuType(String gpuType) { + this.gpuType = gpuType; + } + + public String getBasicImageName() { + return basicImageName; + } + + public void setBasicImageName(String basicImageName) { + this.basicImageName = basicImageName; + } + + public String getOsType() { + return osType; + } + + public void setOsType(String osType) { + this.osType = osType; + } + + public Integer getTotalDiskSpace() { + return totalDiskSpace; + } + + public void setTotalDiskSpace(Integer totalDiskSpace) { + this.totalDiskSpace = totalDiskSpace; + } + + public String getMachineType() { + return machineType; + } + + public void setMachineType(String machineType) { + this.machineType = machineType; + } + + public List getSecGroupId() { + return secGroupId; + } + + public void setSecGroupId(List secGroupId) { + this.secGroupId = secGroupId; + } } } diff --git a/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/DescribeUK8SImageRequest.java b/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/DescribeUK8SImageRequest.java index 736bdba43..10370b583 100644 --- a/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/DescribeUK8SImageRequest.java +++ b/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/DescribeUK8SImageRequest.java @@ -20,19 +20,38 @@ public class DescribeUK8SImageRequest extends Request { - /** 地域。 参见 [地域和可用区列表](../summary/regionlist.html) */ + /** 地域。 参见 [地域和可用区列表](https://docs.ucloud.cn/api/summary/regionlist) */ @NotEmpty @UCloudParam("Region") private String region; - /** 可用区。参见 [可用区列表](../summary/regionlist.html) */ + /** 可用区。参见 [可用区列表](https://docs.ucloud.cn/api/summary/regionlist) */ @UCloudParam("Zone") private String zone; - /** 项目ID。不填写为默认项目,子帐号必须填写。 请参考[GetProjectList接口](../summary/get_project_list.html) */ + /** + * 项目ID。不填写为默认项目,子帐号必须填写。 + * 请参考[GetProjectList接口](https://docs.ucloud.cn/api/summary/get_project_list) + */ @UCloudParam("ProjectId") private String projectId; + /** 产品类型,可选值uhost、uphost,不填则返回所有 */ + @UCloudParam("ProductType") + private String productType; + + /** 适用机型,如O、G、OPRO等,默认为O */ + @UCloudParam("MachineType") + private String machineType; + + /** 适用GPU类型,如1080Ti、4090、V100、A800等,MachineType为G时必须提供 */ + @UCloudParam("GPUType") + private String gpuType; + + /** k8s集群版本,如1.28.15 */ + @UCloudParam("K8sVersion") + private String k8sVersion; + public String getRegion() { return region; } @@ -56,4 +75,36 @@ public String getProjectId() { public void setProjectId(String projectId) { this.projectId = projectId; } + + public String getProductType() { + return productType; + } + + public void setProductType(String productType) { + this.productType = productType; + } + + public String getMachineType() { + return machineType; + } + + public void setMachineType(String machineType) { + this.machineType = machineType; + } + + public String getGPUType() { + return gpuType; + } + + public void setGPUType(String gpuType) { + this.gpuType = gpuType; + } + + public String getK8sVersion() { + return k8sVersion; + } + + public void setK8sVersion(String k8sVersion) { + this.k8sVersion = k8sVersion; + } } diff --git a/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/DescribeUK8SImageResponse.java b/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/DescribeUK8SImageResponse.java index 87421a8e0..606572853 100644 --- a/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/DescribeUK8SImageResponse.java +++ b/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/DescribeUK8SImageResponse.java @@ -25,10 +25,18 @@ public class DescribeUK8SImageResponse extends Response { @SerializedName("ImageSet") private List imageSet; - /** 物理机可用镜像集合, 详见ImageInfo 数组 */ + /** 裸金属可用镜像集合, 详见ImageInfo 数组 */ @SerializedName("PHostImageSet") private List pHostImageSet; + /** 虚拟机自制可用镜像集合, 详见ImageInfo 数组 */ + @SerializedName("CustomImageSet") + private List customImageSet; + + /** 裸金属自制可用镜像集合, 详见ImageInfo 数组 */ + @SerializedName("CustomPHostImageSet") + private List customPHostImageSet; + public List getImageSet() { return imageSet; } @@ -45,6 +53,22 @@ public void setPHostImageSet(List pHostImageSet) { this.pHostImageSet = pHostImageSet; } + public List getCustomImageSet() { + return customImageSet; + } + + public void setCustomImageSet(List customImageSet) { + this.customImageSet = customImageSet; + } + + public List getCustomPHostImageSet() { + return customPHostImageSet; + } + + public void setCustomPHostImageSet(List customPHostImageSet) { + this.customPHostImageSet = customPHostImageSet; + } + public static class ImageInfo extends Response { /** 可用区 Id */ @@ -63,6 +87,30 @@ public static class ImageInfo extends Response { @SerializedName("NotSupportGPU") private Boolean notSupportGPU; + /** OS 类型 */ + @SerializedName("OsType") + private String osType; + + /** OS 名称 */ + @SerializedName("OsName") + private String osName; + + /** 镜像支持的特性 */ + @SerializedName("Features") + private List features; + + /** 镜像大小 */ + @SerializedName("ImageSize") + private Integer imageSize; + + /** 集成软件名称, 如NV驱动版本、cuda版本 */ + @SerializedName("IntegratedSoftware") + private String integratedSoftware; + + /** 支持的GPU机型 */ + @SerializedName("SupportedGPUTypes") + private List supportedGPUTypes; + public Integer getZoneId() { return zoneId; } @@ -94,5 +142,53 @@ public Boolean getNotSupportGPU() { public void setNotSupportGPU(Boolean notSupportGPU) { this.notSupportGPU = notSupportGPU; } + + public String getOsType() { + return osType; + } + + public void setOsType(String osType) { + this.osType = osType; + } + + public String getOsName() { + return osName; + } + + public void setOsName(String osName) { + this.osName = osName; + } + + public List getFeatures() { + return features; + } + + public void setFeatures(List features) { + this.features = features; + } + + public Integer getImageSize() { + return imageSize; + } + + public void setImageSize(Integer imageSize) { + this.imageSize = imageSize; + } + + public String getIntegratedSoftware() { + return integratedSoftware; + } + + public void setIntegratedSoftware(String integratedSoftware) { + this.integratedSoftware = integratedSoftware; + } + + public List getSupportedGPUTypes() { + return supportedGPUTypes; + } + + public void setSupportedGPUTypes(List supportedGPUTypes) { + this.supportedGPUTypes = supportedGPUTypes; + } } } diff --git a/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/GetClusterConfigRequest.java b/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/GetClusterConfigRequest.java new file mode 100644 index 000000000..f480f47dd --- /dev/null +++ b/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/GetClusterConfigRequest.java @@ -0,0 +1,60 @@ +/** + * Copyright 2021 UCloud Technology Co., Ltd. + * + *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of the License at + * + *

http://www.apache.org/licenses/LICENSE-2.0 + * + *

Unless required by applicable law or agreed to in writing, software distributed under the + * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing permissions and + * limitations under the License. + */ +package cn.ucloud.uk8s.models; + + +import cn.ucloud.common.annotation.NotEmpty; +import cn.ucloud.common.annotation.UCloudParam; +import cn.ucloud.common.request.Request; + +public class GetClusterConfigRequest extends Request { + + /** 所在项目 */ + @UCloudParam("ProjectId") + private String projectId; + + /** 所在区域 */ + @NotEmpty + @UCloudParam("Region") + private String region; + + /** 集群ID */ + @NotEmpty + @UCloudParam("ClusterId") + private String clusterId; + + public String getProjectId() { + return projectId; + } + + public void setProjectId(String projectId) { + this.projectId = projectId; + } + + public String getRegion() { + return region; + } + + public void setRegion(String region) { + this.region = region; + } + + public String getClusterId() { + return clusterId; + } + + public void setClusterId(String clusterId) { + this.clusterId = clusterId; + } +} diff --git a/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/GetClusterConfigResponse.java b/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/GetClusterConfigResponse.java new file mode 100644 index 000000000..5f3890236 --- /dev/null +++ b/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/GetClusterConfigResponse.java @@ -0,0 +1,58 @@ +/** + * Copyright 2021 UCloud Technology Co., Ltd. + * + *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of the License at + * + *

http://www.apache.org/licenses/LICENSE-2.0 + * + *

Unless required by applicable law or agreed to in writing, software distributed under the + * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing permissions and + * limitations under the License. + */ +package cn.ucloud.uk8s.models; + + +import cn.ucloud.common.response.Response; + +import com.google.gson.annotations.SerializedName; + +public class GetClusterConfigResponse extends Response { + + /** 配置信息 */ + @SerializedName("KubeConfig") + private String kubeConfig; + + /** 开启公网apiserver的情况下,有数据返回。 */ + @SerializedName("ExternalKubeConfig") + private String externalKubeConfig; + + /** 用于标示 kubeconfig 是否可以进行替换更新 */ + @SerializedName("Updatable") + private Boolean updatable; + + public String getKubeConfig() { + return kubeConfig; + } + + public void setKubeConfig(String kubeConfig) { + this.kubeConfig = kubeConfig; + } + + public String getExternalKubeConfig() { + return externalKubeConfig; + } + + public void setExternalKubeConfig(String externalKubeConfig) { + this.externalKubeConfig = externalKubeConfig; + } + + public Boolean getUpdatable() { + return updatable; + } + + public void setUpdatable(Boolean updatable) { + this.updatable = updatable; + } +} diff --git a/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/GetUK8SVersionsRequest.java b/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/GetUK8SVersionsRequest.java new file mode 100644 index 000000000..8fc621aa2 --- /dev/null +++ b/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/GetUK8SVersionsRequest.java @@ -0,0 +1,61 @@ +/** + * Copyright 2021 UCloud Technology Co., Ltd. + * + *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of the License at + * + *

http://www.apache.org/licenses/LICENSE-2.0 + * + *

Unless required by applicable law or agreed to in writing, software distributed under the + * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing permissions and + * limitations under the License. + */ +package cn.ucloud.uk8s.models; + + +import cn.ucloud.common.annotation.NotEmpty; +import cn.ucloud.common.annotation.UCloudParam; +import cn.ucloud.common.request.Request; + +public class GetUK8SVersionsRequest extends Request { + + /** 地域。 参见 [地域和可用区列表](https://docs.ucloud.cn/api/summary/regionlist) */ + @NotEmpty + @UCloudParam("Region") + private String region; + + /** 项目ID。 请参考[GetProjectList接口](https://docs.ucloud.cn/api/summary/get_project_list) */ + @NotEmpty + @UCloudParam("ProjectId") + private String projectId; + + /** 集群类型,可选值为[Dedicated] */ + @NotEmpty + @UCloudParam("Kind") + private String kind; + + public String getRegion() { + return region; + } + + public void setRegion(String region) { + this.region = region; + } + + public String getProjectId() { + return projectId; + } + + public void setProjectId(String projectId) { + this.projectId = projectId; + } + + public String getKind() { + return kind; + } + + public void setKind(String kind) { + this.kind = kind; + } +} diff --git a/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/GetUK8SVersionsResponse.java b/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/GetUK8SVersionsResponse.java new file mode 100644 index 000000000..b693b625c --- /dev/null +++ b/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/GetUK8SVersionsResponse.java @@ -0,0 +1,62 @@ +/** + * Copyright 2021 UCloud Technology Co., Ltd. + * + *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of the License at + * + *

http://www.apache.org/licenses/LICENSE-2.0 + * + *

Unless required by applicable law or agreed to in writing, software distributed under the + * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing permissions and + * limitations under the License. + */ +package cn.ucloud.uk8s.models; + +import cn.ucloud.common.response.Response; + +import com.google.gson.annotations.SerializedName; + +import java.util.List; + +public class GetUK8SVersionsResponse extends Response { + + /** UK8S 版本信息列表。 */ + @SerializedName("Data") + private List data; + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class UK8SVersionData extends Response { + + /** K8S 版本 */ + @SerializedName("K8sVersion") + private String k8sVersion; + + /** Containerd 版本 */ + @SerializedName("ContainerdVersion") + private String containerdVersion; + + public String getK8sVersion() { + return k8sVersion; + } + + public void setK8sVersion(String k8sVersion) { + this.k8sVersion = k8sVersion; + } + + public String getContainerdVersion() { + return containerdVersion; + } + + public void setContainerdVersion(String containerdVersion) { + this.containerdVersion = containerdVersion; + } + } +} diff --git a/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/ListUK8SClusterNodeV2Request.java b/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/ListUK8SClusterNodeV2Request.java index 6eb1a77be..646fc9f5b 100644 --- a/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/ListUK8SClusterNodeV2Request.java +++ b/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/ListUK8SClusterNodeV2Request.java @@ -37,6 +37,10 @@ public class ListUK8SClusterNodeV2Request extends Request { @UCloudParam("ClusterId") private String clusterId; + /** 可传一个或多个节点id 不传或为空则返回所有节点 */ + @UCloudParam("NodeIds") + private String nodeIds; + public String getRegion() { return region; } @@ -60,4 +64,12 @@ public String getClusterId() { public void setClusterId(String clusterId) { this.clusterId = clusterId; } + + public String getNodeIds() { + return nodeIds; + } + + public void setNodeIds(String nodeIds) { + this.nodeIds = nodeIds; + } } diff --git a/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/ListUK8SClusterNodeV2Response.java b/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/ListUK8SClusterNodeV2Response.java index 798e0de50..ed68b0ae8 100644 --- a/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/ListUK8SClusterNodeV2Response.java +++ b/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/ListUK8SClusterNodeV2Response.java @@ -97,6 +97,14 @@ public static class NodeInfoV2 extends Response { @SerializedName("MachineType") private String machineType; + /** CPU平台 */ + @SerializedName("CPUPlatform") + private String cpuPlatform; + + /** 主机规格族 */ + @SerializedName("UHostFamily") + private String uHostFamily; + /** Node节点的操作系统类别,如Linux或Windows。 */ @SerializedName("OsType") private String osType; @@ -105,7 +113,7 @@ public static class NodeInfoV2 extends Response { @SerializedName("OsName") private String osName; - /** Node节点CPU核数,单位: 个。 */ + /** Node节点CPU核数,单位: 核。 */ @SerializedName("CPU") private Integer cpu; @@ -141,10 +149,102 @@ public static class NodeInfoV2 extends Response { @SerializedName("NodeLogInfo") private String nodeLogInfo; + /** 节点标签 */ + @SerializedName("Labels") + private List labels; + + /** Kubelet版本 */ + @SerializedName("KubeletVersion") + private String kubeletVersion; + + /** pod最大可用 */ + @SerializedName("MaxPod") + private Integer maxPod; + + /** 内存最大可用 */ + @SerializedName("MaxMemory") + private Integer maxMemory; + + /** CPU最大可用 */ + @SerializedName("MaxCPU") + private Integer maxCPU; + + /** 已申请的pod */ + @SerializedName("RequestPod") + private Integer requestPod; + + /** 已申请的Memory */ + @SerializedName("RequestMemory") + private Integer requestMemory; + + /** 已申请的CPU */ + @SerializedName("RequestCPU") + private Integer requestCPU; + + /** Runtime 版本 */ + @SerializedName("RuntimeVersion") + private String runtimeVersion; + + /** Runtime 名字 */ + @SerializedName("RuntimeName") + private String runtimeName; + + /** 已使用的CPU */ + @SerializedName("UsedCPU") + private Integer usedCPU; + + /** 已使用的Memory */ + @SerializedName("UsedMemory") + private Integer usedMemory; + + /** 系统盘大小 */ + @SerializedName("BootDiskSize") + private Integer bootDiskSize; + + /** 数据盘大小,如果有多块数据盘会汇总展示,不包括PVC */ + @SerializedName("DataDiskSize") + private Integer dataDiskSize; + /** 节点的GPU颗数。 */ @SerializedName("GPU") private Integer gpu; + /** 节点池id */ + @SerializedName("NodeGroupId") + private String nodeGroupId; + + /** 边缘机房id */ + @SerializedName("IDCId") + private String idcId; + + /** 边缘机房 */ + @SerializedName("IDCName") + private String idcName; + + /** 节点主机备注信息 */ + @SerializedName("Remark") + private String remark; + + /** 节点GPU型号(如果为GPU机型) */ + @SerializedName("GPUType") + private String gpuType; + + /** 是否启用了容器镜像加速 */ + @SerializedName("ImageAccelable") + private Boolean imageAccelable; + + /** 节点所属业务组 */ + @SerializedName("Tag") + private String tag; + + /** Pod CIDR */ + @SerializedName("PodCIDR") + private String podCIDR; + + /** 节点所属节点池名称 */ + @SerializedName("NodeGroupName") + private String nodeGroupName; + public String getZone() { return zone; } @@ -209,6 +309,22 @@ public void setMachineType(String machineType) { this.machineType = machineType; } + public String getCPUPlatform() { + return cpuPlatform; + } + + public void setCPUPlatform(String cpuPlatform) { + this.cpuPlatform = cpuPlatform; + } + + public String getUHostFamily() { + return uHostFamily; + } + + public void setUHostFamily(String uHostFamily) { + this.uHostFamily = uHostFamily; + } + public String getOsType() { return osType; } @@ -297,6 +413,118 @@ public void setNodeLogInfo(String nodeLogInfo) { this.nodeLogInfo = nodeLogInfo; } + public List getLabels() { + return labels; + } + + public void setLabels(List labels) { + this.labels = labels; + } + + public String getKubeletVersion() { + return kubeletVersion; + } + + public void setKubeletVersion(String kubeletVersion) { + this.kubeletVersion = kubeletVersion; + } + + public Integer getMaxPod() { + return maxPod; + } + + public void setMaxPod(Integer maxPod) { + this.maxPod = maxPod; + } + + public Integer getMaxMemory() { + return maxMemory; + } + + public void setMaxMemory(Integer maxMemory) { + this.maxMemory = maxMemory; + } + + public Integer getMaxCPU() { + return maxCPU; + } + + public void setMaxCPU(Integer maxCPU) { + this.maxCPU = maxCPU; + } + + public Integer getRequestPod() { + return requestPod; + } + + public void setRequestPod(Integer requestPod) { + this.requestPod = requestPod; + } + + public Integer getRequestMemory() { + return requestMemory; + } + + public void setRequestMemory(Integer requestMemory) { + this.requestMemory = requestMemory; + } + + public Integer getRequestCPU() { + return requestCPU; + } + + public void setRequestCPU(Integer requestCPU) { + this.requestCPU = requestCPU; + } + + public String getRuntimeVersion() { + return runtimeVersion; + } + + public void setRuntimeVersion(String runtimeVersion) { + this.runtimeVersion = runtimeVersion; + } + + public String getRuntimeName() { + return runtimeName; + } + + public void setRuntimeName(String runtimeName) { + this.runtimeName = runtimeName; + } + + public Integer getUsedCPU() { + return usedCPU; + } + + public void setUsedCPU(Integer usedCPU) { + this.usedCPU = usedCPU; + } + + public Integer getUsedMemory() { + return usedMemory; + } + + public void setUsedMemory(Integer usedMemory) { + this.usedMemory = usedMemory; + } + + public Integer getBootDiskSize() { + return bootDiskSize; + } + + public void setBootDiskSize(Integer bootDiskSize) { + this.bootDiskSize = bootDiskSize; + } + + public Integer getDataDiskSize() { + return dataDiskSize; + } + + public void setDataDiskSize(Integer dataDiskSize) { + this.dataDiskSize = dataDiskSize; + } + public Integer getGPU() { return gpu; } @@ -304,6 +532,78 @@ public Integer getGPU() { public void setGPU(Integer gpu) { this.gpu = gpu; } + + public String getNodeGroupId() { + return nodeGroupId; + } + + public void setNodeGroupId(String nodeGroupId) { + this.nodeGroupId = nodeGroupId; + } + + public String getIDCId() { + return idcId; + } + + public void setIDCId(String idcId) { + this.idcId = idcId; + } + + public String getIDCName() { + return idcName; + } + + public void setIDCName(String idcName) { + this.idcName = idcName; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getGPUType() { + return gpuType; + } + + public void setGPUType(String gpuType) { + this.gpuType = gpuType; + } + + public Boolean getImageAccelable() { + return imageAccelable; + } + + public void setImageAccelable(Boolean imageAccelable) { + this.imageAccelable = imageAccelable; + } + + public String getTag() { + return tag; + } + + public void setTag(String tag) { + this.tag = tag; + } + + public String getPodCIDR() { + return podCIDR; + } + + public void setPodCIDR(String podCIDR) { + this.podCIDR = podCIDR; + } + + public String getNodeGroupName() { + return nodeGroupName; + } + + public void setNodeGroupName(String nodeGroupName) { + this.nodeGroupName = nodeGroupName; + } } public static class UHostIPSet extends Response { @@ -336,6 +636,14 @@ public static class UHostIPSet extends Response { @SerializedName("Mac") private String mac; + /** IP 协议类型 */ + @SerializedName("IPMode") + private String ipMode; + + /** 网络接口资源 ID */ + @SerializedName("NetworkInterfaceId") + private String networkInterfaceId; + public String getType() { return type; } @@ -391,5 +699,21 @@ public String getMac() { public void setMac(String mac) { this.mac = mac; } + + public String getIPMode() { + return ipMode; + } + + public void setIPMode(String ipMode) { + this.ipMode = ipMode; + } + + public String getNetworkInterfaceId() { + return networkInterfaceId; + } + + public void setNetworkInterfaceId(String networkInterfaceId) { + this.networkInterfaceId = networkInterfaceId; + } } } diff --git a/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/ListUK8SClusterV2Response.java b/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/ListUK8SClusterV2Response.java index e27723086..206017846 100644 --- a/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/ListUK8SClusterV2Response.java +++ b/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/ListUK8SClusterV2Response.java @@ -29,6 +29,10 @@ public class ListUK8SClusterV2Response extends Response { @SerializedName("ClusterSet") private List clusterSet; + /** 总数 */ + @SerializedName("TotalCount") + private Integer totalCount; + public Integer getClusterCount() { return clusterCount; } @@ -45,6 +49,14 @@ public void setClusterSet(List clusterSet) { this.clusterSet = clusterSet; } + public Integer getTotalCount() { + return totalCount; + } + + public void setTotalCount(Integer totalCount) { + this.totalCount = totalCount; + } + public static class ClusterSet extends Response { /** 资源名字 */ @@ -71,6 +83,10 @@ public static class ClusterSet extends Response { @SerializedName("ServiceCIDR") private String serviceCIDR; + /** CNI网络模式 */ + @SerializedName("CNIMode") + private String cniMode; + /** Master 节点数量 */ @SerializedName("MasterCount") private Integer masterCount; @@ -83,6 +99,26 @@ public static class ClusterSet extends Response { @SerializedName("K8sVersion") private String k8sVersion; + /** 删除保护开关。0表示不开启,1表示开启。默认不开启 */ + @SerializedName("DeleteProtection") + private Integer deleteProtection; + + /** 容器运行时名称 */ + @SerializedName("RuntimeName") + private String runtimeName; + + /** 容器运行时版本号,docker 或 containerd 版本 */ + @SerializedName("RuntimeVersion") + private String runtimeVersion; + + /** 计费/管理形态,区分"专有版"和"托管版"两种售卖形态 */ + @SerializedName("ClusterType") + private String clusterType; + + /** API Server 内部回环客户端证书 */ + @SerializedName("LoopbackClientCert") + private LoopbackClientCert loopbackClientCert; + /** 创建集群时判断如果为NORESOURCE则为没资源,否则为空 */ @SerializedName("ClusterLogInfo") private String clusterLogInfo; @@ -153,6 +189,14 @@ public void setServiceCIDR(String serviceCIDR) { this.serviceCIDR = serviceCIDR; } + public String getCNIMode() { + return cniMode; + } + + public void setCNIMode(String cniMode) { + this.cniMode = cniMode; + } + public Integer getMasterCount() { return masterCount; } @@ -177,6 +221,46 @@ public void setK8sVersion(String k8sVersion) { this.k8sVersion = k8sVersion; } + public Integer getDeleteProtection() { + return deleteProtection; + } + + public void setDeleteProtection(Integer deleteProtection) { + this.deleteProtection = deleteProtection; + } + + public String getRuntimeName() { + return runtimeName; + } + + public void setRuntimeName(String runtimeName) { + this.runtimeName = runtimeName; + } + + public String getRuntimeVersion() { + return runtimeVersion; + } + + public void setRuntimeVersion(String runtimeVersion) { + this.runtimeVersion = runtimeVersion; + } + + public String getClusterType() { + return clusterType; + } + + public void setClusterType(String clusterType) { + this.clusterType = clusterType; + } + + public LoopbackClientCert getLoopbackClientCert() { + return loopbackClientCert; + } + + public void setLoopbackClientCert(LoopbackClientCert loopbackClientCert) { + this.loopbackClientCert = loopbackClientCert; + } + public String getClusterLogInfo() { return clusterLogInfo; } @@ -217,4 +301,31 @@ public void setStatus(String status) { this.status = status; } } + + public static class LoopbackClientCert extends Response { + + /** 证书到期时间 */ + @SerializedName("ExpireTime") + private Integer expireTime; + + /** 证书是否进入过期告警状态 */ + @SerializedName("Warn") + private Boolean warn; + + public Integer getExpireTime() { + return expireTime; + } + + public void setExpireTime(Integer expireTime) { + this.expireTime = expireTime; + } + + public Boolean getWarn() { + return warn; + } + + public void setWarn(Boolean warn) { + this.warn = warn; + } + } } diff --git a/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/ListUK8SNodeGroupResponse.java b/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/ListUK8SNodeGroupResponse.java index 84173ddcf..1c08dab1a 100644 --- a/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/ListUK8SNodeGroupResponse.java +++ b/ucloud-sdk-java-uk8s/src/main/java/cn/ucloud/uk8s/models/ListUK8SNodeGroupResponse.java @@ -33,8 +33,398 @@ public void setNodeGroupList(List nodeGroupList) { this.nodeGroupList = nodeGroupList; } + public static class DiskSet extends Response { + + /** 磁盘类型。系统盘: Boot,数据盘: Data,网络盘:Udisk */ + @SerializedName("Type") + private String type; + + /** 磁盘长ID */ + @SerializedName("DiskId") + private String diskId; + + /** UDisk名字(仅当磁盘是UDisk时返回) */ + @SerializedName("Name") + private String name; + + /** 磁盘盘符 */ + @SerializedName("Drive") + private String drive; + + /** 磁盘大小,单位: GB */ + @SerializedName("Size") + private Integer size; + + /** 备份方案,枚举类型:BASIC_SNAPSHOT,普通快照;DATAARK,方舟。无快照则不返回该字段。 */ + @SerializedName("BackupType") + private String backupType; + + /** 当前主机的IOPS值 */ + @SerializedName("IOPS") + private Integer iops; + + /** Yes: 加密 No: 非加密 */ + @SerializedName("Encrypted") + private String encrypted; + + /** LOCAL_NOMAL| CLOUD_NORMAL| LOCAL_SSD| CLOUD_SSD|EXCLUSIVE_LOCAL_DISK */ + @SerializedName("DiskType") + private String diskType; + + /** True| False */ + @SerializedName("IsBoot") + private String isBoot; + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getDiskId() { + return diskId; + } + + public void setDiskId(String diskId) { + this.diskId = diskId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getDrive() { + return drive; + } + + public void setDrive(String drive) { + this.drive = drive; + } + + public Integer getSize() { + return size; + } + + public void setSize(Integer size) { + this.size = size; + } + + public String getBackupType() { + return backupType; + } + + public void setBackupType(String backupType) { + this.backupType = backupType; + } + + public Integer getIOPS() { + return iops; + } + + public void setIOPS(Integer iops) { + this.iops = iops; + } + + public String getEncrypted() { + return encrypted; + } + + public void setEncrypted(String encrypted) { + this.encrypted = encrypted; + } + + public String getDiskType() { + return diskType; + } + + public void setDiskType(String diskType) { + this.diskType = diskType; + } + + public String getIsBoot() { + return isBoot; + } + + public void setIsBoot(String isBoot) { + this.isBoot = isBoot; + } + } + + public static class EIP extends Response { + + /** + * 【若绑定EIP,此参数必填】弹性IP的外网带宽, 单位为Mbps. 共享带宽模式下非必传, 非共享带宽模式必须指定非0Mbps带宽. 各地域非共享带宽的带宽范围如下: + * 流量计费[1-300],带宽计费[1-800] + */ + @SerializedName("Bandwidth") + private Integer bandwidth; + + /** + * 弹性IP的计费模式. 枚举值: "Traffic", 流量计费; "Bandwidth", 带宽计费; "ShareBandwidth",共享带宽模式. + * "Free":免费带宽模式,默认为 "Bandwidth" + */ + @SerializedName("PayMode") + private String payMode; + + /** 绑定的共享带宽Id,仅当PayMode为ShareBandwidth时有效 */ + @SerializedName("ShareBandwidthId") + private String shareBandwidthId; + + /** + * 【若绑定EIP,此参数必填】弹性IP的线路。枚举值: 国际: International,BGP: Bgp。 各地域允许的线路参数如下: cn-sh1: Bgp cn-sh2: + * Bgp cn-gd: Bgp cn-bj1: Bgp cn-bj2: Bgp hk: International us-ca: International th-bkk: + * International kr-seoul:International us-ws:International ge-fra:International + * sg:International tw-kh:International.其他海外线路均为 International + */ + @SerializedName("OperatorName") + private String operatorName; + + /** 当前EIP代金券id。请通过DescribeCoupon接口查询,或登录用户中心查看。 */ + @SerializedName("CouponId") + private String couponId; + + public Integer getBandwidth() { + return bandwidth; + } + + public void setBandwidth(Integer bandwidth) { + this.bandwidth = bandwidth; + } + + public String getPayMode() { + return payMode; + } + + public void setPayMode(String payMode) { + this.payMode = payMode; + } + + public String getShareBandwidthId() { + return shareBandwidthId; + } + + public void setShareBandwidthId(String shareBandwidthId) { + this.shareBandwidthId = shareBandwidthId; + } + + public String getOperatorName() { + return operatorName; + } + + public void setOperatorName(String operatorName) { + this.operatorName = operatorName; + } + + public String getCouponId() { + return couponId; + } + + public void setCouponId(String couponId) { + this.couponId = couponId; + } + } + + public static class EvictionCondition extends Response { + + /** 内存相关驱逐条件或宽限时间。 */ + @SerializedName("MemoryAvailable") + private String memoryAvailable; + + /** 镜像文件系统存储相关驱逐条件或宽限时间。 */ + @SerializedName("ImagefsAvailable") + private String imagefsAvailable; + + /** 节点存储余量相关驱逐条件或宽限时间。 */ + @SerializedName("NodefsAvailable") + private String nodefsAvailable; + + /** 节点剩余inodes驱逐条件或宽限时间。 */ + @SerializedName("NodefsInodesFree") + private String nodefsInodesFree; + + public String getMemoryAvailable() { + return memoryAvailable; + } + + public void setMemoryAvailable(String memoryAvailable) { + this.memoryAvailable = memoryAvailable; + } + + public String getImagefsAvailable() { + return imagefsAvailable; + } + + public void setImagefsAvailable(String imagefsAvailable) { + this.imagefsAvailable = imagefsAvailable; + } + + public String getNodefsAvailable() { + return nodefsAvailable; + } + + public void setNodefsAvailable(String nodefsAvailable) { + this.nodefsAvailable = nodefsAvailable; + } + + public String getNodefsInodesFree() { + return nodefsInodesFree; + } + + public void setNodefsInodesFree(String nodefsInodesFree) { + this.nodefsInodesFree = nodefsInodesFree; + } + } + + public static class KubeletConfiguration extends Response { + + /** 最大日志文件数量 */ + @SerializedName("ContainerLogMaxFiles") + private Integer containerLogMaxFiles; + + /** 最大日志文件大小 */ + @SerializedName("ContainerLogMaxSize") + private String containerLogMaxSize; + + /** 硬性驱逐条件,EvictionCondition类型 */ + @SerializedName("EvictionHard") + private EvictionCondition evictionHard; + + /** 软性驱逐条件,EvictionCondition类型 */ + @SerializedName("EvictionSoft") + private EvictionCondition evictionSoft; + + /** 软性驱逐宽限时间,EvictionCondition类型 */ + @SerializedName("EvictionSoftGracePeriod") + private EvictionCondition evictionSoftGracePeriod; + + /** 镜像垃圾收集阈值 */ + @SerializedName("ImageGCHighThresholdPercent") + private Integer imageGCHighThresholdPercent; + + /** 停止镜像垃圾收集阈值 */ + @SerializedName("ImageGCLowThresholdPercent") + private Integer imageGCLowThresholdPercent; + + /** kubelet预留资源,ReservedResource类型 */ + @SerializedName("KubeReserved") + private ReservedResource kubeReserved; + + /** 系统预留资源,ReservedResource类型 */ + @SerializedName("SystemReserved") + private ReservedResource systemReserved; + + /** 最大Pod数量 */ + @SerializedName("MaxPods") + private Integer maxPods; + + public Integer getContainerLogMaxFiles() { + return containerLogMaxFiles; + } + + public void setContainerLogMaxFiles(Integer containerLogMaxFiles) { + this.containerLogMaxFiles = containerLogMaxFiles; + } + + public String getContainerLogMaxSize() { + return containerLogMaxSize; + } + + public void setContainerLogMaxSize(String containerLogMaxSize) { + this.containerLogMaxSize = containerLogMaxSize; + } + + public EvictionCondition getEvictionHard() { + return evictionHard; + } + + public void setEvictionHard(EvictionCondition evictionHard) { + this.evictionHard = evictionHard; + } + + public EvictionCondition getEvictionSoft() { + return evictionSoft; + } + + public void setEvictionSoft(EvictionCondition evictionSoft) { + this.evictionSoft = evictionSoft; + } + + public EvictionCondition getEvictionSoftGracePeriod() { + return evictionSoftGracePeriod; + } + + public void setEvictionSoftGracePeriod(EvictionCondition evictionSoftGracePeriod) { + this.evictionSoftGracePeriod = evictionSoftGracePeriod; + } + + public Integer getImageGCHighThresholdPercent() { + return imageGCHighThresholdPercent; + } + + public void setImageGCHighThresholdPercent(Integer imageGCHighThresholdPercent) { + this.imageGCHighThresholdPercent = imageGCHighThresholdPercent; + } + + public Integer getImageGCLowThresholdPercent() { + return imageGCLowThresholdPercent; + } + + public void setImageGCLowThresholdPercent(Integer imageGCLowThresholdPercent) { + this.imageGCLowThresholdPercent = imageGCLowThresholdPercent; + } + + public ReservedResource getKubeReserved() { + return kubeReserved; + } + + public void setKubeReserved(ReservedResource kubeReserved) { + this.kubeReserved = kubeReserved; + } + + public ReservedResource getSystemReserved() { + return systemReserved; + } + + public void setSystemReserved(ReservedResource systemReserved) { + this.systemReserved = systemReserved; + } + + public Integer getMaxPods() { + return maxPods; + } + + public void setMaxPods(Integer maxPods) { + this.maxPods = maxPods; + } + } + + public static class NetworkInterface extends Response { + + /** EIP */ + @SerializedName("EIP") + private EIP eip; + + public EIP getEIP() { + return eip; + } + + public void setEIP(EIP eip) { + this.eip = eip; + } + } + public static class NodeGroupSet extends Response { + /** 可用区。参见 [可用区列表](https://docs.ucloud.cn/api/summary/regionlist) */ + @SerializedName("Zone") + private String zone; + /** 节点池ID */ @SerializedName("NodeGroupId") private String nodeGroupId; @@ -43,6 +433,10 @@ public static class NodeGroupSet extends Response { @SerializedName("NodeGroupName") private String nodeGroupName; + /** 自定义Uhost主机名前缀。完整的自定义Uhost主机名为{NodeNamePrefix}-{NodeIP}。 */ + @SerializedName("NodeNamePrefix") + private String nodeNamePrefix; + /** 镜像ID */ @SerializedName("ImageId") private String imageId; @@ -55,6 +449,10 @@ public static class NodeGroupSet extends Response { @SerializedName("MinimalCpuPlatform") private String minimalCpuPlatform; + /** 主机规格族 */ + @SerializedName("UHostFamily") + private String uHostFamily; + /** 虚拟CPU核数 */ @SerializedName("CPU") private Integer cpu; @@ -99,6 +497,105 @@ public static class NodeGroupSet extends Response { @SerializedName("NodeList") private List nodeList; + /** 子网 ID。默认为集群创建时填写的子网ID,也可以填写集群同VPC内的子网ID。 */ + @SerializedName("SubnetId") + private String subnetId; + + /** 硬件隔离组id。可通过DescribeIsolationGroup获取。 */ + @SerializedName("IsolationGroupId") + private String isolationGroupId; + + /** int 默认110,生产环境建议小于等于110。 */ + @SerializedName("MaxPods") + private Integer maxPods; + + /** 用户自定义数据。当镜像支持Cloud-init Feature时可填写此字段。注意:1、总数据量大小不超过 16K;2、使用base64编码。 */ + @SerializedName("UserData") + private String userData; + + /** 用户自定义Shell脚本。与UserData的区别在于InitScript在节点初始化完毕后才执行,UserData则是云主机初始化时执行。 */ + @SerializedName("InitScript") + private String initScript; + + /** Node节点污点,形式为key=value:effect,多组taints用”,“隔开,最多支持五组。 */ + @SerializedName("Taints") + private String taints; + + /** Node节点标签。key=value形式,多组用”,“隔开,最多5组。 如env=pro,type=game */ + @SerializedName("Labels") + private String labels; + + /** Node所属的安全组id(最多5个) */ + @SerializedName("SecGroupId") + private List secGroupId; + + /** 主机安全模式。Firewall:防火墙;SecGroup:安全组;默认值:Firewall。 */ + @SerializedName("SecurityMode") + private String securityMode; + + /** + * 防火墙ID,默认:Web推荐防火墙。如何查询SecurityGroupId请参见 + * [DescribeFirewall](api/unet-api/describe_firewall.html)。 + */ + @SerializedName("SecurityGroupId") + private String securityGroupId; + + /** Node节点网卡配置 */ + @SerializedName("NetworkInterface") + private List networkInterface; + + /** KubeletConfiguration */ + @SerializedName("KubeletConfiguration") + private KubeletConfiguration kubeletConfiguration; + + /** 镜像名称 */ + @SerializedName("ImageName") + private String imageName; + + /** 镜像类型 */ + @SerializedName("ImageType") + private String imageType; + + /** 操作系统类型 */ + @SerializedName("OsType") + private String osType; + + /** 操作系统名称 */ + @SerializedName("OsName") + private String osName; + + /** 网络配置 */ + @SerializedName("NetCapability") + private String netCapability; + + /** 是否启用 UNI 网络特性 */ + @SerializedName("UNIFeature") + private Boolean uniFeature; + + /** 磁盘列表 */ + @SerializedName("Disks") + private List disks; + + /** 节点池关联的弹性伸缩组ID */ + @SerializedName("RelatedAsg") + private List relatedAsg; + + /** 节点池创建时间 */ + @SerializedName("CreateTime") + private Integer createTime; + + /** 节点池更新时间 */ + @SerializedName("UpdateTime") + private Integer updateTime; + + public String getZone() { + return zone; + } + + public void setZone(String zone) { + this.zone = zone; + } + public String getNodeGroupId() { return nodeGroupId; } @@ -115,6 +612,14 @@ public void setNodeGroupName(String nodeGroupName) { this.nodeGroupName = nodeGroupName; } + public String getNodeNamePrefix() { + return nodeNamePrefix; + } + + public void setNodeNamePrefix(String nodeNamePrefix) { + this.nodeNamePrefix = nodeNamePrefix; + } + public String getImageId() { return imageId; } @@ -139,6 +644,14 @@ public void setMinimalCpuPlatform(String minimalCpuPlatform) { this.minimalCpuPlatform = minimalCpuPlatform; } + public String getUHostFamily() { + return uHostFamily; + } + + public void setUHostFamily(String uHostFamily) { + this.uHostFamily = uHostFamily; + } + public Integer getCPU() { return cpu; } @@ -226,5 +739,271 @@ public List getNodeList() { public void setNodeList(List nodeList) { this.nodeList = nodeList; } + + public String getSubnetId() { + return subnetId; + } + + public void setSubnetId(String subnetId) { + this.subnetId = subnetId; + } + + public String getIsolationGroupId() { + return isolationGroupId; + } + + public void setIsolationGroupId(String isolationGroupId) { + this.isolationGroupId = isolationGroupId; + } + + public Integer getMaxPods() { + return maxPods; + } + + public void setMaxPods(Integer maxPods) { + this.maxPods = maxPods; + } + + public String getUserData() { + return userData; + } + + public void setUserData(String userData) { + this.userData = userData; + } + + public String getInitScript() { + return initScript; + } + + public void setInitScript(String initScript) { + this.initScript = initScript; + } + + public String getTaints() { + return taints; + } + + public void setTaints(String taints) { + this.taints = taints; + } + + public String getLabels() { + return labels; + } + + public void setLabels(String labels) { + this.labels = labels; + } + + public List getSecGroupId() { + return secGroupId; + } + + public void setSecGroupId(List secGroupId) { + this.secGroupId = secGroupId; + } + + public String getSecurityMode() { + return securityMode; + } + + public void setSecurityMode(String securityMode) { + this.securityMode = securityMode; + } + + public String getSecurityGroupId() { + return securityGroupId; + } + + public void setSecurityGroupId(String securityGroupId) { + this.securityGroupId = securityGroupId; + } + + public List getNetworkInterface() { + return networkInterface; + } + + public void setNetworkInterface(List networkInterface) { + this.networkInterface = networkInterface; + } + + public KubeletConfiguration getKubeletConfiguration() { + return kubeletConfiguration; + } + + public void setKubeletConfiguration(KubeletConfiguration kubeletConfiguration) { + this.kubeletConfiguration = kubeletConfiguration; + } + + public String getImageName() { + return imageName; + } + + public void setImageName(String imageName) { + this.imageName = imageName; + } + + public String getImageType() { + return imageType; + } + + public void setImageType(String imageType) { + this.imageType = imageType; + } + + public String getOsType() { + return osType; + } + + public void setOsType(String osType) { + this.osType = osType; + } + + public String getOsName() { + return osName; + } + + public void setOsName(String osName) { + this.osName = osName; + } + + public String getNetCapability() { + return netCapability; + } + + public void setNetCapability(String netCapability) { + this.netCapability = netCapability; + } + + public Boolean getUNIFeature() { + return uniFeature; + } + + public void setUNIFeature(Boolean uniFeature) { + this.uniFeature = uniFeature; + } + + public List getDisks() { + return disks; + } + + public void setDisks(List disks) { + this.disks = disks; + } + + public List getRelatedAsg() { + return relatedAsg; + } + + public void setRelatedAsg(List relatedAsg) { + this.relatedAsg = relatedAsg; + } + + public Integer getCreateTime() { + return createTime; + } + + public void setCreateTime(Integer createTime) { + this.createTime = createTime; + } + + public Integer getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Integer updateTime) { + this.updateTime = updateTime; + } + } + + public static class ReservedResource extends Response { + + /** CPU */ + @SerializedName("CPU") + private String cpu; + + /** 内存 */ + @SerializedName("Memory") + private String memory; + + /** 存储 */ + @SerializedName("EphemeralStorage") + private String ephemeralStorage; + + /** Pid */ + @SerializedName("Pid") + private String pid; + + public String getCPU() { + return cpu; + } + + public void setCPU(String cpu) { + this.cpu = cpu; + } + + public String getMemory() { + return memory; + } + + public void setMemory(String memory) { + this.memory = memory; + } + + public String getEphemeralStorage() { + return ephemeralStorage; + } + + public void setEphemeralStorage(String ephemeralStorage) { + this.ephemeralStorage = ephemeralStorage; + } + + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + } + + public static class SecGroupId extends Response { + + /** 安全组名称 */ + @SerializedName("Id") + private String id; + + /** 安全组id */ + @SerializedName("Name") + private String name; + + /** 安全组优先级 */ + @SerializedName("Priority") + private String priority; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPriority() { + return priority; + } + + public void setPriority(String priority) { + this.priority = priority; + } } } diff --git a/ucloud-sdk-java-ukafka/pom.xml b/ucloud-sdk-java-ukafka/pom.xml index 58fce0718..74269af7e 100644 --- a/ucloud-sdk-java-ukafka/pom.xml +++ b/ucloud-sdk-java-ukafka/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-ukafka ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-ulb/pom.xml b/ucloud-sdk-java-ulb/pom.xml index 47518c8f0..5c4d4fb46 100644 --- a/ucloud-sdk-java-ulb/pom.xml +++ b/ucloud-sdk-java-ulb/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-ulb ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-ulighthost/pom.xml b/ucloud-sdk-java-ulighthost/pom.xml index d0023a5b0..7f32ba71e 100644 --- a/ucloud-sdk-java-ulighthost/pom.xml +++ b/ucloud-sdk-java-ulighthost/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-ulighthost ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-ulog/pom.xml b/ucloud-sdk-java-ulog/pom.xml index 5b5f27ce7..7dc0d1cb5 100644 --- a/ucloud-sdk-java-ulog/pom.xml +++ b/ucloud-sdk-java-ulog/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-ulog ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-umem/pom.xml b/ucloud-sdk-java-umem/pom.xml index a4fe69f1a..4a78cfd08 100644 --- a/ucloud-sdk-java-umem/pom.xml +++ b/ucloud-sdk-java-umem/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-umem ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-umon/pom.xml b/ucloud-sdk-java-umon/pom.xml index 92f208f30..a72c5020e 100644 --- a/ucloud-sdk-java-umon/pom.xml +++ b/ucloud-sdk-java-umon/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-umon ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-umongodb/pom.xml b/ucloud-sdk-java-umongodb/pom.xml index 0beae1735..1b934fe41 100644 --- a/ucloud-sdk-java-umongodb/pom.xml +++ b/ucloud-sdk-java-umongodb/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-umongodb ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-unet/pom.xml b/ucloud-sdk-java-unet/pom.xml index b2df58c6b..8358b7fe0 100644 --- a/ucloud-sdk-java-unet/pom.xml +++ b/ucloud-sdk-java-unet/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-unet ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-upfs/pom.xml b/ucloud-sdk-java-upfs/pom.xml index 2be43e6e5..04de832b6 100644 --- a/ucloud-sdk-java-upfs/pom.xml +++ b/ucloud-sdk-java-upfs/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-upfs ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-upgsql/pom.xml b/ucloud-sdk-java-upgsql/pom.xml index ac40bc234..28a3f6f14 100644 --- a/ucloud-sdk-java-upgsql/pom.xml +++ b/ucloud-sdk-java-upgsql/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-upgsql ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-uphone/pom.xml b/ucloud-sdk-java-uphone/pom.xml index 5b35af08d..2821d2646 100644 --- a/ucloud-sdk-java-uphone/pom.xml +++ b/ucloud-sdk-java-uphone/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-uphone ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-uphost/pom.xml b/ucloud-sdk-java-uphost/pom.xml index 02dbe7de2..c55d39c7d 100644 --- a/ucloud-sdk-java-uphost/pom.xml +++ b/ucloud-sdk-java-uphost/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-uphost ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-uslk/pom.xml b/ucloud-sdk-java-uslk/pom.xml index 6d1f7ea60..1971919f6 100644 --- a/ucloud-sdk-java-uslk/pom.xml +++ b/ucloud-sdk-java-uslk/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-uslk ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-usms/pom.xml b/ucloud-sdk-java-usms/pom.xml index 10997a529..0596f65ce 100644 --- a/ucloud-sdk-java-usms/pom.xml +++ b/ucloud-sdk-java-usms/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-usms ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-usnap/pom.xml b/ucloud-sdk-java-usnap/pom.xml index a7e7f52ea..36228ef21 100644 --- a/ucloud-sdk-java-usnap/pom.xml +++ b/ucloud-sdk-java-usnap/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-usnap ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-uvms/pom.xml b/ucloud-sdk-java-uvms/pom.xml index 67717b5ce..6d2803aec 100644 --- a/ucloud-sdk-java-uvms/pom.xml +++ b/ucloud-sdk-java-uvms/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-uvms ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-uwsc/pom.xml b/ucloud-sdk-java-uwsc/pom.xml index 25a2e0e61..10e65dfe4 100644 --- a/ucloud-sdk-java-uwsc/pom.xml +++ b/ucloud-sdk-java-uwsc/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-uwsc ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release diff --git a/ucloud-sdk-java-vpc/pom.xml b/ucloud-sdk-java-vpc/pom.xml index 841855135..f8d7ebbca 100644 --- a/ucloud-sdk-java-vpc/pom.xml +++ b/ucloud-sdk-java-vpc/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.72-release + 1.2.73-release 4.0.0 ucloud-sdk-java-vpc ucloud-sdk-java - 1.2.72-release + 1.2.73-release cn.ucloud ucloud-sdk-java-common - 1.2.72-release + 1.2.73-release