update sos

NearNodeFlash · Oct 1, 2024 · d51bc35 · d51bc35
1 parent 6293b06
commit d51bc35
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 14 deletions.
diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.21
 
 require (
 	github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20240925185149-26d9d6071a1c
-	github.com/NearNodeFlash/nnf-sos v0.0.1-0.20240925191626-b418b8044027
+	github.com/NearNodeFlash/nnf-sos v0.0.1-0.20241001184546-1305185d0cbd
 	github.com/onsi/ginkgo/v2 v2.17.1
 	github.com/onsi/gomega v1.32.0
 	github.com/prometheus/client_golang v1.16.0

diff --git a/go.sum b/go.sum
@@ -4,8 +4,8 @@ github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20240925185149-26d9d6071a1c
 github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20240925185149-26d9d6071a1c/go.mod h1:3wENUqk1b7V0q5L5kNQ2ZE3z/NywL4sqXqVYolsiJ94=
 github.com/NearNodeFlash/nnf-ec v0.0.1-0.20240912200758-f862bc773739 h1:T49ixk8TBeiYQ3CPpx463GL2gKk94dD9nXpoLBfdmqg=
 github.com/NearNodeFlash/nnf-ec v0.0.1-0.20240912200758-f862bc773739/go.mod h1:oxdwMqfttOF9dabJhqrWlirCnMk8/8eyLMwl+hducjk=
-github.com/NearNodeFlash/nnf-sos v0.0.1-0.20240925191626-b418b8044027 h1:5mdG1KNxPdN7TRpZBk11TBEigA2HIkgK/9neruqOZSs=
-github.com/NearNodeFlash/nnf-sos v0.0.1-0.20240925191626-b418b8044027/go.mod h1:dZD9Kx+kHdKCig6My2uA3JNU0Hy8Sz7vb4A+RZel3m4=
+github.com/NearNodeFlash/nnf-sos v0.0.1-0.20241001184546-1305185d0cbd h1:/hI3IVlKCKGFDiyqoPpiazWAnC1qhjMKAf+ARv35t2o=
+github.com/NearNodeFlash/nnf-sos v0.0.1-0.20241001184546-1305185d0cbd/go.mod h1:dZD9Kx+kHdKCig6My2uA3JNU0Hy8Sz7vb4A+RZel3m4=
 github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
 github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=

diff --git a/internal/controller/datamovement_controller.go b/internal/controller/datamovement_controller.go
@@ -896,10 +896,9 @@ func createDestinationDir(profile *nnfv1alpha2.NnfDataMovementProfile, dm *nnfv1
 		return nil
 	}
 
-	// TODO mkdir command?
 	// Use setpriv to create the directory with the specified UID/GID
-	cmd := fmt.Sprintf("mpirun --allow-run-as-root --hostfile %s -- setpriv --euid %d --egid %d --clear-groups mkdir -p %s",
-		mpiHostfile, dm.Spec.UserId, dm.Spec.GroupId, dest)
+	cmd := fmt.Sprintf("setpriv --euid %d --egid %d --clear-groups mpirun --hostfile %s mkdir -p %s",
+		dm.Spec.UserId, dm.Spec.GroupId, mpiHostfile, dest)
 	output, err := command.Run(cmd, log)
 	if err != nil {
 		return fmt.Errorf("data movement mkdir failed ('%s'): %w output: %s", cmd, err, output)

diff --git a/vendor/github.com/NearNodeFlash/nnf-sos/api/v1alpha2/nnfdatamovementprofile_types.go b/vendor/github.com/NearNodeFlash/nnf-sos/api/v1alpha2/nnfdatamovementprofile_types.go
diff --git a/....com/NearNodeFlash/nnf-sos/config/crd/bases/nnf.cray.hpe.com_nnfdatamovementprofiles.yaml b/....com/NearNodeFlash/nnf-sos/config/crd/bases/nnf.cray.hpe.com_nnfdatamovementprofiles.yaml
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -10,7 +10,7 @@ github.com/NearNodeFlash/lustre-fs-operator/config/crd/bases
 # github.com/NearNodeFlash/nnf-ec v0.0.1-0.20240912200758-f862bc773739
 ## explicit; go 1.19
 github.com/NearNodeFlash/nnf-ec/pkg/rfsf/pkg/models
-# github.com/NearNodeFlash/nnf-sos v0.0.1-0.20240925191626-b418b8044027
+# github.com/NearNodeFlash/nnf-sos v0.0.1-0.20241001184546-1305185d0cbd
 ## explicit; go 1.21
 github.com/NearNodeFlash/nnf-sos/api/v1alpha2
 github.com/NearNodeFlash/nnf-sos/config/crd/bases