Merge branch 'master' into release-v0.0.6

NearNodeFlash · Sep 14, 2023 · 6007e6f · 6007e6f
2 parents 2af650d + fde8498
commit 6007e6f
Show file tree

Hide file tree

Showing 93 changed files with 243 additions and 215 deletions.
diff --git a/PROJECT b/PROJECT
@@ -35,15 +35,15 @@ resources:
   path: github.com/NearNodeFlash/nnf-sos/api/v1alpha1
   version: v1alpha1
 - controller: true
-  domain: cray.hpe.com
-  group: dws
+  domain: github.io
+  group: dataworkflowservices
   kind: Workflow
-  version: v1alpha1
+  version: v1alpha2
 - controller: true
-  domain: cray.hpe.com
-  group: nnf
+  domain: github.io
+  group: dataworkflowservices
   kind: DirectiveBreakdown
-  version: v1alpha1
+  version: v1alpha2
 - api:
     crdVersion: v1
     namespaced: true

diff --git a/api/v1alpha1/nnf_access_types.go b/api/v1alpha1/nnf_access_types.go
@@ -20,8 +20,8 @@
 package v1alpha1
 
 import (
-	dwsv1alpha2 "github.com/HewlettPackard/dws/api/v1alpha2"
-	"github.com/HewlettPackard/dws/utils/updater"
+	dwsv1alpha2 "github.com/DataWorkflowServices/dws/api/v1alpha2"
+	"github.com/DataWorkflowServices/dws/utils/updater"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"

diff --git a/api/v1alpha1/nnf_datamovement_types.go b/api/v1alpha1/nnf_datamovement_types.go
@@ -20,7 +20,7 @@
 package v1alpha1
 
 import (
-	dwsv1alpha2 "github.com/HewlettPackard/dws/api/v1alpha2"
+	dwsv1alpha2 "github.com/DataWorkflowServices/dws/api/v1alpha2"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -100,6 +100,14 @@ type NnfDataMovementConfig struct {
 	// Note: Enabling this option may degrade performance.
 	// +kubebuilder:default:=false
 	StoreStdout bool `json:"storeStdout,omitempty"`
+
+	// The number of slots specified in the MPI hostfile. A value of 0 disables the use of slots in
+	// the hostfile. Nil will defer to the value specified in the nnf-dm-config ConfigMap.
+	Slots *int `json:"slots,omitempty"`
+
+	// The number of max_slots specified in the MPI hostfile. A value of 0 disables the use of slots
+	// in the hostfile. Nil will defer to the value specified in the nnf-dm-config ConfigMap.
+	MaxSlots *int `json:"maxSlots,omitempty"`
 }
 
 // DataMovementCommandStatus defines the observed status of the underlying data movement

diff --git a/api/v1alpha1/nnf_node_storage_types.go b/api/v1alpha1/nnf_node_storage_types.go
@@ -20,8 +20,8 @@
 package v1alpha1
 
 import (
-	dwsv1alpha2 "github.com/HewlettPackard/dws/api/v1alpha2"
-	"github.com/HewlettPackard/dws/utils/updater"
+	dwsv1alpha2 "github.com/DataWorkflowServices/dws/api/v1alpha2"
+	"github.com/DataWorkflowServices/dws/utils/updater"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )

diff --git a/api/v1alpha1/nnf_node_types.go b/api/v1alpha1/nnf_node_types.go
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021, 2022 Hewlett Packard Enterprise Development LP
+ * Copyright 2021-2023 Hewlett Packard Enterprise Development LP
  * Other additional copyright holders may be indicated within.
  *
  * The entirety of this work is licensed under the Apache License,
@@ -20,7 +20,7 @@
 package v1alpha1
 
 import (
-	"github.com/HewlettPackard/dws/utils/updater"
+	"github.com/DataWorkflowServices/dws/utils/updater"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 

diff --git a/api/v1alpha1/nnf_port_manager_types.go b/api/v1alpha1/nnf_port_manager_types.go
@@ -20,7 +20,7 @@
 package v1alpha1
 
 import (
-	"github.com/HewlettPackard/dws/utils/updater"
+	"github.com/DataWorkflowServices/dws/utils/updater"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

diff --git a/api/v1alpha1/nnf_resource_status_type.go b/api/v1alpha1/nnf_resource_status_type.go
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021, 2022 Hewlett Packard Enterprise Development LP
+ * Copyright 2021-2023 Hewlett Packard Enterprise Development LP
  * Other additional copyright holders may be indicated within.
  *
  * The entirety of this work is licensed under the Apache License,
@@ -20,7 +20,7 @@
 package v1alpha1
 
 import (
-	dwsv1alpha2 "github.com/HewlettPackard/dws/api/v1alpha2"
+	dwsv1alpha2 "github.com/DataWorkflowServices/dws/api/v1alpha2"
 
 	sf "github.com/NearNodeFlash/nnf-ec/pkg/rfsf/pkg/models"
 )

diff --git a/api/v1alpha1/nnf_storage_types.go b/api/v1alpha1/nnf_storage_types.go
@@ -20,8 +20,8 @@
 package v1alpha1
 
 import (
-	dwsv1alpha2 "github.com/HewlettPackard/dws/api/v1alpha2"
-	"github.com/HewlettPackard/dws/utils/updater"
+	dwsv1alpha2 "github.com/DataWorkflowServices/dws/api/v1alpha2"
+	"github.com/DataWorkflowServices/dws/utils/updater"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/nnf.cray.hpe.com_nnfdatamovements.yaml b/config/crd/bases/nnf.cray.hpe.com_nnfdatamovements.yaml
@@ -178,6 +178,16 @@ spec:
                       the output is always logged. Note: Enabling this option may
                       degrade performance.'
                     type: boolean
+                  maxSlots:
+                    description: The number of max_slots specified in the MPI hostfile.
+                      A value of 0 disables the use of slots in the hostfile. Nil
+                      will defer to the value specified in the nnf-dm-config ConfigMap.
+                    type: integer
+                  slots:
+                    description: The number of slots specified in the MPI hostfile.
+                      A value of 0 disables the use of slots in the hostfile. Nil
+                      will defer to the value specified in the nnf-dm-config ConfigMap.
+                    type: integer
                   storeStdout:
                     default: false
                     description: 'Similar to LogStdout, store the command''s stdout

diff --git a/config/dws/kustomization.yaml b/config/dws/kustomization.yaml
@@ -1,5 +1,5 @@
 # Adds namespace to all resources.
-namespace: dws-operator-system
+namespace: dws-system
 
 resources:
 - nnf-ruleset.yaml
diff --git a/config/dws/nnf-ruleset.yaml b/config/dws/nnf-ruleset.yaml
@@ -1,4 +1,4 @@
-apiVersion: dws.cray.hpe.com/v1alpha2
+apiVersion: dataworkflowservices.github.io/v1alpha2
 kind: DWDirectiveRule
 metadata:
   name: nnf

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -57,7 +57,7 @@ rules:
   - patch
   - update
 - apiGroups:
-  - dws.cray.hpe.com
+  - dataworkflowservices.github.io
   resources:
   - clientmounts
   verbs:
@@ -70,21 +70,21 @@ rules:
   - update
   - watch
 - apiGroups:
-  - dws.cray.hpe.com
+  - dataworkflowservices.github.io
   resources:
   - clientmounts/finalizers
   verbs:
   - update
 - apiGroups:
-  - dws.cray.hpe.com
+  - dataworkflowservices.github.io
   resources:
   - clientmounts/status
   verbs:
   - get
   - patch
   - update
 - apiGroups:
-  - dws.cray.hpe.com
+  - dataworkflowservices.github.io
   resources:
   - computes
   verbs:
@@ -95,7 +95,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - dws.cray.hpe.com
+  - dataworkflowservices.github.io
   resources:
   - directivebreakdowns
   verbs:
@@ -108,13 +108,13 @@ rules:
   - update
   - watch
 - apiGroups:
-  - dws.cray.hpe.com
+  - dataworkflowservices.github.io
   resources:
   - directivebreakdowns/finalizers
   verbs:
   - update
 - apiGroups:
-  - dws.cray.hpe.com
+  - dataworkflowservices.github.io
   resources:
   - directivebreakdowns/status
   verbs:
@@ -125,7 +125,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - dws.cray.hpe.com
+  - dataworkflowservices.github.io
   resources:
   - nnfstorage
   verbs:
@@ -136,7 +136,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - dws.cray.hpe.com
+  - dataworkflowservices.github.io
   resources:
   - persistentstorageinstances
   verbs:
@@ -149,7 +149,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - dws.cray.hpe.com
+  - dataworkflowservices.github.io
   resources:
   - persistentstorageinstances/status
   verbs:
@@ -160,7 +160,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - dws.cray.hpe.com
+  - dataworkflowservices.github.io
   resources:
   - servers
   verbs:
@@ -173,7 +173,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - dws.cray.hpe.com
+  - dataworkflowservices.github.io
   resources:
   - servers/finalizers
   verbs:
@@ -185,7 +185,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - dws.cray.hpe.com
+  - dataworkflowservices.github.io
   resources:
   - servers/status
   verbs:
@@ -197,7 +197,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - dws.cray.hpe.com
+  - dataworkflowservices.github.io
   resources:
   - storages
   verbs:
@@ -209,15 +209,15 @@ rules:
   - update
   - watch
 - apiGroups:
-  - dws.cray.hpe.com
+  - dataworkflowservices.github.io
   resources:
   - storages/status
   verbs:
   - get
   - patch
   - update
 - apiGroups:
-  - dws.cray.hpe.com
+  - dataworkflowservices.github.io
   resources:
   - systemconfigurations
   verbs:
@@ -226,21 +226,21 @@ rules:
   - update
   - watch
 - apiGroups:
-  - dws.cray.hpe.com
+  - dataworkflowservices.github.io
   resources:
   - systemconfigurations/finalizers
   verbs:
   - update
 - apiGroups:
-  - dws.cray.hpe.com
+  - dataworkflowservices.github.io
   resources:
   - systemconfigurations/status
   verbs:
   - get
   - patch
   - update
 - apiGroups:
-  - dws.cray.hpe.com
+  - dataworkflowservices.github.io
   resources:
   - workflows
   verbs:
@@ -250,7 +250,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - dws.cray.hpe.com
+  - dataworkflowservices.github.io
   resources:
   - workflows/finalizers
   verbs:

diff --git a/config/samples/dws_v1alpha1_workflow.yaml b/config/samples/dws_v1alpha1_workflow.yaml
@@ -1,4 +1,4 @@
-apiVersion: dws.cray.hpe.com/v1alpha1
+apiVersion: dataworkflowservices.github.io/v1alpha1
 kind: Workflow
 metadata:
   name: dws-workflow-test

diff --git a/controllers/directivebreakdown_controller.go b/controllers/directivebreakdown_controller.go
@@ -39,9 +39,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 
-	dwsv1alpha2 "github.com/HewlettPackard/dws/api/v1alpha2"
-	"github.com/HewlettPackard/dws/utils/dwdparse"
-	"github.com/HewlettPackard/dws/utils/updater"
+	dwsv1alpha2 "github.com/DataWorkflowServices/dws/api/v1alpha2"
+	"github.com/DataWorkflowServices/dws/utils/dwdparse"
+	"github.com/DataWorkflowServices/dws/utils/updater"
 	nnfv1alpha1 "github.com/NearNodeFlash/nnf-sos/api/v1alpha1"
 	"github.com/NearNodeFlash/nnf-sos/controllers/metrics"
 )
@@ -83,11 +83,11 @@ type lustreComponentType struct {
 	colocationKey *dwsv1alpha2.AllocationSetColocationConstraint
 }
 
-//+kubebuilder:rbac:groups=dws.cray.hpe.com,resources=directivebreakdowns,verbs=get;list;watch;create;update;patch;delete
-//+kubebuilder:rbac:groups=dws.cray.hpe.com,resources=directivebreakdowns/status,verbs=get;list;watch;create;update;patch
-//+kubebuilder:rbac:groups=dws.cray.hpe.com,resources=directivebreakdowns/finalizers,verbs=update
-//+kubebuilder:rbac:groups=dws.cray.hpe.com,resources=servers,verbs=get;list;watch;create;update;patch;delete
-//+kubebuilder:rbac:groups=dws.cray.hpe.com,resources=persistentstorageinstances,verbs=get;list;watch;create;update;patch;delete
+//+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=directivebreakdowns,verbs=get;list;watch;create;update;patch;delete
+//+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=directivebreakdowns/status,verbs=get;list;watch;create;update;patch
+//+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=directivebreakdowns/finalizers,verbs=update
+//+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=servers,verbs=get;list;watch;create;update;patch;delete
+//+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=persistentstorageinstances,verbs=get;list;watch;create;update;patch;delete
 
 // Reconcile is part of the main kubernetes reconciliation loop which aims to
 // move the current state of the directiveBreakdown closer to the desired state.

diff --git a/controllers/directivebreakdown_controller_test.go b/controllers/directivebreakdown_controller_test.go
@@ -10,7 +10,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	dwsv1alpha2 "github.com/HewlettPackard/dws/api/v1alpha2"
+	dwsv1alpha2 "github.com/DataWorkflowServices/dws/api/v1alpha2"
 	nnfv1alpha1 "github.com/NearNodeFlash/nnf-sos/api/v1alpha1"
 )