Merge pull request #1670 from sykim-etri/validate-k8scluster-version-…

…when-creating-and-upgrading-k8scluster Validate k8scluster version when creating and upgrading k8scluster
cloud-barista · Jul 12, 2024 · 62a2ca4 · 62a2ca4
2 parents 3222aeb + 3cb28ed
commit 62a2ca4
Show file tree

Hide file tree

Showing 3 changed files with 125 additions and 67 deletions.
diff --git a/src/core/common/config.go b/src/core/common/config.go
@@ -231,6 +231,7 @@ type Cloud struct {
 	Alibaba   CloudSetting `yaml:"alibaba"`
 	Tencent   CloudSetting `yaml:"tencent"`
 	Ibm       CloudSetting `yaml:"ibm"`
+	Nhncloud  CloudSetting `yaml:"nhncloud"`
 	Openstack CloudSetting `yaml:"openstack"`
 	Cloudit   CloudSetting `yaml:"cloudit"`
 }

diff --git a/src/core/common/utility.go b/src/core/common/utility.go
@@ -1328,7 +1328,7 @@ func GetAvailableK8sClusterVersion(providerName string, regionName string) (*[]K
 		}
 	}
 
-	return nil, fmt.Errorf("no available kubernetes cluster version for region(%s) of provider(%s)", regionName, providerName)
+	return nil, fmt.Errorf("no available kubernetes cluster version for provider(%s):region(%s)", providerName, regionName)
 }
 
 // GetAvailableK8sClusterNodeImage is func to get available kubernetes cluster node images for provider and region from K8sClusterInfo
-Original file line number
+Diff line change
@@ Expand Up @@
     		}
     	}
-    	return nil, fmt.Errorf("no available kubernetes cluster version for region(%s) of provider(%s)", regionName, providerName)
+    	return nil, fmt.Errorf("no available kubernetes cluster version for provider(%s):region(%s)", providerName, regionName)
     }
     // GetAvailableK8sClusterNodeImage is func to get available kubernetes cluster node images for provider and region from K8sClusterInfo
@@ Expand Down @@