Use NnfDataMovementProfiles

.vscode/launch.json

@@ -56,7 +56,7 @@
                 "-ginkgo.failFast",
             ],
             "env": {
-                "KUBEBUILDER_ASSETS": "${workspaceRoot}/bin/k8s/1.25.0-darwin-amd64",
+                "KUBEBUILDER_ASSETS": "${workspaceRoot}/bin/k8s/1.28.0-darwin-arm64",
                 "GOMEGA_DEFAULT_EVENTUALLY_TIMEOUT": "10m",
                 "GOMEGA_DEFAULT_EVENTUALLY_POLLING_INTERVAL": "500ms",
             },

cmd/main.go

@@ -179,6 +179,7 @@ func (*defaultController) SetOptions(opts *ctrl.Options) {
 	namespaceCache := make(map[string]cache.Config)
 	namespaceCache[corev1.NamespaceDefault] = cache.Config{}
 	namespaceCache[nnfv1alpha1.DataMovementNamespace] = cache.Config{}
+	namespaceCache[nnfv1alpha1.DataMovementProfileNamespace] = cache.Config{}
 	opts.Cache = cache.Options{DefaultNamespaces: namespaceCache}
 }
 
@@ -205,6 +206,7 @@ func (*nodeController) SetOptions(opts *ctrl.Options) {
 	namespaceCache := make(map[string]cache.Config)
 	namespaceCache[corev1.NamespaceDefault] = cache.Config{}
 	namespaceCache[nnfv1alpha1.DataMovementNamespace] = cache.Config{}
+	namespaceCache[nnfv1alpha1.DataMovementProfileNamespace] = cache.Config{}
 	namespaceCache[os.Getenv("NNF_NODE_NAME")] = cache.Config{}
 	opts.Cache = cache.Options{DefaultNamespaces: namespaceCache}
 }

config/default/kustomization.yaml

@@ -15,7 +15,6 @@ namePrefix: nnf-dm-
 resources:
   - ../rbac
   - ../manager
-  - ../dm_config
 # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in
 # crd/kustomization.yaml
 # - ../webhook

config/rbac/daemon_role.yaml

@@ -53,6 +53,14 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - nnf.cray.hpe.com
+  resources:
+  - nnfdatamovementprofiles
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - nnf.cray.hpe.com
   resources:

config/rbac/role.yaml

@@ -136,6 +136,14 @@ rules:
   - get
   - patch
   - update
+- apiGroups:
+  - nnf.cray.hpe.com
+  resources:
+  - nnfdatamovementprofiles
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - nnf.cray.hpe.com
   resources:

daemons/compute/server/servers/server_default.go

@@ -96,6 +96,7 @@ type defaultServer struct {
 // Ensure permissions are granted to access the system configuration; this is done so the NNF
 // Node Name can be found given a Node Name.
 //+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=systemconfigurations,verbs=get;list;watch
+//+kubebuilder:rbac:groups=nnf.cray.hpe.com,resources=nnfdatamovementprofiles,verbs=get;list;watch
 
 func CreateDefaultServer(opts *ServerOptions) (*defaultServer, error) {
 
@@ -237,7 +238,7 @@ func (s *defaultServer) StartManager() error {
 }
 
 // Setup two managers for watching the individual data movement type resources. They behave
-// similarily, performing a reconcile only for updates to this node
+// similarly, performing a reconcile only for updates to this node
 func (s *defaultServer) setupWithManager(mgr ctrl.Manager) error {
 
 	p := predicate.Funcs{
@@ -355,6 +356,20 @@ func (s *defaultServer) Create(ctx context.Context, req *pb.DataMovementCreateRe
 		}, nil
 	}
 
+	// Dm Profile - no pinned profiles here since copy_offload could use any profile
+	profile, err := s.getProfile(ctx, req.Profile)
+	if err != nil {
+		return &pb.DataMovementCreateResponse{
+			Status:  pb.DataMovementCreateResponse_FAILED,
+			Message: "Error finding profile: " + err.Error(),
+		}, nil
+	}
+	dm.Spec.ProfileReference = corev1.ObjectReference{
+		Kind:      reflect.TypeOf(nnfv1alpha1.NnfDataMovementProfile{}).Name(),
+		Name:      profile.Name,
+		Namespace: profile.Namespace,
+	}
+
 	dm.Spec.UserId = userId
 	dm.Spec.GroupId = groupId
 
@@ -398,6 +413,47 @@ func setUserConfig(req *pb.DataMovementCreateRequest, dm *nnfv1alpha1.NnfDataMov
 	}
 }
 
+func (s *defaultServer) getProfile(ctx context.Context, profileName string) (*nnfv1alpha1.NnfDataMovementProfile, error) {
+	ns := "nnf-system"
+
+	// If a profile is named then verify that it exists.  Otherwise, verify that a default profile
+	// can be found.
+	if len(profileName) == 0 {
+		NnfDataMovementProfiles := &nnfv1alpha1.NnfDataMovementProfileList{}
+		if err := s.client.List(ctx, NnfDataMovementProfiles, &client.ListOptions{Namespace: ns}); err != nil {
+			return nil, err
+		}
+		profilesFound := make([]string, 0, len(NnfDataMovementProfiles.Items))
+		for _, profile := range NnfDataMovementProfiles.Items {
+			if profile.Data.Default {
+				objkey := client.ObjectKeyFromObject(&profile)
+				profilesFound = append(profilesFound, objkey.Name)
+			}
+		}
+		// Require that there be one and only one default.
+		if len(profilesFound) == 0 {
+			return nil, fmt.Errorf("unable to find a default NnfDataMovementProfile to use")
+		} else if len(profilesFound) > 1 {
+			return nil, fmt.Errorf("more than one default NnfDataMovementProfile found; unable to pick one: %v", profilesFound)
+		}
+		profileName = profilesFound[0]
+	}
+
+	profile := &nnfv1alpha1.NnfDataMovementProfile{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      profileName,
+			Namespace: ns,
+		},
+	}
+
+	err := s.client.Get(ctx, client.ObjectKeyFromObject(profile), profile)
+	if err != nil {
+		return nil, fmt.Errorf("unable to retrieve NnfDataMovementProfile: %s", profileName)
+	}
+
+	return profile, nil
+}
+
 func getDirectiveIndexFromClientMount(object *dwsv1alpha2.ClientMount) (string, error) {
 	// Find the DW index for our work.
 	labels := object.GetLabels()
@@ -459,7 +515,6 @@ func (s *defaultServer) createNnfDataMovement(ctx context.Context, req *pb.DataM
 					Name:      lustrefs.Name,
 				},
 			},
-			Profile: req.Profile,
 		},
 	}
 
