Skip to content

Commit 3c24736

Browse files
committed
chore(obcluster): added spec value in parameters of obcluster
1 parent f870b3e commit 3c24736

File tree

2 files changed

+16
-5
lines changed

2 files changed

+16
-5
lines changed

internal/dashboard/business/oceanbase/obcluster.go

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,16 @@ func buildOBClusterResponse(ctx context.Context, obcluster *v1alpha1.OBCluster)
119119
// TODO: add metrics
120120
Metrics: nil,
121121
}
122-
var parameters []modelcommon.KVPair
122+
var parameters []response.ParameterSpec
123+
statusParameterMap := make(map[string]string, 0)
124+
for _, param := range obcluster.Status.Parameters {
125+
statusParameterMap[param.Name] = param.Value
126+
}
123127
for _, param := range obcluster.Spec.Parameters {
124-
parameters = append(parameters, modelcommon.KVPair{
125-
Key: param.Name,
126-
Value: param.Value,
128+
parameters = append(parameters, response.ParameterSpec{
129+
Name: param.Name,
130+
SpecValue: param.Value,
131+
Value: statusParameterMap[param.Name],
127132
})
128133
}
129134
respCluster.Parameters = parameters

internal/dashboard/model/response/obcluster.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,18 @@ type ResourceSpecRender struct {
8282
Memory int64 `json:"memory" binding:"required"`
8383
}
8484

85+
type ParameterSpec struct {
86+
Name string `json:"name" binding:"required"`
87+
SpecValue string `json:"specValue" binding:"required"`
88+
Value string `json:"value" binding:"required"`
89+
}
90+
8591
type OBClusterExtra struct {
8692
Resource ResourceSpecRender `json:"resource" binding:"required"`
8793
Storage OBServerStorage `json:"storage" binding:"required"`
8894

8995
RootPasswordSecret string `json:"rootPasswordSecret" binding:"required"`
90-
Parameters []common.KVPair `json:"parameters" binding:"required"`
96+
Parameters []ParameterSpec `json:"parameters" binding:"required"`
9197
Monitor *MonitorSpec `json:"monitor"`
9298
BackupVolume *NFSVolumeSpec `json:"backupVolume"`
9399
}

0 commit comments

Comments
 (0)