From be34f6acff55b57d216dde9481eb13cf06d18d8b Mon Sep 17 00:00:00 2001
From: travisn <tnielsen@redhat.com>
Date: Tue, 10 Oct 2023 15:34:29 -0600
Subject: [PATCH] mon: write assimilate config to operator dir

The /tmp dir is not always available in some environments.
The only directories the operator should rely on
are the directories that are in its pod spec.
For assimilate-conf now we use the /var/lib/rook
directory to generate files since we know it is
a valid emptydir mounted into the operator pod.

Signed-off-by: travisn <tnielsen@redhat.com>
(cherry picked from commit 5359c4f4f52890cc49132b56b3f7df5c4e102504)
---
 pkg/operator/ceph/config/monstore.go      | 15 ++++++++++-----
 pkg/operator/ceph/config/monstore_test.go |  4 +++-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/pkg/operator/ceph/config/monstore.go b/pkg/operator/ceph/config/monstore.go
index 5abc9d5cd..96dd1f7f7 100644
--- a/pkg/operator/ceph/config/monstore.go
+++ b/pkg/operator/ceph/config/monstore.go
@@ -234,7 +234,7 @@ func (m *MonStore) SetAll(clientName string, settings map[string]string) error {
 }
 
 func (m *MonStore) setAll(clientName string, settings map[string]string) ([]string, error) {
-	assimilateConfPath, err := os.CreateTemp("", "")
+	assimilateConfPath, err := os.CreateTemp(m.context.ConfigDir, "")
 	if err != nil {
 		return []string{}, errors.Wrapf(err, "failed to create assimilateConf temp dir for  %s.", clientName)
 	}
@@ -244,11 +244,16 @@ func (m *MonStore) setAll(clientName string, settings map[string]string) ([]stri
 		rook.TerminateFatal(errors.Wrapf(err, "failed to write config file"))
 	}
 
+	outFilePath := assimilateConfPath.Name() + ".out"
 	defer func() {
 		err := os.Remove(assimilateConfPath.Name())
 		if err != nil {
 			logger.Errorf("failed to remove file %q. %v", assimilateConfPath.Name(), err)
 		}
+		err = os.Remove(outFilePath)
+		if err != nil {
+			logger.Errorf("failed to remove file %q. %v", outFilePath, err)
+		}
 	}()
 
 	configFile := ini.Empty()
@@ -273,13 +278,13 @@ func (m *MonStore) setAll(clientName string, settings map[string]string) ([]stri
 	}
 	logger.Infof("applying ceph settings:\n%s", string(fileContent))
 
-	args := []string{"config", "assimilate-conf", "-i", assimilateConfPath.Name(), "-o", assimilateConfPath.Name() + ".out"}
+	args := []string{"config", "assimilate-conf", "-i", assimilateConfPath.Name(), "-o", outFilePath}
 	cephCmd := client.NewCephCommand(m.context, m.clusterInfo, args)
 
 	out, err := cephCmd.RunWithTimeout(exec.CephCommandsTimeout)
-	fileContent, readErr := os.ReadFile(assimilateConfPath.Name() + ".out")
+	fileContent, readErr := os.ReadFile(outFilePath)
 	if readErr != nil {
-		logger.Errorf("failed to open assimilate output file %s.out. %v", assimilateConfPath.Name(), readErr)
+		logger.Errorf("failed to open assimilate output file %s. %v", outFilePath, readErr)
 	}
 	if err != nil {
 		logger.Errorf("failed to run command ceph %s", args)
@@ -293,7 +298,7 @@ func (m *MonStore) setAll(clientName string, settings map[string]string) ([]stri
 		// read fileContent to ini format
 		iniContent, err := ini.Load(fileContent)
 		if err != nil {
-			return []string{}, errors.Wrapf(err, "failed to parse assimilate output file %s.out", assimilateConfPath.Name())
+			return []string{}, errors.Wrapf(err, "failed to parse assimilate output file %s", outFilePath)
 		}
 		// get the section for the client
 		section, err := iniContent.GetSection(clientName)
diff --git a/pkg/operator/ceph/config/monstore_test.go b/pkg/operator/ceph/config/monstore_test.go
index a1b864754..ad061f532 100644
--- a/pkg/operator/ceph/config/monstore_test.go
+++ b/pkg/operator/ceph/config/monstore_test.go
@@ -212,7 +212,9 @@ func TestMonStore_SetAll(t *testing.T) {
 	}
 
 	// commands w/ no error
-	e := monStore.SetAll("osd.0", cfgOverrides)
+	keys, e := monStore.setAll("osd.0", cfgOverrides)
+	// no keys written since it's mocked
+	assert.Equal(t, 0, len(keys))
 	assert.NoError(t, e)
 	assert.True(t, appliedSettings)
 }