Merge pull request #334 from feichashao/mount_dir

Console use tmp dir for monitor plugin conf
openshift · May 28, 2024 · c21ada9 · c21ada9
2 parents 3ebbc7a + 7842f5f
commit c21ada9
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/cmd/ocm-backplane/console/console.go b/cmd/ocm-backplane/console/console.go
@@ -61,7 +61,9 @@ type containerEngineInterface interface {
 	containerIsExist(containerName string) (bool, error)
 }
 
-type podmanLinux struct{}
+type podmanLinux struct {
+	fileMountDir string
+}
 type podmanMac struct{}
 type dockerLinux struct{}
 type dockerMac struct{}
@@ -361,7 +363,7 @@ func (o *consoleOptions) getContainerEngineImpl() (containerEngineInterface, err
 
 	var containerEngineImpl containerEngineInterface
 	if runtime.GOOS == LINUX && containerEngine == PODMAN {
-		containerEngineImpl = &podmanLinux{}
+		containerEngineImpl = &podmanLinux{fileMountDir: filepath.Join(os.TempDir(), "backplane")}
 	} else if runtime.GOOS == MACOS && containerEngine == PODMAN {
 		containerEngineImpl = &podmanMac{}
 	} else if runtime.GOOS == LINUX && containerEngine == DOCKER {
@@ -593,21 +595,24 @@ func (o *consoleOptions) runMonitorPlugin(ce containerEngineInterface) error {
 		logger.Debugln("monitoring plugin is not needed, not to run monitoring plugin")
 		return nil
 	}
-	// Setup nginx configurations
-	config := fmt.Sprintf(info.MonitoringPluginNginxConfigTemplate, o.monitorPluginPort)
-	if err := ce.putFileToMount(info.MonitoringPluginNginxConfigFilename, []byte(config)); err != nil {
-		return err
-	}
 
 	clusterID, err := getClusterID()
 	if err != nil {
 		return err
 	}
+
+	// Setup nginx configurations
+	config := fmt.Sprintf(info.MonitoringPluginNginxConfigTemplate, o.monitorPluginPort)
+	nginxFilename := fmt.Sprintf(info.MonitoringPluginNginxConfigFilename, clusterID)
+	if err := ce.putFileToMount(nginxFilename, []byte(config)); err != nil {
+		return err
+	}
+
 	consoleContainerName := fmt.Sprintf("console-%s", clusterID)
 	pluginContainerName := fmt.Sprintf("monitoring-plugin-%s", clusterID)
 
 	pluginArgs := []string{o.monitorPluginImage}
-	return ce.runMonitorPlugin(pluginContainerName, consoleContainerName, info.MonitoringPluginNginxConfigFilename, pluginArgs)
+	return ce.runMonitorPlugin(pluginContainerName, consoleContainerName, nginxFilename, pluginArgs)
 }
 
 // print the console URL and pop a browser if required
@@ -1154,11 +1159,7 @@ func (ce *podmanMac) runMonitorPlugin(containerName string, consoleContainerName
 }
 
 func (ce *podmanLinux) runMonitorPlugin(containerName string, consoleContainerName string, nginxConf string, pluginArgs []string) error {
-	configDirectory, err := config.GetConfigDirctory()
-	if err != nil {
-		return err
-	}
-	nginxConfPath := filepath.Join(configDirectory, nginxConf)
+	nginxConfPath := filepath.Join(ce.fileMountDir, nginxConf)
 	return podmanRunMonitorPlugin(containerName, consoleContainerName, nginxConfPath, pluginArgs)
 }
 
@@ -1213,12 +1214,12 @@ func (ce *dockerMac) runMonitorPlugin(containerName string, consoleContainerName
 // put a file in place for container to mount
 // filename should be name only, not a path
 func (ce *podmanLinux) putFileToMount(filename string, content []byte) error {
-	// for files in linux, we put them into the user's backplane config directory
-	configDirectory, err := config.GetConfigDirctory()
+	// ensure the directory exists
+	err := os.MkdirAll(ce.fileMountDir, os.ModePerm)
 	if err != nil {
 		return err
 	}
-	dstFileName := filepath.Join(configDirectory, filename)
+	dstFileName := filepath.Join(ce.fileMountDir, filename)
 
 	// Check if file already exists, if it does remove it
 	if _, err = os.Stat(dstFileName); !os.IsNotExist(err) {

diff --git a/pkg/info/info.go b/pkg/info/info.go
@@ -47,7 +47,7 @@ const (
 	}
 	`
 
-	MonitoringPluginNginxConfigFilename = "monitoring-plugin-nginx.conf"
+	MonitoringPluginNginxConfigFilename = "monitoring-plugin-nginx-%s.conf"
 )
 
 var (