Staging v0.11.22 with k8s validation skip option

Author: cb-github-robot

assets/k8sclusterinfo.yaml

@@ -116,14 +116,10 @@ k8scluster:
       # ap-northeast-1,ap-northeast-2,ap-southeast-1,ap-southeast-3,ap-southeast-5,us-west-1,us-east-1,eu-central-1,eu-west-1,cn-beijing,cn-hongkong,cn-shanghai,cn-huhehaote,cn-heyuan,cn-wulanchabu,cn-guangzhou
       - region: [common] 
         available:
-          # Versions 1.33 and 1.34 are officially released but not yet fully supported by Alibaba Cloud API
-          # CB-Spider fails with "failed to get valid runtime version" error when creating clusters with these versions
-          # This is due to incomplete runtime metadata availability in Alibaba Cloud's DescribeKubernetesVersionMetadata API
-          # Use 1.32 or 1.31 until Alibaba Cloud fully deploys these versions across all regions
-          # - name: "1.34"
-          #   id: "1.34.3-aliyun.1"
-          # - name: "1.33"
-          #   id: "1.33.3-aliyun.1"
+          - name: "1.34"
+            id: "1.34.1-aliyun.1"
+          - name: "1.33"
+            id: "1.33.3-aliyun.1"
           - name: "1.32"
             id: "1.32.7-aliyun.1"
           - name: "1.31"

docker-compose.yaml

@@ -24,7 +24,7 @@ services:
 
   # CB-Tumblebug
   cb-tumblebug:
-    image: cloudbaristaorg/cb-tumblebug:0.11.21
+    image: cloudbaristaorg/cb-tumblebug:0.11.22
     container_name: cb-tumblebug
     build:
       context: .
@@ -164,7 +164,7 @@ services:
 
   # CB-Spider
   cb-spider:
-    image: cloudbaristaorg/cb-spider:0.11.18
+    image: cloudbaristaorg/cb-spider:0.11.19
     container_name: cb-spider
     # build:
     #   context: ../cb-spider
@@ -199,7 +199,7 @@ services:
   # CB-MapUI
   # This is the Map-based client for CB-Tumblebug.
   cb-mapui:
-    image: cloudbaristaorg/cb-mapui:0.11.20
+    image: cloudbaristaorg/cb-mapui:0.11.21
     container_name: cb-mapui
     labels:
       # Explicitly tell Traefik to expose this container

src/core/infra/provisioning.go

@@ -3473,7 +3473,7 @@ func checkCommonResAvailableForK8sNodeGroupDynamicReq(connName string, dReq *mod
 }
 
 // getK8sClusterReqFromDynamicReq is func to get K8sClusterReq from K8sClusterDynamicReq
