Revert runner port changes

cedana · Oct 16, 2024 · 446c5ee · 446c5ee
1 parent a4fa7a0
commit 446c5ee
Showing 1 changed file with 15 additions and 21 deletions.
diff --git a/pkg/worker/worker.go b/pkg/worker/worker.go
@@ -689,27 +689,21 @@ func (s *Worker) spawn(request *types.ContainerRequest, spec *specs.Spec, output
 	defer containerInstance.Overlay.Cleanup()
 	spec.Root.Path = containerInstance.Overlay.TopLayerPath()
 
-	// // Setup container network namespace / devices
-	// err = s.containerNetworkManager.Setup(containerId, spec)
-	// if err != nil {
-	// 	log.Printf("<%s> failed to setup container network: %v", containerId, err)
-	// 	containerErr = err
-	// 	return
-	// }
-
-	// // Expose the bind port
-	// err = s.containerNetworkManager.ExposePort(containerId, opts.BindPort, opts.BindPort)
-	// if err != nil {
-	// 	log.Printf("<%s> failed to expose container bind port: %v", containerId, err)
-	// 	containerErr = err
-	// 	return
-	// }
-
-	// // Expose cedana port
-	// err = s.containerNetworkManager.ExposePort(containerId, CedanaPort, CedanaPort)
-	// if err != nil {
-	// 	log.Printf("<%s> failed to expose cedana port, C/R unavailable: %v", containerId, err)
-	// }
+	// Setup container network namespace / devices
+	err = s.containerNetworkManager.Setup(containerId, spec)
+	if err != nil {
+		log.Printf("<%s> failed to setup container network: %v", containerId, err)
+		containerErr = err
+		return
+	}
+
+	// Expose the bind port
+	err = s.containerNetworkManager.ExposePort(containerId, opts.BindPort, opts.BindPort)
+	if err != nil {
+		log.Printf("<%s> failed to expose container bind port: %v", containerId, err)
+		containerErr = err
+		return
+	}
 
 	// Write runc config spec to disk
 	configContents, err := json.MarshalIndent(spec, "", " ")