@@ -489,7 +544,6 @@ func (s *defaultServer) createNnfNodeDataMovement(ctx context.Context, req *pb.D
 			Destination: &nnfv1alpha1.NnfDataMovementSpecSourceDestination{
 				Path: req.Destination,
 			},
-			Profile: req.Profile,
 		},
 	}
 

go.mod

@@ -4,7 +4,7 @@ go 1.21
 
 require (
 	github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20240709160956-40dcbac0aadf
-	github.com/NearNodeFlash/nnf-sos v0.0.1-0.20240729130730-8f01fd2116ea
+	github.com/NearNodeFlash/nnf-sos v0.0.1-0.20240801190336-58f2d99dd6cb
 	github.com/onsi/ginkgo/v2 v2.17.1
 	github.com/onsi/gomega v1.32.0
 	github.com/prometheus/client_golang v1.16.0
@@ -69,11 +69,11 @@ require (
 	k8s.io/utils v0.0.0-20230505201702-9f6742963106 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
-	sigs.k8s.io/yaml v1.3.0
+	sigs.k8s.io/yaml v1.3.0 // indirect
 )
 
 require (
-	github.com/DataWorkflowServices/dws v0.0.1-0.20240726140248-bd9f85356c73
+	github.com/DataWorkflowServices/dws v0.0.1-0.20240801173757-1fb2188d84b9
 	go.openly.dev/pointy v1.3.0
 )
 

go.sum

@@ -1,11 +1,11 @@
-github.com/DataWorkflowServices/dws v0.0.1-0.20240726140248-bd9f85356c73 h1:bq1AaHhdaeuaq+ibNk/UIMExXuLicfQCir25xKHnEck=
-github.com/DataWorkflowServices/dws v0.0.1-0.20240726140248-bd9f85356c73/go.mod h1:6MrEEHISskyooSKcKU6R3mFqH6Yh6KzWgajhcw2s+nM=
+github.com/DataWorkflowServices/dws v0.0.1-0.20240801173757-1fb2188d84b9 h1:Jf5AxKXNxNtDC4YBbnJfpKWr4DicrEJ0aCtIgarIIqU=
+github.com/DataWorkflowServices/dws v0.0.1-0.20240801173757-1fb2188d84b9/go.mod h1:6MrEEHISskyooSKcKU6R3mFqH6Yh6KzWgajhcw2s+nM=
 github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20240709160956-40dcbac0aadf h1:ArBI1LR+BBZ9lF+Aohv49RhTpmRqIXLz4L/h45qQT4k=
 github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20240709160956-40dcbac0aadf/go.mod h1:N5X1obpl0mBI0VoCJdQhv7cFXOC6g3VlXj712qWj0JE=
 github.com/NearNodeFlash/nnf-ec v0.0.1-0.20240708183336-34d1295977f5 h1:7eT5mOVSNwtacIcGhzMAsi8EVbeS4zk9QwThG2f0GHE=
 github.com/NearNodeFlash/nnf-ec v0.0.1-0.20240708183336-34d1295977f5/go.mod h1:oxdwMqfttOF9dabJhqrWlirCnMk8/8eyLMwl+hducjk=
-github.com/NearNodeFlash/nnf-sos v0.0.1-0.20240729130730-8f01fd2116ea h1:WZCoDgPMs8+3jle4iJnx4EaPlBLd6pr2ks+o8U4yy10=
-github.com/NearNodeFlash/nnf-sos v0.0.1-0.20240729130730-8f01fd2116ea/go.mod h1:WBbrMgTEGvnFbbuQglDBoLl/KvcsC3F/CKY9jq5hWgU=
+github.com/NearNodeFlash/nnf-sos v0.0.1-0.20240801190336-58f2d99dd6cb h1:tHAn3aqU61vQ+FCo+6uLZrhamrfwq4qV5EBlBlqDOpk=
+github.com/NearNodeFlash/nnf-sos v0.0.1-0.20240801190336-58f2d99dd6cb/go.mod h1:uJvjwkSLrPk4A/13U/E4vnO8R+utDE/lGclsKVp/88s=
 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=