Follow DWS from HewlettPackard/dws to DataWorkflowServices/dws

Signed-off-by: Dean Roehrich <[email protected]>
NearNodeFlash · Sep 13, 2023 · 59f7305 · 59f7305
1 parent ee2d25c
commit 59f7305
Show file tree

Hide file tree

Showing 43 changed files with 94 additions and 92 deletions.
diff --git a/config/rbac/daemon_role.yaml b/config/rbac/daemon_role.yaml
@@ -13,21 +13,21 @@ rules:
   - list
   - watch
 - apiGroups:
-  - dws.cray.hpe.com
+  - dataworkflowservices.github.io
   resources:
   - clientmounts
   verbs:
   - get
   - list
 - apiGroups:
-  - dws.cray.hpe.com
+  - dataworkflowservices.github.io
   resources:
   - clientmounts/status
   verbs:
   - get
   - list
 - apiGroups:
-  - dws.cray.hpe.com
+  - dataworkflowservices.github.io
   resources:
   - systemconfigurations
   verbs:

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -78,6 +78,28 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - dataworkflowservices.github.io
+  resources:
+  - clientmounts
+  verbs:
+  - get
+  - list
+- apiGroups:
+  - dataworkflowservices.github.io
+  resources:
+  - clientmounts/status
+  verbs:
+  - get
+  - list
+- apiGroups:
+  - dataworkflowservices.github.io
+  resources:
+  - systemconfigurations
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - dm.cray.hpe.com
   resources:
@@ -104,28 +126,6 @@ rules:
   - get
   - patch
   - update
-- apiGroups:
-  - dws.cray.hpe.com
-  resources:
-  - clientmounts
-  verbs:
-  - get
-  - list
-- apiGroups:
-  - dws.cray.hpe.com
-  resources:
-  - clientmounts/status
-  verbs:
-  - get
-  - list
-- apiGroups:
-  - dws.cray.hpe.com
-  resources:
-  - systemconfigurations
-  verbs:
-  - get
-  - list
-  - watch
 - apiGroups:
   - lus.cray.hpe.com
   resources:

diff --git a/controllers/datamovement_controller.go b/controllers/datamovement_controller.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,
@@ -51,7 +51,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/yaml"
 
-	dwsv1alpha2 "github.com/HewlettPackard/dws/api/v1alpha2"
+	dwsv1alpha2 "github.com/DataWorkflowServices/dws/api/v1alpha2"
 	dmv1alpha1 "github.com/NearNodeFlash/nnf-dm/api/v1alpha1"
 	"github.com/NearNodeFlash/nnf-dm/controllers/metrics"
 	nnfv1alpha1 "github.com/NearNodeFlash/nnf-sos/api/v1alpha1"
@@ -127,8 +127,8 @@ func (i *invalidError) Unwrap() error { return i.err }
 //+kubebuilder:rbac:groups=nnf.cray.hpe.com,resources=nnfdatamovements/status,verbs=get;update;patch
 //+kubebuilder:rbac:groups=nnf.cray.hpe.com,resources=nnfdatamovements/finalizers,verbs=update
 //+kubebuilder:rbac:groups=nnf.cray.hpe.com,resources=nnfstorages,verbs=get;list;watch
-//+kubebuilder:rbac:groups=dws.cray.hpe.com,resources=clientmounts,verbs=get;list
-//+kubebuilder:rbac:groups=dws.cray.hpe.com,resources=clientmounts/status,verbs=get;list
+//+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=clientmounts,verbs=get;list
+//+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=clientmounts/status,verbs=get;list
 //+kubebuilder:rbac:groups=lus.cray.hpe.com,resources=lustrefilesystems,verbs=get;list;watch
 //+kubebuilder:rbac:groups=core,resources=pods,verbs=get;list;watch;update
 //+kubebuilder:rbac:groups=core,resources=pods/status,verbs=get;list;watch;update

diff --git a/daemons/compute/server/servers/server_default.go b/daemons/compute/server/servers/server_default.go
@@ -50,7 +50,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/event"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 
-	dwsv1alpha2 "github.com/HewlettPackard/dws/api/v1alpha2"
+	dwsv1alpha2 "github.com/DataWorkflowServices/dws/api/v1alpha2"
 	lusv1beta1 "github.com/NearNodeFlash/lustre-fs-operator/api/v1beta1"
 	dmv1alpha1 "github.com/NearNodeFlash/nnf-dm/api/v1alpha1"
 	nnfv1alpha1 "github.com/NearNodeFlash/nnf-sos/api/v1alpha1"
