Merge pull request #512 from kthcloud/dev

Fix fallback zone to se-flem-2 instead of se-flem
kthcloud · Apr 23, 2024 · 87ba75a · 87ba75a
2 parents 6ca86b6 + 20724f8
commit 87ba75a
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/pkg/workers/confirm/workers.go b/pkg/workers/confirm/workers.go
@@ -72,7 +72,7 @@ func smDeletionConfirmer() error {
 		}) == -1
 
 		if allFinished {
-			log.Printf("Marking sm %s as deleted", sm.ID)
+			log.Printf("Marking SM %s as deleted", sm.ID)
 			err = sm_repo.New().DeleteByID(sm.ID)
 			if err != nil {
 				return err
@@ -108,7 +108,7 @@ func vmDeletionConfirmer() error {
 		}) == -1
 
 		if allFinished {
-			log.Printf("Marking vm %s as deleted", vm.ID)
+			log.Printf("Marking VM %s as deleted", vm.ID)
 			err = vm_repo.New().DeleteByID(vm.ID)
 			if err != nil {
 				return err

diff --git a/routers/api/v1/middleware/create_storage_manager.go b/routers/api/v1/middleware/create_storage_manager.go
@@ -39,7 +39,7 @@ func CreateSM() gin.HandlerFunc {
 				"id":     smID,
 				"userId": auth.UserID,
 				"params": model.SmCreateParams{
-					Zone: "se-flem",
+					Zone: "se-flem-2",
 				},
 			})
 

diff --git a/service/v1/deployments/deployment_service.go b/service/v1/deployments/deployment_service.go
@@ -178,7 +178,7 @@ func (c *Client) Create(id, ownerID string, deploymentCreate *body.DeploymentCre
 	}
 
 	// temporary hard-coded fallback
-	fallbackZone := "se-flem"
+	fallbackZone := "se-flem-2"
 	fallbackImage := createImagePath(ownerID, deploymentCreate.Name)
 	fallbackPort := config.Config.Deployment.Port
 

diff --git a/service/v1/sms/sm_service.go b/service/v1/sms/sm_service.go
@@ -154,7 +154,7 @@ func (c *Client) Exists(userID string) (bool, error) {
 // GetZone returns the deployment zone for the storage manager.
 func (c *Client) GetZone() *configModels.Zone {
 	// Currently, the storage-manager is hosted in se-flem for all users
-	zone := "se-flem"
+	zone := "se-flem-2"
 
 	return config.Config.GetZone(zone)
 }

diff --git a/service/v1/vms/vm_service.go b/service/v1/vms/vm_service.go
@@ -175,7 +175,7 @@ func (c *Client) Create(id, ownerID string, dtoVmCreate *body.VmCreate) error {
 
 	// Temporary hard-coded fallback
 	fallback := "se-flem"
-	deploymentZone := "se-flem"
+	deploymentZone := "se-flem-2"
 
 	params := model.VmCreateParams{}.FromDTOv1(dtoVmCreate, &fallback, &deploymentZone)