-func getK8sClusterReqFromDynamicReq(reqID string, nsId string, dReq *model.K8sClusterDynamicReq) (*model.K8sClusterReq, error) {
+func getK8sClusterReqFromDynamicReq(reqID string, nsId string, dReq *model.K8sClusterDynamicReq, skipVersionCheck bool) (*model.K8sClusterReq, error) {
 	onDemand := true
 
 	emptyK8sReq := &model.K8sClusterReq{}
@@ -3487,10 +3487,24 @@ func getK8sClusterReqFromDynamicReq(reqID string, nsId string, dReq *model.K8sCl
 	}
 	k8sngReq.SpecId = specInfo.Id
 
-	k8sRecVersion, err := getK8sRecommendVersion(specInfo.ProviderName, specInfo.RegionName, dReq.Version)
-	if err != nil {
-		log.Err(err).Msg("")
-		return emptyK8sReq, err
+	var k8sRecVersion string
+	if skipVersionCheck {
+		// Use the requested version directly without validation
+		k8sRecVersion = dReq.Version
+		if k8sRecVersion == "" {
+			// If skipVersionCheck is true, an explicit version must be provided
+			err := fmt.Errorf("skipVersionCheck is true but no version is specified; an explicit version must be provided")
+			log.Err(err).Msg("")
+			return emptyK8sReq, err
+		}
+		log.Warn().Msgf("K8sCluster version validation skipped for version: %s (dynamic)", k8sRecVersion)
+	} else {
+		// Normal validation path
+		k8sRecVersion, err = getK8sRecommendVersion(specInfo.ProviderName, specInfo.RegionName, dReq.Version)
+		if err != nil {
+			log.Err(err).Msg("")
+			return emptyK8sReq, err
+		}
 	}
 
 	// If ConnectionName is specified by the request, Use ConnectionName from the request
@@ -3648,7 +3662,7 @@ func getK8sClusterReqFromDynamicReq(reqID string, nsId string, dReq *model.K8sCl
 }
 
 // CreateK8sClusterDynamic is func to create K8sCluster obeject and deploy requested K8sCluster and NodeGroup in a dynamic way
-func CreateK8sClusterDynamic(reqID string, nsId string, dReq *model.K8sClusterDynamicReq, deployOption string) (*model.K8sClusterInfo, error) {
+func CreateK8sClusterDynamic(reqID string, nsId string, dReq *model.K8sClusterDynamicReq, deployOption string, skipVersionCheck bool) (*model.K8sClusterInfo, error) {
 	emptyK8sCluster := &model.K8sClusterInfo{}
 	err := common.CheckString(nsId)
 	if err != nil {
@@ -3673,7 +3687,7 @@ func CreateK8sClusterDynamic(reqID string, nsId string, dReq *model.K8sClusterDy
 	}
 
 	//If not, generate default resources dynamically.
-	k8sReq, err := getK8sClusterReqFromDynamicReq(reqID, nsId, dReq)
+	k8sReq, err := getK8sClusterReqFromDynamicReq(reqID, nsId, dReq, skipVersionCheck)
 	if err != nil {
 		log.Err(err).Msg("Failed to get shared resources for dynamic K8sCluster creation")
 		return emptyK8sCluster, err
@@ -3706,8 +3720,7 @@ func CreateK8sClusterDynamic(reqID string, nsId string, dReq *model.K8sClusterDy
 		option = "hold"
 	}
 
-	// Default: version check is enabled (skipVersionCheck = false)
-	skipVersionCheck := false
+	// skipVersionCheck parameter is passed from function argument
 	return resource.CreateK8sCluster(nsId, k8sReq, option, skipVersionCheck)
 }
 

src/interface/rest/docs/docs.go

@@ -3816,6 +3816,13 @@ const docTemplate = `{
                         "name": "option",
                         "in": "query"
                     },
+                    {
+                        "type": "string",
+                        "default": "false",
+                        "description": "Skip Kubernetes version validation (use for testing with unlisted versions)",
+                        "name": "skipVersionCheck",
+                        "in": "query"
+                    },
                     {
                         "type": "string",
                         "description": "Custom request ID",

src/interface/rest/docs/swagger.json

@@ -2995,6 +2995,13 @@ paths:
           type: string
           enum:
           - hold
+      - name: skipVersionCheck
+        in: query
+        description: Skip Kubernetes version validation (use for testing with unlisted
+          versions)
+        schema:
+          type: string
+          default: "false"
       - name: x-request-id
         in: header
         description: Custom request ID

src/interface/rest/docs/swagger.yaml

@@ -585,6 +585,7 @@ func RestPostK8sClusterDynamicCheckRequest(c echo.Context) error {
 // @Param nsId path string true "Namespace ID" default(default)
 // @Param k8sClusterDyanmicReq body model.K8sClusterDynamicReq true "Request body to provision K8sCluster dynamically. <br> Must include specId and imageId info. <br> (ex: {name: k8scluster01, imageId: azure+koreacentral+ubuntu22.04, specId: azure+koreacentral+Standard_B2s}]}) <br> You can use /k8sClusterRecommendNode and /k8sClusterDynamicCheckRequest to get it. <br> Check the guide: https://github.com/cloud-barista/cb-tumblebug/discussions/1913"
 // @Param option query string false "Option for K8sCluster creation" Enums(hold)
+// @Param skipVersionCheck query string false "Skip Kubernetes version validation (use for testing with unlisted versions)" default(false)
 // @Param x-request-id header string false "Custom request ID"
 // @Success 200 {object} model.K8sClusterInfo
 // @Failure 404 {object} model.SimpleMsg
@@ -595,14 +596,16 @@ func RestPostK8sClusterDynamic(c echo.Context) error {
 
 	nsId := c.Param("nsId")
 	optionFlag := c.QueryParam("option")
+	skipVersionCheckStr := c.QueryParam("skipVersionCheck")
+	skipVersionCheck := skipVersionCheckStr == "true"
 
 	req := &model.K8sClusterDynamicReq{}
 	if err := c.Bind(req); err != nil {
 		log.Warn().Err(err).Msg("invalid request")
 		return clientManager.EndRequestWithLog(c, err, nil)
 	}
 
-	result, err := infra.CreateK8sClusterDynamic(reqID, nsId, req, optionFlag)
+	result, err := infra.CreateK8sClusterDynamic(reqID, nsId, req, optionFlag, skipVersionCheck)
 	if err != nil {
 		log.Error().Err(err).Msg("failed to create K8sCluster dynamically")
 		return clientManager.EndRequestWithLog(c, err, nil)