#3 - minor

interTwin-eu · Apr 22, 2024 · cf08025 · cf08025
1 parent f8d9fcf
commit cf08025
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/pkg/docker/Create.go b/pkg/docker/Create.go
@@ -108,8 +108,6 @@ func (h *SidecarHandler) CreateHandler(w http.ResponseWriter, r *http.Request) {
 				log.G(h.Ctx).Info("Container " + containerName + " is not requesting a GPU")
 			}
 
-			log.G(h.Ctx).Info("- Creating container " + containerName)
-
 			var envVars string = ""
 			// add environment variables to the docker command
 			for _, envVar := range container.Env {

diff --git a/pkg/docker/aux.go b/pkg/docker/aux.go
@@ -33,6 +33,7 @@ func prepareMounts(Ctx context.Context, config commonIL.InterLinkConfig, data []
 	for _, podData := range data {
 
 		podUID := string(podData.Pod.UID)
+		podNamespace := string(podData.Pod.UID)
 
 		err := os.MkdirAll(config.DataRootFolder+podData.Pod.Namespace+"-"+podUID, os.ModePerm)
 		if err != nil {
@@ -42,15 +43,15 @@ func prepareMounts(Ctx context.Context, config commonIL.InterLinkConfig, data []
 			log.G(Ctx).Info("-- Created directory " + config.DataRootFolder + podData.Pod.Namespace + "-" + podUID)
 		}
 
-		log.G(Ctx).Info("pod data values: " + fmt.Sprintf("%+v", podData))
-
 		for _, cont := range podData.Containers {
 
+			containerName := podNamespace + "-" + podUID + "-" + container.Name
+
 			log.G(Ctx).Info("cont values: " + fmt.Sprintf("%+v", cont))
 
 			log.G(Ctx).Info("-- Inside Preparing mountpoints for " + cont.Name)
 			for _, cfgMap := range cont.ConfigMaps {
-				if container.Name == cont.Name {
+				if containerName == podNamespace + "-" + podUID + "-" + cont.Name {
 					log.G(Ctx).Info("-- Mounting ConfigMap " + cfgMap.Name)
 					paths, err := mountData(Ctx, config, podData.Pod, cfgMap, container)
 					if err != nil {
@@ -64,7 +65,7 @@ func prepareMounts(Ctx context.Context, config commonIL.InterLinkConfig, data []
 			}
 
 			for _, secret := range cont.Secrets {
-				if container.Name == cont.Name {
+				if containerName == podNamespace + "-" + podUID + "-" + cont.Name {
 					paths, err := mountData(Ctx, config, podData.Pod, secret, container)
 					if err != nil {
 						log.G(Ctx).Error("Error mounting Secret " + secret.Name)
@@ -77,7 +78,7 @@ func prepareMounts(Ctx context.Context, config commonIL.InterLinkConfig, data []
 			}
 
 			for _, emptyDir := range cont.EmptyDirs {
-				if container.Name == cont.Name {
+				if containerName == podNamespace + "-" + podUID + "-" + cont.Name {
 					paths, err := mountData(Ctx, config, podData.Pod, emptyDir, container)
 					if err != nil {
 						log.G(Ctx).Error("Error mounting EmptyDir " + emptyDir)