Skip to content

Commit

Permalink
Follow DWS from HewlettPackard/dws to DataWorkflowServices/dws
Browse files Browse the repository at this point in the history
Signed-off-by: Dean Roehrich <[email protected]>
  • Loading branch information
roehrich-hpe committed Sep 13, 2023
1 parent e428223 commit cba968a
Show file tree
Hide file tree
Showing 91 changed files with 214 additions and 214 deletions.
12 changes: 6 additions & 6 deletions PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions api/v1alpha1/nnf_access_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha1/nnf_datamovement_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions api/v1alpha1/nnf_node_storage_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions api/v1alpha1/nnf_node_types.go
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha1/nnf_port_manager_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions api/v1alpha1/nnf_resource_status_type.go
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions api/v1alpha1/nnf_storage_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion config/dws/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Adds namespace to all resources.
namespace: dws-operator-system
namespace: dws-system

resources:
- nnf-ruleset.yaml
2 changes: 1 addition & 1 deletion config/dws/nnf-ruleset.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: dws.cray.hpe.com/v1alpha2
apiVersion: dataworkflowservices.github.io/v1alpha2
kind: DWDirectiveRule
metadata:
name: nnf
Expand Down
40 changes: 20 additions & 20 deletions config/rbac/role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ rules:
- patch
- update
- apiGroups:
- dws.cray.hpe.com
- dataworkflowservices.github.io
resources:
- clientmounts
verbs:
Expand All @@ -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:
Expand All @@ -95,7 +95,7 @@ rules:
- update
- watch
- apiGroups:
- dws.cray.hpe.com
- dataworkflowservices.github.io
resources:
- directivebreakdowns
verbs:
Expand All @@ -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:
Expand All @@ -125,7 +125,7 @@ rules:
- update
- watch
- apiGroups:
- dws.cray.hpe.com
- dataworkflowservices.github.io
resources:
- nnfstorage
verbs:
Expand All @@ -136,7 +136,7 @@ rules:
- update
- watch
- apiGroups:
- dws.cray.hpe.com
- dataworkflowservices.github.io
resources:
- persistentstorageinstances
verbs:
Expand All @@ -149,7 +149,7 @@ rules:
- update
- watch
- apiGroups:
- dws.cray.hpe.com
- dataworkflowservices.github.io
resources:
- persistentstorageinstances/status
verbs:
Expand All @@ -160,7 +160,7 @@ rules:
- update
- watch
- apiGroups:
- dws.cray.hpe.com
- dataworkflowservices.github.io
resources:
- servers
verbs:
Expand All @@ -173,7 +173,7 @@ rules:
- update
- watch
- apiGroups:
- dws.cray.hpe.com
- dataworkflowservices.github.io
resources:
- servers/finalizers
verbs:
Expand All @@ -185,7 +185,7 @@ rules:
- update
- watch
- apiGroups:
- dws.cray.hpe.com
- dataworkflowservices.github.io
resources:
- servers/status
verbs:
Expand All @@ -197,7 +197,7 @@ rules:
- update
- watch
- apiGroups:
- dws.cray.hpe.com
- dataworkflowservices.github.io
resources:
- storages
verbs:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -250,7 +250,7 @@ rules:
- update
- watch
- apiGroups:
- dws.cray.hpe.com
- dataworkflowservices.github.io
resources:
- workflows/finalizers
verbs:
Expand Down
2 changes: 1 addition & 1 deletion config/samples/dws_v1alpha1_workflow.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: dws.cray.hpe.com/v1alpha1
apiVersion: dataworkflowservices.github.io/v1alpha1
kind: Workflow
metadata:
name: dws-workflow-test
Expand Down
16 changes: 8 additions & 8 deletions controllers/directivebreakdown_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion controllers/directivebreakdown_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
10 changes: 5 additions & 5 deletions controllers/dws_servers_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ import (
"sigs.k8s.io/controller-runtime/pkg/reconcile"
"sigs.k8s.io/controller-runtime/pkg/source"

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"
nnfv1alpha1 "github.com/NearNodeFlash/nnf-sos/api/v1alpha1"
"github.com/NearNodeFlash/nnf-sos/controllers/metrics"
)
Expand All @@ -67,9 +67,9 @@ const (
storageStillAllocated deletedStorage = false
)

//+kubebuilder:rbac:groups=dws.cray.hpe.com,resources=servers,verbs=get;create;list;watch;update;patch;delete
//+kubebuilder:rbac:groups=dws.cray.hpe.com,resources=servers/status,verbs=get;create;list;watch;update;patch;delete
//+kubebuilder:rbac:groups=dws.cray.hpe.com,resources=servers/finalizers,verbs=get;create;list;watch;update;patch;delete
//+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=servers,verbs=get;create;list;watch;update;patch;delete
//+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=servers/status,verbs=get;create;list;watch;update;patch;delete
//+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=servers/finalizers,verbs=get;create;list;watch;update;patch;delete
//+kubebuilder:rbac:groups=nnf.cray.hpe.com,resources=nnfstorages,verbs=get;list;watch;update;patch
//+kubebuilder:rbac:groups=nnf.cray.hpe.com,resources=nnfstorages/status,verbs=get;list;watch;update;patch
//+kubebuilder:rbac:groups=nnf.cray.hpe.com,resources=nnfnodestorages,verbs=get;list;watch;update;patch
Expand Down
8 changes: 4 additions & 4 deletions controllers/dws_storage_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ import (
"sigs.k8s.io/controller-runtime/pkg/reconcile"
"sigs.k8s.io/controller-runtime/pkg/source"

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"
nnfv1alpha1 "github.com/NearNodeFlash/nnf-sos/api/v1alpha1"
)

Expand All @@ -46,8 +46,8 @@ type DWSStorageReconciler struct {
Scheme *runtime.Scheme
}

// +kubebuilder:rbac:groups=dws.cray.hpe.com,resources=storages,verbs=get;create;list;watch;update;patch;delete
// +kubebuilder:rbac:groups=dws.cray.hpe.com,resources=storages/status,verbs=get;update;patch
// +kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=storages,verbs=get;create;list;watch;update;patch;delete
// +kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=storages/status,verbs=get;update;patch
// +kubebuilder:rbac:groups=nnf.cray.hpe.com,resources=nnfnodes,verbs=get;list;watch;
// +kubebuilder:rbac:groups=nnf.cray.hpe.com,resources=nnfnodes/status,verbs=get;update;patch
// +kubebuilder:rbac:groups=core,resources=nodes,verbs=get;list;watch
Expand Down
4 changes: 2 additions & 2 deletions controllers/integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ import (
"k8s.io/apimachinery/pkg/util/intstr"
"sigs.k8s.io/controller-runtime/pkg/client"

dwsv1alpha2 "github.com/HewlettPackard/dws/api/v1alpha2"
dwparse "github.com/HewlettPackard/dws/utils/dwdparse"
dwsv1alpha2 "github.com/DataWorkflowServices/dws/api/v1alpha2"
dwparse "github.com/DataWorkflowServices/dws/utils/dwdparse"
lusv1beta1 "github.com/NearNodeFlash/lustre-fs-operator/api/v1beta1"
nnfv1alpha1 "github.com/NearNodeFlash/nnf-sos/api/v1alpha1"
)
Expand Down
Loading

0 comments on commit cba968a

Please sign in to comment.