minor fixes in challHandling funcs

sdslabs · Dec 23, 2023 · 7549335 · 7549335
1 parent 2e1b1cb
commit 7549335
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 25 deletions.
diff --git a/cliHelpers/chalDeployerService/helper.go b/cliHelpers/chalDeployerService/helper.go
@@ -5,6 +5,7 @@ import (
 	"log"
 	"os"
 	"strconv"
+	"strings"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
@@ -75,7 +76,11 @@ func DeployChallenge() error {
 					teamName := "katana-team-" + strconv.Itoa(i)
 					err = deployment.DeployChallengeToCluster(folderName, teamName, patch, replicas)
 					if err != nil {
-						return err
+						if !(strings.Contains(err.Error(), "already exists")) {
+							return err
+						}else{
+							log.Println("Deployment already existed.")
+						}
 					}
 					url, err := challengedeployerservice.CreateServiceForChallenge(folderName, teamName, 3000, i)
 					if err != nil {
@@ -173,7 +178,7 @@ func DeleteChallenge(challengeName string) error {
 
 		//Delete service
 		log.Println("Deleting services associated with this challenge...")
-		err = serviceClient.Delete(context.TODO(), challengeName, metav1.DeleteOptions{})
+		err = serviceClient.Delete(context.TODO(), challengeName+"-svc-"+strconv.Itoa(i), metav1.DeleteOptions{})
 		if err != nil {
 			log.Println("Error in deleting service for "+challengeName+" in namespace "+teamNamespace, err)
 			continue

diff --git a/lib/deployment/deployment.go b/lib/deployment/deployment.go
@@ -215,8 +215,12 @@ func DeployChallengeToCluster(challengeName, teamName string, firstPatch bool, r
 	log.Println("Creating deployment...")
 	result, err := deploymentsClient.Create(context.TODO(), manifest, metav1.CreateOptions{})
 	if err != nil {
-		log.Println("Unable to create deployement")
-		panic(err)
+		if(!strings.Contains(err.Error(), "already exists")){
+			log.Println("Unable to create deployement")
+			panic(err)
+		}else{
+			log.Println("Deployment already existed")
+		}
 	}
 
 	log.Printf("Created deployment %q.\n", result.GetObjectMeta().GetName()+" in namespace "+teamNamespace)

diff --git a/lib/utils/kube.go b/lib/utils/kube.go
@@ -101,15 +101,8 @@ func GetMongoIP() (string, error) {
 }
 
 func CopyFromPod(podName string, containerName string, pathInPod string, localFilePath string, ns ...string) error {
-	config, err := GetKubeConfig()
-	if err != nil {
-		return err
-	}
-
-	client, err := GetKubeClient()
-	if err != nil {
-		return err
-	}
+	config:=g.GlobalKubeConfig
+	client:=g.GlobalKubeClient
 
 	namespace := "katana"
 	if len(ns) > 0 {
@@ -183,16 +176,8 @@ func CopyFromPod(podName string, containerName string, pathInPod string, localFi
 }
 
 func CopyIntoPod(podName string, containerName string, pathInPod string, localFilePath string, ns ...string) error {
-	config, err := GetKubeConfig()
-	if err != nil {
-		return err
-	}
-
-	client, err := GetKubeClient()
-	if err != nil {
-		return err
-	}
-
+	config:=g.GlobalKubeConfig
+	client:=g.GlobalKubeClient
 	localFile, err := os.Open(localFilePath)
 	if err != nil {
 		log.Printf("Error opening local file: %s\n", err)

diff --git a/services/challengedeployerservice/controller.go b/services/challengedeployerservice/controller.go
@@ -90,11 +90,11 @@ func Deploy(c *fiber.Ctx) error {
 			if err != nil {
 				return err
 			}
-			err = CopyChallengeIntoTsuka(challengePath, folderName, challengeType)
+			err = CopyFlagDataIntoKashira(challengePath, folderName)
 			if err != nil {
 				return err
 			}
-			err = CopyChallengeIntoTsuka(challengePath, folderName, challengeType)
+			err = CopyChallengeCheckerIntoKissaki(challengePath, folderName)
 			if err != nil {
 				return err
 			}