@@ -94,7 +94,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=dws.cray.hpe.com,resources=systemconfigurations,verbs=get;list;watch
+//+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=systemconfigurations,verbs=get;list;watch
 
 func CreateDefaultServer(opts *ServerOptions) (*defaultServer, error) {
 

diff --git a/go.mod b/go.mod
@@ -3,9 +3,8 @@ module github.com/NearNodeFlash/nnf-dm
 go 1.19
 
 require (
-	github.com/HewlettPackard/dws v0.0.1-0.20230907181649-2f6d9fca4249
-	github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20230613180840-6178f2b04900
-	github.com/NearNodeFlash/nnf-sos v0.0.1-0.20230912190441-e4282237ad12
+	github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20230913194514-b3de4661519a
+	github.com/NearNodeFlash/nnf-sos v0.0.1-0.20230913195636-cba968acdab5
 	github.com/onsi/ginkgo/v2 v2.9.1
 	github.com/onsi/gomega v1.27.3
 	github.com/prometheus/client_golang v1.14.0
@@ -75,7 +74,10 @@ require (
 	sigs.k8s.io/yaml v1.3.0
 )
 
-require go.openly.dev/pointy v1.3.0
+require (
+	github.com/DataWorkflowServices/dws v0.0.1-0.20230913193551-2ee6df5c8f3d
+	go.openly.dev/pointy v1.3.0
+)
 
 require (
 	github.com/emicklei/go-restful/v3 v3.10.1 // indirect

diff --git a/go.sum b/go.sum
@@ -1,14 +1,14 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/HewlettPackard/dws v0.0.1-0.20230907181649-2f6d9fca4249 h1:t5ibQcHcEL374lxAVVXtHqXOZbPvDVSDSrrAVl7yzBA=
-github.com/HewlettPackard/dws v0.0.1-0.20230907181649-2f6d9fca4249/go.mod h1:YvNzcgAPmwhl/YQj6dMwsB9OpwbI5bp/41kINfFiXX8=
-github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20230613180840-6178f2b04900 h1:jOrP2H+D5amgHIONcucYS3/kJm6QfmqAG23Ke7elunI=
-github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20230613180840-6178f2b04900/go.mod h1:O71nfDnuK7MZZYAW9kaOFTMo48nmDlaYnzISXEPsKSw=
+github.com/DataWorkflowServices/dws v0.0.1-0.20230913193551-2ee6df5c8f3d h1:h1KajEbTArilowKKS7hg3Q2MyBkdk68/AmWJRvgv7xw=
+github.com/DataWorkflowServices/dws v0.0.1-0.20230913193551-2ee6df5c8f3d/go.mod h1:ZQsfcByZ05Ah9yrgOJsN3JPz4jo374DrdVv8kvcIquA=
+github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20230913194514-b3de4661519a h1:IYZulSyDlWL0H4ulbvzR7klbUKNhQxc02Kf9NW/++8U=
+github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20230913194514-b3de4661519a/go.mod h1:pFelIrkMeG0HawfIOphB2A79I22/g3Y7lHrWLEjgD/M=
 github.com/NearNodeFlash/nnf-ec v0.0.0-20230526161255-cfb2d89b35d7 h1:y4E3b/Ta6sqv+huYQXYKZmPCMWMZtG2kV8/qgTIpzFI=
 github.com/NearNodeFlash/nnf-ec v0.0.0-20230526161255-cfb2d89b35d7/go.mod h1:11Ol46sAWdqlj3WmIFTzKO+UxQX3lvWBqpe6yaiMEIg=
-github.com/NearNodeFlash/nnf-sos v0.0.1-0.20230912190441-e4282237ad12 h1:/5979mYLTlppq/ZHFcXMR2cHs8Jnwfsy0fcZ7RUHdeI=
-github.com/NearNodeFlash/nnf-sos v0.0.1-0.20230912190441-e4282237ad12/go.mod h1:Pe0/9NHKInVZT2CK8NXMeEpiIGI0cGP2tVsmdQWi9oI=
+github.com/NearNodeFlash/nnf-sos v0.0.1-0.20230913195636-cba968acdab5 h1:YHIpZ7SyanMkqD23WHdykjxQaDSq5p03H5BPT5LPfhc=
+github.com/NearNodeFlash/nnf-sos v0.0.1-0.20230913195636-cba968acdab5/go.mod h1:R84l7sSBPDpvU9rwAhmMh+2Hndk+Uxat2sRDAy2HHhw=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=

diff --git a/vendor/github.com/HewlettPackard/dws/LICENSE → ...thub.com/DataWorkflowServices/dws/LICENSE b/vendor/github.com/HewlettPackard/dws/LICENSE → ...thub.com/DataWorkflowServices/dws/LICENSE
diff --git a/...ard/dws/api/v1alpha2/clientmount_types.go → ...ces/dws/api/v1alpha2/clientmount_types.go b/...ard/dws/api/v1alpha2/clientmount_types.go → ...ces/dws/api/v1alpha2/clientmount_types.go
diff --git a/...d/dws/api/v1alpha2/clientmount_webhook.go → ...s/dws/api/v1alpha2/clientmount_webhook.go b/...d/dws/api/v1alpha2/clientmount_webhook.go → ...s/dws/api/v1alpha2/clientmount_webhook.go
diff --git a/...ackard/dws/api/v1alpha2/computes_types.go → ...rvices/dws/api/v1alpha2/computes_types.go b/...ackard/dws/api/v1alpha2/computes_types.go → ...rvices/dws/api/v1alpha2/computes_types.go
diff --git a/...kard/dws/api/v1alpha2/computes_webhook.go → ...ices/dws/api/v1alpha2/computes_webhook.go b/...kard/dws/api/v1alpha2/computes_webhook.go → ...ices/dws/api/v1alpha2/computes_webhook.go
diff --git a/...ettPackard/dws/api/v1alpha2/conversion.go → ...owServices/dws/api/v1alpha2/conversion.go b/...ettPackard/dws/api/v1alpha2/conversion.go → ...owServices/dws/api/v1alpha2/conversion.go
diff --git a/.../api/v1alpha2/directivebreakdown_types.go → .../api/v1alpha2/directivebreakdown_types.go b/.../api/v1alpha2/directivebreakdown_types.go → .../api/v1alpha2/directivebreakdown_types.go
diff --git a/...pi/v1alpha2/directivebreakdown_webhook.go → ...pi/v1alpha2/directivebreakdown_webhook.go b/...pi/v1alpha2/directivebreakdown_webhook.go → ...pi/v1alpha2/directivebreakdown_webhook.go
diff --git a/...dws/api/v1alpha2/dwdirectiverule_types.go → ...dws/api/v1alpha2/dwdirectiverule_types.go b/...dws/api/v1alpha2/dwdirectiverule_types.go → ...dws/api/v1alpha2/dwdirectiverule_types.go
diff --git a/...s/api/v1alpha2/dwdirectiverule_webhook.go → ...s/api/v1alpha2/dwdirectiverule_webhook.go b/...s/api/v1alpha2/dwdirectiverule_webhook.go → ...s/api/v1alpha2/dwdirectiverule_webhook.go
diff --git a/...ard/dws/api/v1alpha2/groupversion_info.go → ...ces/dws/api/v1alpha2/groupversion_info.go b/...ard/dws/api/v1alpha2/groupversion_info.go → ...ces/dws/api/v1alpha2/groupversion_info.go
diff --git a/...tPackard/dws/api/v1alpha2/owner_labels.go → ...Services/dws/api/v1alpha2/owner_labels.go b/...tPackard/dws/api/v1alpha2/owner_labels.go → ...Services/dws/api/v1alpha2/owner_labels.go
diff --git a/...alpha2/persistentstorageinstance_types.go → ...alpha2/persistentstorageinstance_types.go b/...alpha2/persistentstorageinstance_types.go → ...alpha2/persistentstorageinstance_types.go
diff --git a/...pha2/persistentstorageinstance_webhook.go → ...pha2/persistentstorageinstance_webhook.go b/...pha2/persistentstorageinstance_webhook.go → ...pha2/persistentstorageinstance_webhook.go
diff --git a/...wlettPackard/dws/api/v1alpha2/resource.go → ...flowServices/dws/api/v1alpha2/resource.go b/...wlettPackard/dws/api/v1alpha2/resource.go → ...flowServices/dws/api/v1alpha2/resource.go
diff --git a/...ackard/dws/api/v1alpha2/resource_error.go → ...rvices/dws/api/v1alpha2/resource_error.go b/...ackard/dws/api/v1alpha2/resource_error.go → ...rvices/dws/api/v1alpha2/resource_error.go
diff --git a/...Packard/dws/api/v1alpha2/servers_types.go → ...ervices/dws/api/v1alpha2/servers_types.go b/...Packard/dws/api/v1alpha2/servers_types.go → ...ervices/dws/api/v1alpha2/servers_types.go
diff --git a/...ckard/dws/api/v1alpha2/servers_webhook.go → ...vices/dws/api/v1alpha2/servers_webhook.go b/...ckard/dws/api/v1alpha2/servers_webhook.go → ...vices/dws/api/v1alpha2/servers_webhook.go
diff --git a/...Packard/dws/api/v1alpha2/storage_types.go → ...ervices/dws/api/v1alpha2/storage_types.go b/...Packard/dws/api/v1alpha2/storage_types.go → ...ervices/dws/api/v1alpha2/storage_types.go
diff --git a/...ckard/dws/api/v1alpha2/storage_webhook.go → ...vices/dws/api/v1alpha2/storage_webhook.go b/...ckard/dws/api/v1alpha2/storage_webhook.go → ...vices/dws/api/v1alpha2/storage_webhook.go
diff --git a/...api/v1alpha2/systemconfiguration_types.go → ...api/v1alpha2/systemconfiguration_types.go b/...api/v1alpha2/systemconfiguration_types.go → ...api/v1alpha2/systemconfiguration_types.go
diff --git a/...i/v1alpha2/systemconfiguration_webhook.go → ...i/v1alpha2/systemconfiguration_webhook.go b/...i/v1alpha2/systemconfiguration_webhook.go → ...i/v1alpha2/systemconfiguration_webhook.go
diff --git a/...ackard/dws/api/v1alpha2/workflow_types.go → ...rvices/dws/api/v1alpha2/workflow_types.go b/...ackard/dws/api/v1alpha2/workflow_types.go → ...rvices/dws/api/v1alpha2/workflow_types.go
diff --git a/...kard/dws/api/v1alpha2/workflow_webhook.go → ...ices/dws/api/v1alpha2/workflow_webhook.go b/...kard/dws/api/v1alpha2/workflow_webhook.go → ...ices/dws/api/v1alpha2/workflow_webhook.go