Skip to content

Commit 461bb82

Browse files
fix compile
1 parent dad6986 commit 461bb82

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

internal/dashboard/business/oceanbase/obtenant.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ func CreateOBTenant(ctx context.Context, nn types.NamespacedName, p *param.Creat
289289

290290
// use password from root credential
291291
if p.RootCredential != "" {
292-
rootSecret, err := k8sclient.ClientSet.CoreV1().Secrets(t.SecretNamespace).Get(ctx, p.RootCredential, v1.GetOptions{})
292+
rootSecret, err := k8sclient.ClientSet.CoreV1().Secrets(p.SecretNamespace).Get(ctx, p.RootCredential, v1.GetOptions{})
293293
if err != nil {
294294
return nil, oberr.NewInternal(err.Error())
295295
}
@@ -384,7 +384,7 @@ func CreateOBTenant(ctx context.Context, nn types.NamespacedName, p *param.Creat
384384
if p.Source != nil && p.Source.Restore != nil {
385385
// extract BakEncryptionPassword and OSS ak/sk
386386
if p.Source.Restore.BakEncryptionSecret != "" {
387-
bakEncryptionSecret, err := k8sclient.ClientSet.CoreV1().Secrets(t.SecretNamespace).Get(ctx, p.Source.Restore.BakEncryptionSecret, v1.GetOptions{})
387+
bakEncryptionSecret, err := k8sclient.ClientSet.CoreV1().Secrets(p.SecretNamespace).Get(ctx, p.Source.Restore.BakEncryptionSecret, v1.GetOptions{})
388388
if err != nil {
389389
return nil, oberr.NewInternal(err.Error())
390390
}
@@ -393,7 +393,7 @@ func CreateOBTenant(ctx context.Context, nn types.NamespacedName, p *param.Creat
393393
}
394394
}
395395
if p.Source.Restore.OSSAccessSecret != "" {
396-
ossAccessSecret, err := k8sclient.ClientSet.CoreV1().Secrets(t.SecretNamespace).Get(ctx, p.Source.Restore.OSSAccessSecret, v1.GetOptions{})
396+
ossAccessSecret, err := k8sclient.ClientSet.CoreV1().Secrets(p.SecretNamespace).Get(ctx, p.Source.Restore.OSSAccessSecret, v1.GetOptions{})
397397
if err != nil {
398398
return nil, oberr.NewInternal(err.Error())
399399
}

internal/dashboard/handler/obtenant_handler.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,9 @@ func CreateTenant(c *gin.Context) (*response.OBTenantDetail, error) {
150150
return nil, httpErr.New(httpErr.ErrPermissionDenied, "Permission denied")
151151
}
152152

153+
if tenantParam.SecretNamespace == "" {
154+
tenantParam.SecretNamespace = "default"
155+
}
153156
if tenantParam.RootPassword != "" {
154157
tenantParam.RootPassword, err = crypto.DecryptWithPrivateKey(tenantParam.RootPassword)
155158
if err != nil {

0 commit comments

Comments
 (0)