Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: rtes #2120

Merged
merged 1 commit into from
Jan 9, 2025
Merged

test: rtes #2120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion db/mysql/dao/over_score.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func (t *OverScoreDaoImpl) GetOverScoreRate() (*model.EnterpriseOverScore, error
if err == gorm.ErrRecordNotFound {
// Create default record with rate 1
overScore = model.EnterpriseOverScore{
OverScoreRate: "1",
OverScoreRate: "{\"CPU\":1,\"MEMORY\":1}",
}
if err := t.DB.Create(&overScore).Error; err != nil {
return nil, err
Expand Down
12 changes: 12 additions & 0 deletions worker/appm/volume/volcengine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,21 @@ type VolcengineVolume struct {
func (v *VolcengineVolume) CreateVolume(define *Define) error {
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
defer cancel()
<<<<<<< HEAD
sc, err := k8s.Default().Clientset.StorageV1().StorageClasses().Get(ctx, v.as.K8sComponentName, metav1.GetOptions{})
=======
sc, err := k8s.Default().Clientset.StorageV1().StorageClasses().Get(ctx, define.as.K8sComponentName, metav1.GetOptions{})
>>>>>>> 19d035f8c6ea4bbbb88571c8e156db6f2a9ab732
if err != nil {
if k8serror.IsNotFound(err) {
fileDomain, err := filepersistence.Default().FilePersistenceCli.CreateFileSystem(
ctx,
&filepersistence.CreateFileSystemOptions{
<<<<<<< HEAD
Name: v.as.K8sComponentName,
=======
Name: define.as.K8sComponentName,
>>>>>>> 19d035f8c6ea4bbbb88571c8e156db6f2a9ab732
ProtocolType: "NFS",
StorageType: "Standard",
Size: 100 * 1024 * 1024 * 1024,
Expand All @@ -47,7 +55,11 @@ func (v *VolcengineVolume) CreateVolume(define *Define) error {
volumeBindingMode := storagev1.VolumeBindingImmediate
sc = &storagev1.StorageClass{
ObjectMeta: metav1.ObjectMeta{
<<<<<<< HEAD
Name: v.as.K8sComponentName,
=======
Name: define.as.K8sComponentName,
>>>>>>> 19d035f8c6ea4bbbb88571c8e156db6f2a9ab732
},
Provisioner: "nas.csi.volcengine.com",
Parameters: map[string]string{
Expand Down
Loading