Merge pull request #761 from chris-sun-star/cluster-version

return version when get obcluster info

Author: LINxiansheng

internal/dashboard/business/oceanbase/obcluster.go

@@ -116,13 +116,25 @@ func buildOBClusterResponse(ctx context.Context, obcluster *v1alpha1.OBCluster)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to build obcluster overview")
 	}
+
+	conn, err := utils.GetOBConnection(ctx, obcluster, "root", "sys", obcluster.Spec.UserSecrets.Root)
+	if err != nil {
+		logger.WithError(err).Info("Failed to get OceanBase database connection")
+		return nil, errors.Wrapf(err, "Failed to get connection of obcluster")
+	}
+	version, err := conn.GetVersion(ctx)
+	if err != nil {
+		logger.WithError(err).Info("Failed to get OceanBase database version")
+		return nil, errors.Wrapf(err, "Failed to get version of obcluster")
+	}
+
 	respCluster := &response.OBCluster{
 		OBClusterOverview: *overview,
 		OBClusterExtra: response.OBClusterExtra{
 			RootPasswordSecret: obcluster.Spec.UserSecrets.Root,
+			Version:            version.Version,
 			Parameters:         nil,
 		},
-		// TODO: add metrics
 		Metrics: nil,
 	}
 	var parameters []response.ParameterSpec
@@ -951,7 +963,7 @@ func ListOBClusterParameters(ctx context.Context, nn *param.K8sObjectIdentity) (
 	conn, err := utils.GetOBConnection(ctx, obcluster, "root", "sys", obcluster.Spec.UserSecrets.Root)
 	if err != nil {
 		logger.WithError(err).Info("Failed to get OceanBase database connection")
-		return nil, nil
+		return nil, errors.Wrapf(err, "Failed to get connection go obcluster")
 	}
 	parameters, err := conn.ListClusterParameters(ctx)
 	if err != nil {

internal/dashboard/model/response/obcluster.go

@@ -77,11 +77,8 @@ type OBClusterOverview struct {
 
 type OBCluster struct {
 	OBClusterOverview `json:",inline"`
-
-	Metrics *OBMetrics `json:"metrics"`
-	Version string     `json:"version"`
-
-	OBClusterExtra `json:",inline"`
+	Metrics           *OBMetrics `json:"metrics"`
+	OBClusterExtra    `json:",inline"`
 }
 
 type ResourceSpecRender struct {
@@ -96,6 +93,7 @@ type ParameterSpec struct {
 }
 
 type OBClusterExtra struct {
+	Version  string             `json:"version"`
 	Resource ResourceSpecRender `json:"resource" binding:"required"`
 	Storage  OBServerStorage    `json:"storage" binding:"required"`