From e4282237ad12046d283e50f30f473e1a87e75cd2 Mon Sep 17 00:00:00 2001 From: Blake Devcich Date: Fri, 8 Sep 2023 15:09:46 -0500 Subject: [PATCH 1/2] Added user mpirun hostfile slots to NnfDataMovement Signed-off-by: Blake Devcich --- api/v1alpha1/nnf_datamovement_types.go | 8 ++++++++ api/v1alpha1/zz_generated.deepcopy.go | 12 +++++++++++- .../crd/bases/nnf.cray.hpe.com_nnfdatamovements.yaml | 10 ++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/api/v1alpha1/nnf_datamovement_types.go b/api/v1alpha1/nnf_datamovement_types.go index e5fc744e6..59d69bb0b 100644 --- a/api/v1alpha1/nnf_datamovement_types.go +++ b/api/v1alpha1/nnf_datamovement_types.go @@ -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/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go index 361596a16..fc3e61d12 100644 --- a/api/v1alpha1/zz_generated.deepcopy.go +++ b/api/v1alpha1/zz_generated.deepcopy.go @@ -347,6 +347,16 @@ func (in *NnfDataMovementCommandStatus) DeepCopy() *NnfDataMovementCommandStatus // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *NnfDataMovementConfig) DeepCopyInto(out *NnfDataMovementConfig) { *out = *in + if in.Slots != nil { + in, out := &in.Slots, &out.Slots + *out = new(int) + **out = **in + } + if in.MaxSlots != nil { + in, out := &in.MaxSlots, &out.MaxSlots + *out = new(int) + **out = **in + } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NnfDataMovementConfig. @@ -407,7 +417,7 @@ func (in *NnfDataMovementSpec) DeepCopyInto(out *NnfDataMovementSpec) { if in.UserConfig != nil { in, out := &in.UserConfig, &out.UserConfig *out = new(NnfDataMovementConfig) - **out = **in + (*in).DeepCopyInto(*out) } } diff --git a/config/crd/bases/nnf.cray.hpe.com_nnfdatamovements.yaml b/config/crd/bases/nnf.cray.hpe.com_nnfdatamovements.yaml index 96661f84b..45f0100a8 100644 --- 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 From fde84981792a6aa2e3099adc1fd8236c046b159e Mon Sep 17 00:00:00 2001 From: Dean Roehrich Date: Wed, 13 Sep 2023 16:06:57 -0500 Subject: [PATCH 2/2] Follow DWS from HewlettPackard/dws to DataWorkflowServices/dws (#226) Signed-off-by: Dean Roehrich --- PROJECT | 12 +++--- api/v1alpha1/nnf_access_types.go | 4 +- api/v1alpha1/nnf_datamovement_types.go | 2 +- api/v1alpha1/nnf_node_storage_types.go | 4 +- api/v1alpha1/nnf_node_types.go | 4 +- api/v1alpha1/nnf_port_manager_types.go | 2 +- api/v1alpha1/nnf_resource_status_type.go | 4 +- api/v1alpha1/nnf_storage_types.go | 4 +- config/dws/kustomization.yaml | 2 +- config/dws/nnf-ruleset.yaml | 2 +- config/rbac/role.yaml | 40 +++++++++---------- config/samples/dws_v1alpha1_workflow.yaml | 2 +- controllers/directivebreakdown_controller.go | 16 ++++---- .../directivebreakdown_controller_test.go | 2 +- controllers/dws_servers_controller.go | 10 ++--- controllers/dws_storage_controller.go | 8 ++-- controllers/integration_test.go | 4 +- controllers/nnf_access_controller.go | 8 ++-- controllers/nnf_access_controller_test.go | 2 +- controllers/nnf_clientmount_controller.go | 10 ++--- controllers/nnf_node_controller.go | 8 ++-- controllers/nnf_node_storage_controller.go | 4 +- ...nf_persistentstorageinstance_controller.go | 14 +++---- ...rsistentstorageinstance_controller_test.go | 4 +- controllers/nnf_port_manager_controller.go | 8 ++-- .../nnf_port_manager_controller_test.go | 2 +- controllers/nnf_storage_controller.go | 4 +- .../nnf_systemconfiguration_controller.go | 10 ++--- ...nnf_systemconfiguration_controller_test.go | 2 +- controllers/nnf_workflow_controller.go | 20 +++++----- ...f_workflow_controller_container_helpers.go | 2 +- .../nnf_workflow_controller_helpers.go | 4 +- controllers/nnf_workflow_controller_test.go | 2 +- controllers/nnfcontainerprofile_helpers.go | 4 +- controllers/nnfcontainerprofile_test.go | 2 +- controllers/nnfstorageprofile_helpers.go | 4 +- controllers/suite_test.go | 14 +++---- deploy.sh | 2 +- go.mod | 4 +- go.sum | 8 ++-- main.go | 4 +- .../dws/LICENSE | 0 .../dws/api/v1alpha2/clientmount_types.go | 4 +- .../dws/api/v1alpha2/clientmount_webhook.go | 0 .../dws/api/v1alpha2/computes_types.go | 0 .../dws/api/v1alpha2/computes_webhook.go | 0 .../dws/api/v1alpha2/conversion.go | 0 .../api/v1alpha2/directivebreakdown_types.go | 4 +- .../v1alpha2/directivebreakdown_webhook.go | 0 .../dws/api/v1alpha2/dwdirectiverule_types.go | 4 +- .../api/v1alpha2/dwdirectiverule_webhook.go | 0 .../dws/api/v1alpha2/groupversion_info.go | 4 +- .../dws/api/v1alpha2/owner_labels.go | 8 ++-- .../persistentstorageinstance_types.go | 8 ++-- .../persistentstorageinstance_webhook.go | 0 .../dws/api/v1alpha2/resource.go | 0 .../dws/api/v1alpha2/resource_error.go | 0 .../dws/api/v1alpha2/servers_types.go | 4 +- .../dws/api/v1alpha2/servers_webhook.go | 0 .../dws/api/v1alpha2/storage_types.go | 8 ++-- .../dws/api/v1alpha2/storage_webhook.go | 0 .../api/v1alpha2/systemconfiguration_types.go | 2 +- .../v1alpha2/systemconfiguration_webhook.go | 0 .../dws/api/v1alpha2/workflow_types.go | 6 +-- .../dws/api/v1alpha2/workflow_webhook.go | 10 ++--- .../dws/api/v1alpha2/zz_generated.deepcopy.go | 2 +- .../dws/config/crd/bases/crd.go | 0 ...kflowservices.github.io_clientmounts.yaml} | 4 +- ...aworkflowservices.github.io_computes.yaml} | 4 +- ...rvices.github.io_directivebreakdowns.yaml} | 4 +- ...wservices.github.io_dwdirectiverules.yaml} | 4 +- ...github.io_persistentstorageinstances.yaml} | 4 +- ...taworkflowservices.github.io_servers.yaml} | 4 +- ...aworkflowservices.github.io_storages.yaml} | 4 +- ...vices.github.io_systemconfigurations.yaml} | 4 +- ...workflowservices.github.io_workflows.yaml} | 4 +- .../dws/config/webhook/kustomization.yaml | 0 .../dws/config/webhook/kustomizeconfig.yaml | 0 .../dws/config/webhook/manifests.yaml | 8 ++-- .../dws/config/webhook/service.yaml | 0 .../dws/config/webhook/service_account.yaml | 0 .../dws/config/webhook/webhook.go | 0 .../dws/controllers/clientmount_controller.go | 14 +++---- .../dws/controllers/metrics/metrics.go | 0 .../dws/controllers/workflow_controller.go | 16 ++++---- .../dws/utils/dwdparse/dwdparse.go | 0 .../utils/dwdparse/zz_generated.deepcopy.go | 0 .../dws/utils/ports/ports.go | 0 .../dws/utils/updater/status_updater.go | 0 .../api/v1beta1/lustrefilesystem_types.go | 2 +- vendor/modules.txt | 20 +++++----- 91 files changed, 214 insertions(+), 214 deletions(-) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/LICENSE (100%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/clientmount_types.go (98%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/clientmount_webhook.go (100%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/computes_types.go (100%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/computes_webhook.go (100%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/conversion.go (100%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/directivebreakdown_types.go (98%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/directivebreakdown_webhook.go (100%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/dwdirectiverule_types.go (92%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/dwdirectiverule_webhook.go (100%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/groupversion_info.go (89%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/owner_labels.go (96%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/persistentstorageinstance_types.go (93%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/persistentstorageinstance_webhook.go (100%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/resource.go (100%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/resource_error.go (100%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/servers_types.go (97%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/servers_webhook.go (100%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/storage_types.go (95%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/storage_webhook.go (100%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/systemconfiguration_types.go (98%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/systemconfiguration_webhook.go (100%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/workflow_types.go (98%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/workflow_webhook.go (92%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/zz_generated.deepcopy.go (99%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/config/crd/bases/crd.go (100%) rename vendor/github.com/{HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_clientmounts.yaml => DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_clientmounts.yaml} (99%) rename vendor/github.com/{HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_computes.yaml => DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_computes.yaml} (97%) rename vendor/github.com/{HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_directivebreakdowns.yaml => DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_directivebreakdowns.yaml} (99%) rename vendor/github.com/{HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_dwdirectiverules.yaml => DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_dwdirectiverules.yaml} (98%) rename vendor/github.com/{HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_persistentstorageinstances.yaml => DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_persistentstorageinstances.yaml} (99%) rename vendor/github.com/{HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_servers.yaml => DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_servers.yaml} (99%) rename vendor/github.com/{HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_storages.yaml => DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_storages.yaml} (99%) rename vendor/github.com/{HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_systemconfigurations.yaml => DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_systemconfigurations.yaml} (99%) rename vendor/github.com/{HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_workflows.yaml => DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_workflows.yaml} (99%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/config/webhook/kustomization.yaml (100%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/config/webhook/kustomizeconfig.yaml (100%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/config/webhook/manifests.yaml (81%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/config/webhook/service.yaml (100%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/config/webhook/service_account.yaml (100%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/config/webhook/webhook.go (100%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/controllers/clientmount_controller.go (87%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/controllers/metrics/metrics.go (100%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/controllers/workflow_controller.go (93%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/utils/dwdparse/dwdparse.go (100%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/utils/dwdparse/zz_generated.deepcopy.go (100%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/utils/ports/ports.go (100%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/utils/updater/status_updater.go (100%) diff --git a/PROJECT b/PROJECT index b1bb5bc78..61415673a 100644 --- 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 index 103a22947..6c941275f 100644 --- 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 index 59d69bb0b..295662ef7 100644 --- 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" diff --git a/api/v1alpha1/nnf_node_storage_types.go b/api/v1alpha1/nnf_node_storage_types.go index 579d8dca5..bc31a1fc1 100644 --- 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 index 75ebafabe..c7e8434c5 100644 --- 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 index fc447316d..d44586dc5 100644 --- 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 index 6508a98c3..050f2ca19 100644 --- 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 index de508c8e7..633451600 100644 --- 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/config/dws/kustomization.yaml b/config/dws/kustomization.yaml index 21dfb0b6c..6214db6c2 100644 --- 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 index 0bec8cec5..b42dc992b 100644 --- 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 index d0d73f160..3f276fe53 100644 --- 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,13 +70,13 @@ 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: @@ -84,7 +84,7 @@ rules: - 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,7 +209,7 @@ rules: - update - watch - apiGroups: - - dws.cray.hpe.com + - dataworkflowservices.github.io resources: - storages/status verbs: @@ -217,7 +217,7 @@ rules: - patch - update - apiGroups: - - dws.cray.hpe.com + - dataworkflowservices.github.io resources: - systemconfigurations verbs: @@ -226,13 +226,13 @@ 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: @@ -240,7 +240,7 @@ rules: - 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 index 12ff8c89e..8d3534f76 100644 --- 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 index 50ba92c2c..376cb9c37 100644 --- 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 index 4584bc107..45c2b1e60 100644 --- 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" ) diff --git a/controllers/dws_servers_controller.go b/controllers/dws_servers_controller.go index 51c438ed9..e4372bfe2 100644 --- a/controllers/dws_servers_controller.go +++ b/controllers/dws_servers_controller.go @@ -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" ) @@ -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 diff --git a/controllers/dws_storage_controller.go b/controllers/dws_storage_controller.go index 93dab915a..7ac8fb1ab 100644 --- a/controllers/dws_storage_controller.go +++ b/controllers/dws_storage_controller.go @@ -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" ) @@ -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 diff --git a/controllers/integration_test.go b/controllers/integration_test.go index 0414ab990..77af3c10c 100644 --- a/controllers/integration_test.go +++ b/controllers/integration_test.go @@ -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" ) diff --git a/controllers/nnf_access_controller.go b/controllers/nnf_access_controller.go index 78321c56b..65b977d3c 100644 --- a/controllers/nnf_access_controller.go +++ b/controllers/nnf_access_controller.go @@ -44,8 +44,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/handler" "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" ) @@ -72,8 +72,8 @@ const ( //+kubebuilder:rbac:groups=nnf.cray.hpe.com,resources=nnfaccesses/finalizers,verbs=update //+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;update;patch -//+kubebuilder:rbac:groups=dws.cray.hpe.com,resources=clientmounts,verbs=get;list;watch;create;update;patch;delete;deletecollection -//+kubebuilder:rbac:groups=dws.cray.hpe.com,resources=clientmounts/status,verbs=get;update;patch +//+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=clientmounts,verbs=get;list;watch;create;update;patch;delete;deletecollection +//+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=clientmounts/status,verbs=get;update;patch // Reconcile is part of the main kubernetes reconciliation loop which aims to // move the current state of the cluster closer to the desired state. diff --git a/controllers/nnf_access_controller_test.go b/controllers/nnf_access_controller_test.go index 7fd698bd2..8af8b0729 100644 --- a/controllers/nnf_access_controller_test.go +++ b/controllers/nnf_access_controller_test.go @@ -31,7 +31,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" ) diff --git a/controllers/nnf_clientmount_controller.go b/controllers/nnf_clientmount_controller.go index 8a8b3198c..30a55d01f 100644 --- a/controllers/nnf_clientmount_controller.go +++ b/controllers/nnf_clientmount_controller.go @@ -39,8 +39,8 @@ import ( nnf "github.com/NearNodeFlash/nnf-ec/pkg/manager-nnf" - 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" sf "github.com/NearNodeFlash/nnf-ec/pkg/rfsf/pkg/models" nnfv1alpha1 "github.com/NearNodeFlash/nnf-sos/api/v1alpha1" "github.com/NearNodeFlash/nnf-sos/controllers/metrics" @@ -60,9 +60,9 @@ type NnfClientMountReconciler struct { Scheme *kruntime.Scheme } -//+kubebuilder:rbac:groups=dws.cray.hpe.com,resources=clientmounts,verbs=get;list;watch;create;update;patch;delete -//+kubebuilder:rbac:groups=dws.cray.hpe.com,resources=clientmounts/status,verbs=get;update;patch -//+kubebuilder:rbac:groups=dws.cray.hpe.com,resources=clientmounts/finalizers,verbs=update +//+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=clientmounts,verbs=get;list;watch;create;update;patch;delete +//+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=clientmounts/status,verbs=get;update;patch +//+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=clientmounts/finalizers,verbs=update // Reconcile is part of the main kubernetes reconciliation loop which aims to // move the current state of the cluster closer to the desired state. diff --git a/controllers/nnf_node_controller.go b/controllers/nnf_node_controller.go index f45ce7192..c39603629 100644 --- a/controllers/nnf_node_controller.go +++ b/controllers/nnf_node_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, @@ -48,8 +48,8 @@ import ( nvme "github.com/NearNodeFlash/nnf-ec/pkg/manager-nvme" sf "github.com/NearNodeFlash/nnf-ec/pkg/rfsf/pkg/models" - 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" ) @@ -70,7 +70,7 @@ type NnfNodeReconciler struct { types.NamespacedName } -//+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 //+kubebuilder:rbac:groups=nnf.cray.hpe.com,resources=nnfnodes,verbs=get;list;watch;create;update;patch;delete //+kubebuilder:rbac:groups=nnf.cray.hpe.com,resources=nnfnodes/status,verbs=get;update;patch //+kubebuilder:rbac:groups=nnf.cray.hpe.com,resources=nnfnodes/finalizers,verbs=update diff --git a/controllers/nnf_node_storage_controller.go b/controllers/nnf_node_storage_controller.go index f036436bf..003b360e2 100644 --- a/controllers/nnf_node_storage_controller.go +++ b/controllers/nnf_node_storage_controller.go @@ -47,8 +47,8 @@ import ( openapi "github.com/NearNodeFlash/nnf-ec/pkg/rfsf/pkg/common" sf "github.com/NearNodeFlash/nnf-ec/pkg/rfsf/pkg/models" - 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" ) diff --git a/controllers/nnf_persistentstorageinstance_controller.go b/controllers/nnf_persistentstorageinstance_controller.go index 83f9307ec..57798c0c9 100644 --- a/controllers/nnf_persistentstorageinstance_controller.go +++ b/controllers/nnf_persistentstorageinstance_controller.go @@ -35,9 +35,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" ) @@ -55,10 +55,10 @@ type PersistentStorageReconciler struct { ChildObjects []dwsv1alpha2.ObjectList } -//+kubebuilder:rbac:groups=dws.cray.hpe.com,resources=persistentstorageinstances,verbs=get;list;watch;create;update;patch;delete -//+kubebuilder:rbac:groups=dws.cray.hpe.com,resources=persistentstorageinstances/status,verbs=get;list;watch;create;update;patch -//+kubebuilder:rbac:groups=dws.cray.hpe.com,resources=servers,verbs=get;list;watch;create;update;patch;delete;deletecollection -//+kubebuilder:rbac:groups=dws.cray.hpe.com,resources=nnfstorage,verbs=get;list;watch;update;delete;deletecollection +//+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=persistentstorageinstances,verbs=get;list;watch;create;update;patch;delete +//+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=persistentstorageinstances/status,verbs=get;list;watch;create;update;patch +//+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=servers,verbs=get;list;watch;create;update;patch;delete;deletecollection +//+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=nnfstorage,verbs=get;list;watch;update;delete;deletecollection // 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/nnf_persistentstorageinstance_controller_test.go b/controllers/nnf_persistentstorageinstance_controller_test.go index ab5280215..99917911a 100644 --- a/controllers/nnf_persistentstorageinstance_controller_test.go +++ b/controllers/nnf_persistentstorageinstance_controller_test.go @@ -1,5 +1,5 @@ /* - * Copyright 2022 Hewlett Packard Enterprise Development LP + * Copyright 2022-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, @@ -29,7 +29,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" ) diff --git a/controllers/nnf_port_manager_controller.go b/controllers/nnf_port_manager_controller.go index 1ca669090..bcff066a6 100644 --- a/controllers/nnf_port_manager_controller.go +++ b/controllers/nnf_port_manager_controller.go @@ -31,11 +31,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/log" - portsutil "github.com/HewlettPackard/dws/utils/ports" - "github.com/HewlettPackard/dws/utils/updater" + portsutil "github.com/DataWorkflowServices/dws/utils/ports" + "github.com/DataWorkflowServices/dws/utils/updater" "github.com/go-logr/logr" - dwsv1alpha2 "github.com/HewlettPackard/dws/api/v1alpha2" + dwsv1alpha2 "github.com/DataWorkflowServices/dws/api/v1alpha2" nnfv1alpha1 "github.com/NearNodeFlash/nnf-sos/api/v1alpha1" ) @@ -54,7 +54,7 @@ type AllocationStatus = nnfv1alpha1.NnfPortManagerAllocationStatus //+kubebuilder:rbac:groups=nnf.cray.hpe.com,resources=nnfportmanagers/finalizers,verbs=update // System Configuration provides the -//+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 // Reconcile is part of the main kubernetes reconciliation loop which aims to // move the current state of the cluster closer to the desired state. diff --git a/controllers/nnf_port_manager_controller_test.go b/controllers/nnf_port_manager_controller_test.go index 3c613baac..806b1ff4d 100644 --- a/controllers/nnf_port_manager_controller_test.go +++ b/controllers/nnf_port_manager_controller_test.go @@ -33,7 +33,7 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "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" ) diff --git a/controllers/nnf_storage_controller.go b/controllers/nnf_storage_controller.go index e407394eb..0051edc84 100644 --- a/controllers/nnf_storage_controller.go +++ b/controllers/nnf_storage_controller.go @@ -40,8 +40,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/handler" "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" ) diff --git a/controllers/nnf_systemconfiguration_controller.go b/controllers/nnf_systemconfiguration_controller.go index 2196095d1..e3d43829c 100644 --- a/controllers/nnf_systemconfiguration_controller.go +++ b/controllers/nnf_systemconfiguration_controller.go @@ -34,8 +34,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/handler" "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" "github.com/NearNodeFlash/nnf-sos/controllers/metrics" ) @@ -53,9 +53,9 @@ type NnfSystemConfigurationReconciler struct { Scheme *kruntime.Scheme } -//+kubebuilder:rbac:groups=dws.cray.hpe.com,resources=systemconfigurations,verbs=get;list;watch;update -//+kubebuilder:rbac:groups=dws.cray.hpe.com,resources=systemconfigurations/status,verbs=get;update;patch -//+kubebuilder:rbac:groups=dws.cray.hpe.com,resources=systemconfigurations/finalizers,verbs=update +//+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=systemconfigurations,verbs=get;list;watch;update +//+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=systemconfigurations/status,verbs=get;update;patch +//+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=systemconfigurations/finalizers,verbs=update //+kubebuilder:rbac:groups=core,resources=namespaces,verbs=get;list;watch;create;update;delete // Reconcile is part of the main kubernetes reconciliation loop which aims to diff --git a/controllers/nnf_systemconfiguration_controller_test.go b/controllers/nnf_systemconfiguration_controller_test.go index c92e24448..66399d253 100644 --- a/controllers/nnf_systemconfiguration_controller_test.go +++ b/controllers/nnf_systemconfiguration_controller_test.go @@ -28,7 +28,7 @@ import ( v1 "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" ) var _ = Describe("NnfSystemconfigurationController", func() { diff --git a/controllers/nnf_workflow_controller.go b/controllers/nnf_workflow_controller.go index 5b2aee1c2..41b6586f6 100644 --- a/controllers/nnf_workflow_controller.go +++ b/controllers/nnf_workflow_controller.go @@ -44,9 +44,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/handler" "sigs.k8s.io/controller-runtime/pkg/source" - 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" lusv1beta1 "github.com/NearNodeFlash/lustre-fs-operator/api/v1beta1" nnfv1alpha1 "github.com/NearNodeFlash/nnf-sos/api/v1alpha1" "github.com/NearNodeFlash/nnf-sos/controllers/metrics" @@ -68,17 +68,17 @@ type NnfWorkflowReconciler struct { ChildObjects []dwsv1alpha2.ObjectList } -//+kubebuilder:rbac:groups=dws.cray.hpe.com,resources=workflows,verbs=get;list;watch;update;patch -//+kubebuilder:rbac:groups=dws.cray.hpe.com,resources=workflows/finalizers,verbs=update -//+kubebuilder:rbac:groups=dws.cray.hpe.com,resources=directivebreakdowns,verbs=get;create;list;watch;update;patch;delete;deletecollection +//+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=workflows,verbs=get;list;watch;update;patch +//+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=workflows/finalizers,verbs=update +//+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=directivebreakdowns,verbs=get;create;list;watch;update;patch;delete;deletecollection //+kubebuilder:rbac:groups=nnf.cray.hpe.com,resources=directivebreakdowns/status,verbs=get;list;watch //+kubebuilder:rbac:groups=nnf.cray.hpe.com,resources=nnfstorages,verbs=get;create;list;watch;update;patch;delete;deletecollection //+kubebuilder:rbac:groups=nnf.cray.hpe.com,resources=nnfaccesses,verbs=get;create;list;watch;update;patch;delete;deletecollection //+kubebuilder:rbac:groups=nnf.cray.hpe.com,resources=nnfdatamovements,verbs=get;create;list;watch;update;patch;delete;deletecollection //+kubebuilder:rbac:groups=nnf.cray.hpe.com,resources=nnfstorageprofiles,verbs=get;create;list;watch;update;patch;delete;deletecollection -//+kubebuilder:rbac:groups=dws.cray.hpe.com,resources=persistentstorageinstances,verbs=get;create;list;watch;update;patch;delete;deletecollection -//+kubebuilder:rbac:groups=dws.cray.hpe.com,resources=servers,verbs=get;create;list;watch;update;patch -//+kubebuilder:rbac:groups=dws.cray.hpe.com,resources=computes,verbs=get;create;list;watch;update;patch +//+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=persistentstorageinstances,verbs=get;create;list;watch;update;patch;delete;deletecollection +//+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=servers,verbs=get;create;list;watch;update;patch +//+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=computes,verbs=get;create;list;watch;update;patch //+kubebuilder:rbac:groups=lus.cray.hpe.com,resources=lustrefilesystems,verbs=get;list;watch //+kubebuilder:rbac:groups=nnf.cray.hpe.com,resources=nnfcontainerprofiles,verbs=get;create;list;watch;update;patch;delete;deletecollection @@ -172,7 +172,7 @@ func (r *NnfWorkflowReconciler) Reconcile(ctx context.Context, req ctrl.Request) return ctrl.Result{}, nil } - // If the dws-operator has yet to set the Status.State, just return and wait for it. + // If the dws has yet to set the Status.State, just return and wait for it. if workflow.Status.State == "" || workflow.Status.State != workflow.Spec.DesiredState { return ctrl.Result{}, nil } diff --git a/controllers/nnf_workflow_controller_container_helpers.go b/controllers/nnf_workflow_controller_container_helpers.go index db0d499ee..975467930 100644 --- a/controllers/nnf_workflow_controller_container_helpers.go +++ b/controllers/nnf_workflow_controller_container_helpers.go @@ -25,7 +25,7 @@ import ( "strconv" "strings" - dwsv1alpha2 "github.com/HewlettPackard/dws/api/v1alpha2" + dwsv1alpha2 "github.com/DataWorkflowServices/dws/api/v1alpha2" nnfv1alpha1 "github.com/NearNodeFlash/nnf-sos/api/v1alpha1" "github.com/go-logr/logr" mpicommonv1 "github.com/kubeflow/common/pkg/apis/common/v1" diff --git a/controllers/nnf_workflow_controller_helpers.go b/controllers/nnf_workflow_controller_helpers.go index 87767188d..ac80cdc68 100644 --- a/controllers/nnf_workflow_controller_helpers.go +++ b/controllers/nnf_workflow_controller_helpers.go @@ -29,8 +29,8 @@ import ( "strings" "time" - dwsv1alpha2 "github.com/HewlettPackard/dws/api/v1alpha2" - "github.com/HewlettPackard/dws/utils/dwdparse" + dwsv1alpha2 "github.com/DataWorkflowServices/dws/api/v1alpha2" + "github.com/DataWorkflowServices/dws/utils/dwdparse" lusv1beta1 "github.com/NearNodeFlash/lustre-fs-operator/api/v1beta1" nnfv1alpha1 "github.com/NearNodeFlash/nnf-sos/api/v1alpha1" diff --git a/controllers/nnf_workflow_controller_test.go b/controllers/nnf_workflow_controller_test.go index 5a79eeeab..0381db14e 100644 --- a/controllers/nnf_workflow_controller_test.go +++ b/controllers/nnf_workflow_controller_test.go @@ -38,7 +38,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/intstr" - dwsv1alpha2 "github.com/HewlettPackard/dws/api/v1alpha2" + dwsv1alpha2 "github.com/DataWorkflowServices/dws/api/v1alpha2" lusv1beta1 "github.com/NearNodeFlash/lustre-fs-operator/api/v1beta1" nnfv1alpha1 "github.com/NearNodeFlash/nnf-sos/api/v1alpha1" ) diff --git a/controllers/nnfcontainerprofile_helpers.go b/controllers/nnfcontainerprofile_helpers.go index fcbb2a502..4238a60eb 100644 --- a/controllers/nnfcontainerprofile_helpers.go +++ b/controllers/nnfcontainerprofile_helpers.go @@ -30,8 +30,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - dwsv1alpha2 "github.com/HewlettPackard/dws/api/v1alpha2" - "github.com/HewlettPackard/dws/utils/dwdparse" + dwsv1alpha2 "github.com/DataWorkflowServices/dws/api/v1alpha2" + "github.com/DataWorkflowServices/dws/utils/dwdparse" nnfv1alpha1 "github.com/NearNodeFlash/nnf-sos/api/v1alpha1" "github.com/go-logr/logr" ) diff --git a/controllers/nnfcontainerprofile_test.go b/controllers/nnfcontainerprofile_test.go index fa1277cdd..0a7723016 100644 --- a/controllers/nnfcontainerprofile_test.go +++ b/controllers/nnfcontainerprofile_test.go @@ -30,7 +30,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" ) diff --git a/controllers/nnfstorageprofile_helpers.go b/controllers/nnfstorageprofile_helpers.go index 5a9aea87e..15a8daa86 100644 --- a/controllers/nnfstorageprofile_helpers.go +++ b/controllers/nnfstorageprofile_helpers.go @@ -1,5 +1,5 @@ /* - * Copyright 2022 Hewlett Packard Enterprise Development LP + * Copyright 2022-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, @@ -31,7 +31,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - dwsv1alpha2 "github.com/HewlettPackard/dws/api/v1alpha2" + dwsv1alpha2 "github.com/DataWorkflowServices/dws/api/v1alpha2" nnfv1alpha1 "github.com/NearNodeFlash/nnf-sos/api/v1alpha1" ) diff --git a/controllers/suite_test.go b/controllers/suite_test.go index 9cd1b1bfa..151e0e17b 100644 --- a/controllers/suite_test.go +++ b/controllers/suite_test.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, @@ -43,17 +43,17 @@ import ( "github.com/ghodss/yaml" - dwsv1alpha2 "github.com/HewlettPackard/dws/api/v1alpha2" + dwsv1alpha2 "github.com/DataWorkflowServices/dws/api/v1alpha2" lusv1beta1 "github.com/NearNodeFlash/lustre-fs-operator/api/v1beta1" nnf "github.com/NearNodeFlash/nnf-ec/pkg" nnfv1alpha1 "github.com/NearNodeFlash/nnf-sos/api/v1alpha1" - _ "github.com/HewlettPackard/dws/config/crd/bases" - _ "github.com/HewlettPackard/dws/config/webhook" + _ "github.com/DataWorkflowServices/dws/config/crd/bases" + _ "github.com/DataWorkflowServices/dws/config/webhook" _ "github.com/NearNodeFlash/lustre-fs-operator/config/crd/bases" - dwsctrls "github.com/HewlettPackard/dws/controllers" + dwsctrls "github.com/DataWorkflowServices/dws/controllers" //+kubebuilder:scaffold:imports ) @@ -123,7 +123,7 @@ var _ = BeforeSuite(func() { By("bootstrapping test environment") webhookPaths := []string{ - filepath.Join("..", "vendor", "github.com", "HewlettPackard", "dws", "config", "webhook"), + filepath.Join("..", "vendor", "github.com", "DataWorkflowServices", "dws", "config", "webhook"), filepath.Join("..", "config", "dws"), } if env, found := os.LookupEnv("WEBHOOK_DIR"); found { @@ -135,7 +135,7 @@ var _ = BeforeSuite(func() { ErrorIfCRDPathMissing: true, CRDDirectoryPaths: []string{ filepath.Join("..", "config", "crd", "bases"), - filepath.Join("..", "vendor", "github.com", "HewlettPackard", "dws", "config", "crd", "bases"), + filepath.Join("..", "vendor", "github.com", "DataWorkflowServices", "dws", "config", "crd", "bases"), filepath.Join("..", "vendor", "github.com", "NearNodeFlash", "lustre-fs-operator", "config", "crd", "bases"), }, //AttachControlPlaneOutput: true, diff --git a/deploy.sh b/deploy.sh index 2366d78ef..701f4a387 100755 --- a/deploy.sh +++ b/deploy.sh @@ -30,7 +30,7 @@ NNFMFU_IMG=$5 if [[ $CMD == 'deploy' ]]; then echo "Waiting for the dws webhook to become ready..." while :; do - ready=$(kubectl get deployments -n dws-operator-system dws-operator-webhook -o json | jq -Mr '.status.readyReplicas') + ready=$(kubectl get deployments -n dws-system dws-webhook -o json | jq -Mr '.status.readyReplicas') [[ $ready -ge 1 ]] && break sleep 1 done diff --git a/go.mod b/go.mod index 918fc5066..aac104542 100644 --- a/go.mod +++ b/go.mod @@ -3,8 +3,8 @@ module github.com/NearNodeFlash/nnf-sos 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/DataWorkflowServices/dws v0.0.1-0.20230913204342-e78d55d24550 + github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20230913205432-6ec0d2240086 github.com/NearNodeFlash/nnf-ec v0.0.0-20230526161255-cfb2d89b35d7 github.com/ghodss/yaml v1.0.0 github.com/go-logr/logr v1.2.4 diff --git a/go.sum b/go.sum index 2089d52e3..dc18e4527 100644 --- a/go.sum +++ b/go.sum @@ -1,12 +1,12 @@ 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/DataWorkflowServices/dws v0.0.1-0.20230913204342-e78d55d24550 h1:AMJUdu+Rt5vLEWbdnI5LDqytR5tgZbkYTS9fztMWNL4= +github.com/DataWorkflowServices/dws v0.0.1-0.20230913204342-e78d55d24550/go.mod h1:ZQsfcByZ05Ah9yrgOJsN3JPz4jo374DrdVv8kvcIquA= github.com/HewlettPackard/structex v1.0.4 h1:RVTdN5FWhDWr1IkjllU8wxuLjISo4gr6u5ryZpzyHcA= github.com/HewlettPackard/structex v1.0.4/go.mod h1:3frC4RY/cPsP/4+N8rkxsNAGlQwHV+zDC7qvrN+N+rE= -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/NearNodeFlash/lustre-fs-operator v0.0.1-0.20230913205432-6ec0d2240086 h1:pJKYGZElKurCoec994QQxK4iDB/Sey86n2q1ovqzU8c= +github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20230913205432-6ec0d2240086/go.mod h1:SXdA2CM7WbUOaWaBIofA4laE7aDVeFZlYLwf0xsFfEE= 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/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE= diff --git a/main.go b/main.go index bfbad9569..50a63cabb 100644 --- a/main.go +++ b/main.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, @@ -40,7 +40,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log/zap" "sigs.k8s.io/controller-runtime/pkg/manager" - dwsv1alpha2 "github.com/HewlettPackard/dws/api/v1alpha2" + dwsv1alpha2 "github.com/DataWorkflowServices/dws/api/v1alpha2" lusv1beta1 "github.com/NearNodeFlash/lustre-fs-operator/api/v1beta1" mpiv2beta1 "github.com/kubeflow/mpi-operator/pkg/apis/kubeflow/v2beta1" diff --git a/vendor/github.com/HewlettPackard/dws/LICENSE b/vendor/github.com/DataWorkflowServices/dws/LICENSE similarity index 100% rename from vendor/github.com/HewlettPackard/dws/LICENSE rename to vendor/github.com/DataWorkflowServices/dws/LICENSE diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/clientmount_types.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/clientmount_types.go similarity index 98% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/clientmount_types.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/clientmount_types.go index e4f375df3..ce0f05131 100644 --- a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/clientmount_types.go +++ b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/clientmount_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 v1alpha2 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" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/clientmount_webhook.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/clientmount_webhook.go similarity index 100% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/clientmount_webhook.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/clientmount_webhook.go diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/computes_types.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/computes_types.go similarity index 100% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/computes_types.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/computes_types.go diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/computes_webhook.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/computes_webhook.go similarity index 100% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/computes_webhook.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/computes_webhook.go diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/conversion.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/conversion.go similarity index 100% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/conversion.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/conversion.go diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/directivebreakdown_types.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/directivebreakdown_types.go similarity index 98% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/directivebreakdown_types.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/directivebreakdown_types.go index df5c95bcb..4a57756ee 100644 --- a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/directivebreakdown_types.go +++ b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/directivebreakdown_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 v1alpha2 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/vendor/github.com/HewlettPackard/dws/api/v1alpha2/directivebreakdown_webhook.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/directivebreakdown_webhook.go similarity index 100% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/directivebreakdown_webhook.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/directivebreakdown_webhook.go diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/dwdirectiverule_types.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/dwdirectiverule_types.go similarity index 92% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/dwdirectiverule_types.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/dwdirectiverule_types.go index 05e932436..e5b352f66 100644 --- a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/dwdirectiverule_types.go +++ b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/dwdirectiverule_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 v1alpha2 import ( - "github.com/HewlettPackard/dws/utils/dwdparse" + "github.com/DataWorkflowServices/dws/utils/dwdparse" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/dwdirectiverule_webhook.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/dwdirectiverule_webhook.go similarity index 100% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/dwdirectiverule_webhook.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/dwdirectiverule_webhook.go diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/groupversion_info.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/groupversion_info.go similarity index 89% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/groupversion_info.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/groupversion_info.go index bd2d6251d..22374c4f4 100644 --- a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/groupversion_info.go +++ b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/groupversion_info.go @@ -19,7 +19,7 @@ // Package v1alpha2 contains API Schema definitions for the dws v1alpha2 API group // +kubebuilder:object:generate=true -// +groupName=dws.cray.hpe.com +// +groupName=dataworkflowservices.github.io package v1alpha2 import ( @@ -29,7 +29,7 @@ import ( var ( // GroupVersion is group version used to register these objects - GroupVersion = schema.GroupVersion{Group: "dws.cray.hpe.com", Version: "v1alpha2"} + GroupVersion = schema.GroupVersion{Group: "dataworkflowservices.github.io", Version: "v1alpha2"} // SchemeBuilder is used to add go types to the GroupVersionKind scheme SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion} diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/owner_labels.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/owner_labels.go similarity index 96% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/owner_labels.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/owner_labels.go index c1401ba23..22c64b39c 100644 --- a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/owner_labels.go +++ b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/owner_labels.go @@ -1,5 +1,5 @@ /* - * Copyright 2022 Hewlett Packard Enterprise Development LP + * Copyright 2022-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, @@ -31,9 +31,9 @@ import ( ) const ( - OwnerKindLabel = "dws.cray.hpe.com/owner.kind" - OwnerNameLabel = "dws.cray.hpe.com/owner.name" - OwnerNamespaceLabel = "dws.cray.hpe.com/owner.namespace" + OwnerKindLabel = "dataworkflowservices.github.io/owner.kind" + OwnerNameLabel = "dataworkflowservices.github.io/owner.name" + OwnerNamespaceLabel = "dataworkflowservices.github.io/owner.namespace" ) // +kubebuilder:object:generate=false diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/persistentstorageinstance_types.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/persistentstorageinstance_types.go similarity index 93% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/persistentstorageinstance_types.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/persistentstorageinstance_types.go index 90e196b5e..346a60f80 100644 --- a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/persistentstorageinstance_types.go +++ b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/persistentstorageinstance_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 v1alpha2 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" @@ -29,10 +29,10 @@ import ( const ( // PersistentStorageNameLabel is defined for resources that relate to the name of a DWS PersistentStorageInstance - PersistentStorageNameLabel = "dws.cray.hpe.com/persistentstorage.name" + PersistentStorageNameLabel = "dataworkflowservices.github.io/persistentstorage.name" // PersistentStorageNamespaceLabel is defined for resources that relate to the namespace of a DWS PersistentStorageInstance - PersistentStorageNamespaceLabel = "dws.cray.hpe.com/persistentstorage.namespace" + PersistentStorageNamespaceLabel = "dataworkflowservices.github.io/persistentstorage.namespace" ) // PersistentStorageInstanceState specifies the golang type for PSIState diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/persistentstorageinstance_webhook.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/persistentstorageinstance_webhook.go similarity index 100% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/persistentstorageinstance_webhook.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/persistentstorageinstance_webhook.go diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/resource.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/resource.go similarity index 100% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/resource.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/resource.go diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/resource_error.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/resource_error.go similarity index 100% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/resource_error.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/resource_error.go diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/servers_types.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/servers_types.go similarity index 97% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/servers_types.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/servers_types.go index 3ce6bc6f7..5870a731e 100644 --- a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/servers_types.go +++ b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/servers_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 v1alpha2 import ( - "github.com/HewlettPackard/dws/utils/updater" + "github.com/DataWorkflowServices/dws/utils/updater" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/servers_webhook.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/servers_webhook.go similarity index 100% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/servers_webhook.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/servers_webhook.go diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/storage_types.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/storage_types.go similarity index 95% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/storage_types.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/storage_types.go index 1c527e441..4609fbab1 100644 --- a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/storage_types.go +++ b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/storage_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,14 +20,14 @@ package v1alpha2 import ( - "github.com/HewlettPackard/dws/utils/updater" + "github.com/DataWorkflowServices/dws/utils/updater" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) const ( // StorageTypeLabel is the label key used for tagging Storage resources - // with a driver specific label. For example: dws.cray.hpe.com/storage=Rabbit - StorageTypeLabel = "dws.cray.hpe.com/storage" + // with a driver specific label. For example: dataworkflowservices.github.io/storage=Rabbit + StorageTypeLabel = "dataworkflowservices.github.io/storage" ) // StorageSpec defines the desired specifications of Storage resource diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/storage_webhook.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/storage_webhook.go similarity index 100% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/storage_webhook.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/storage_webhook.go diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/systemconfiguration_types.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/systemconfiguration_types.go similarity index 98% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/systemconfiguration_types.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/systemconfiguration_types.go index c89ad18d7..f9d36cf5d 100644 --- a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/systemconfiguration_types.go +++ b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/systemconfiguration_types.go @@ -23,7 +23,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" - "github.com/HewlettPackard/dws/utils/updater" + "github.com/DataWorkflowServices/dws/utils/updater" ) // SystemConfigurationComputeNode describes a compute node in the system diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/systemconfiguration_webhook.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/systemconfiguration_webhook.go similarity index 100% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/systemconfiguration_webhook.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/systemconfiguration_webhook.go diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/workflow_types.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/workflow_types.go similarity index 98% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/workflow_types.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/workflow_types.go index 388dfa523..9d35b43b8 100644 --- a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/workflow_types.go +++ b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/workflow_types.go @@ -23,7 +23,7 @@ import ( "fmt" "strings" - "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" "k8s.io/apimachinery/pkg/util/intstr" @@ -31,10 +31,10 @@ import ( const ( // WorkflowNameLabel is defined for resources that relate to the name of a DWS Workflow - WorkflowNameLabel = "dws.cray.hpe.com/workflow.name" + WorkflowNameLabel = "dataworkflowservices.github.io/workflow.name" // WorkflowNamespaceLabel is defined for resources that relate to the namespace of a DWS Workflow - WorkflowNamespaceLabel = "dws.cray.hpe.com/workflow.namespace" + WorkflowNamespaceLabel = "dataworkflowservices.github.io/workflow.namespace" ) // WorkflowState is the enumeration of the state of the workflow diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/workflow_webhook.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/workflow_webhook.go similarity index 92% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/workflow_webhook.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/workflow_webhook.go index 2bea5aba4..ebfbb3784 100644 --- a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/workflow_webhook.go +++ b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/workflow_webhook.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, @@ -33,10 +33,10 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/webhook" - "github.com/HewlettPackard/dws/utils/dwdparse" + "github.com/DataWorkflowServices/dws/utils/dwdparse" ) -//+kubebuilder:rbac:groups=dws.cray.hpe.com,resources=dwdirectiverules,verbs=get;list;watch +//+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=dwdirectiverules,verbs=get;list;watch // log is for logging in this package. var workflowlog = logf.Log.WithName("workflow-resource") @@ -51,7 +51,7 @@ func (w *Workflow) SetupWebhookWithManager(mgr ctrl.Manager) error { Complete() } -//+kubebuilder:webhook:path=/mutate-dws-cray-hpe-com-v1alpha2-workflow,mutating=true,failurePolicy=fail,sideEffects=None,groups=dws.cray.hpe.com,resources=workflows,verbs=create,versions=v1alpha2,name=mworkflow.kb.io,admissionReviewVersions={v1,v1beta1} +//+kubebuilder:webhook:path=/mutate-dataworkflowservices-github-io-v1alpha2-workflow,mutating=true,failurePolicy=fail,sideEffects=None,groups=dataworkflowservices.github.io,resources=workflows,verbs=create,versions=v1alpha2,name=mworkflow.kb.io,admissionReviewVersions={v1,v1beta1} var _ webhook.Defaulter = &Workflow{} @@ -70,7 +70,7 @@ func (w *Workflow) Default() { } // TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation. -//+kubebuilder:webhook:path=/validate-dws-cray-hpe-com-v1alpha2-workflow,mutating=false,failurePolicy=fail,sideEffects=None,groups=dws.cray.hpe.com,resources=workflows,verbs=create;update,versions=v1alpha2,name=vworkflow.kb.io,admissionReviewVersions={v1,v1beta1} +//+kubebuilder:webhook:path=/validate-dataworkflowservices-github-io-v1alpha2-workflow,mutating=false,failurePolicy=fail,sideEffects=None,groups=dataworkflowservices.github.io,resources=workflows,verbs=create;update,versions=v1alpha2,name=vworkflow.kb.io,admissionReviewVersions={v1,v1beta1} var _ webhook.Validator = &Workflow{} diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/zz_generated.deepcopy.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/zz_generated.deepcopy.go similarity index 99% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/zz_generated.deepcopy.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/zz_generated.deepcopy.go index 96f72a977..311f6469c 100644 --- a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/zz_generated.deepcopy.go +++ b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/zz_generated.deepcopy.go @@ -25,7 +25,7 @@ package v1alpha2 import ( - "github.com/HewlettPackard/dws/utils/dwdparse" + "github.com/DataWorkflowServices/dws/utils/dwdparse" "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/intstr" diff --git a/vendor/github.com/HewlettPackard/dws/config/crd/bases/crd.go b/vendor/github.com/DataWorkflowServices/dws/config/crd/bases/crd.go similarity index 100% rename from vendor/github.com/HewlettPackard/dws/config/crd/bases/crd.go rename to vendor/github.com/DataWorkflowServices/dws/config/crd/bases/crd.go diff --git a/vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_clientmounts.yaml b/vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_clientmounts.yaml similarity index 99% rename from vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_clientmounts.yaml rename to vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_clientmounts.yaml index 716467db0..7bb92326b 100644 --- a/vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_clientmounts.yaml +++ b/vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_clientmounts.yaml @@ -4,9 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.12.0 - name: clientmounts.dws.cray.hpe.com + name: clientmounts.dataworkflowservices.github.io spec: - group: dws.cray.hpe.com + group: dataworkflowservices.github.io names: kind: ClientMount listKind: ClientMountList diff --git a/vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_computes.yaml b/vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_computes.yaml similarity index 97% rename from vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_computes.yaml rename to vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_computes.yaml index 567179487..87bfe943d 100644 --- a/vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_computes.yaml +++ b/vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_computes.yaml @@ -4,9 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.12.0 - name: computes.dws.cray.hpe.com + name: computes.dataworkflowservices.github.io spec: - group: dws.cray.hpe.com + group: dataworkflowservices.github.io names: kind: Computes listKind: ComputesList diff --git a/vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_directivebreakdowns.yaml b/vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_directivebreakdowns.yaml similarity index 99% rename from vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_directivebreakdowns.yaml rename to vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_directivebreakdowns.yaml index ede580e6e..18015f221 100644 --- a/vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_directivebreakdowns.yaml +++ b/vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_directivebreakdowns.yaml @@ -4,9 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.12.0 - name: directivebreakdowns.dws.cray.hpe.com + name: directivebreakdowns.dataworkflowservices.github.io spec: - group: dws.cray.hpe.com + group: dataworkflowservices.github.io names: kind: DirectiveBreakdown listKind: DirectiveBreakdownList diff --git a/vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_dwdirectiverules.yaml b/vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_dwdirectiverules.yaml similarity index 98% rename from vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_dwdirectiverules.yaml rename to vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_dwdirectiverules.yaml index bc76eff59..c1781072e 100644 --- a/vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_dwdirectiverules.yaml +++ b/vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_dwdirectiverules.yaml @@ -4,9 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.12.0 - name: dwdirectiverules.dws.cray.hpe.com + name: dwdirectiverules.dataworkflowservices.github.io spec: - group: dws.cray.hpe.com + group: dataworkflowservices.github.io names: kind: DWDirectiveRule listKind: DWDirectiveRuleList diff --git a/vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_persistentstorageinstances.yaml b/vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_persistentstorageinstances.yaml similarity index 99% rename from vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_persistentstorageinstances.yaml rename to vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_persistentstorageinstances.yaml index 274055ad4..c0d1475d7 100644 --- a/vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_persistentstorageinstances.yaml +++ b/vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_persistentstorageinstances.yaml @@ -4,9 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.12.0 - name: persistentstorageinstances.dws.cray.hpe.com + name: persistentstorageinstances.dataworkflowservices.github.io spec: - group: dws.cray.hpe.com + group: dataworkflowservices.github.io names: kind: PersistentStorageInstance listKind: PersistentStorageInstanceList diff --git a/vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_servers.yaml b/vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_servers.yaml similarity index 99% rename from vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_servers.yaml rename to vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_servers.yaml index 74649af1b..134bd56bb 100644 --- a/vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_servers.yaml +++ b/vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_servers.yaml @@ -4,9 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.12.0 - name: servers.dws.cray.hpe.com + name: servers.dataworkflowservices.github.io spec: - group: dws.cray.hpe.com + group: dataworkflowservices.github.io names: kind: Servers listKind: ServersList diff --git a/vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_storages.yaml b/vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_storages.yaml similarity index 99% rename from vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_storages.yaml rename to vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_storages.yaml index 72a8f3995..2f89e8784 100644 --- a/vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_storages.yaml +++ b/vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_storages.yaml @@ -4,9 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.12.0 - name: storages.dws.cray.hpe.com + name: storages.dataworkflowservices.github.io spec: - group: dws.cray.hpe.com + group: dataworkflowservices.github.io names: kind: Storage listKind: StorageList diff --git a/vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_systemconfigurations.yaml b/vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_systemconfigurations.yaml similarity index 99% rename from vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_systemconfigurations.yaml rename to vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_systemconfigurations.yaml index acfad5282..61da5a2a2 100644 --- a/vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_systemconfigurations.yaml +++ b/vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_systemconfigurations.yaml @@ -4,9 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.12.0 - name: systemconfigurations.dws.cray.hpe.com + name: systemconfigurations.dataworkflowservices.github.io spec: - group: dws.cray.hpe.com + group: dataworkflowservices.github.io names: kind: SystemConfiguration listKind: SystemConfigurationList diff --git a/vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_workflows.yaml b/vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_workflows.yaml similarity index 99% rename from vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_workflows.yaml rename to vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_workflows.yaml index 7cf158bcb..5b90590d1 100644 --- a/vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_workflows.yaml +++ b/vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_workflows.yaml @@ -4,9 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.12.0 - name: workflows.dws.cray.hpe.com + name: workflows.dataworkflowservices.github.io spec: - group: dws.cray.hpe.com + group: dataworkflowservices.github.io names: kind: Workflow listKind: WorkflowList diff --git a/vendor/github.com/HewlettPackard/dws/config/webhook/kustomization.yaml b/vendor/github.com/DataWorkflowServices/dws/config/webhook/kustomization.yaml similarity index 100% rename from vendor/github.com/HewlettPackard/dws/config/webhook/kustomization.yaml rename to vendor/github.com/DataWorkflowServices/dws/config/webhook/kustomization.yaml diff --git a/vendor/github.com/HewlettPackard/dws/config/webhook/kustomizeconfig.yaml b/vendor/github.com/DataWorkflowServices/dws/config/webhook/kustomizeconfig.yaml similarity index 100% rename from vendor/github.com/HewlettPackard/dws/config/webhook/kustomizeconfig.yaml rename to vendor/github.com/DataWorkflowServices/dws/config/webhook/kustomizeconfig.yaml diff --git a/vendor/github.com/HewlettPackard/dws/config/webhook/manifests.yaml b/vendor/github.com/DataWorkflowServices/dws/config/webhook/manifests.yaml similarity index 81% rename from vendor/github.com/HewlettPackard/dws/config/webhook/manifests.yaml rename to vendor/github.com/DataWorkflowServices/dws/config/webhook/manifests.yaml index 9183b3f8d..794e36902 100644 --- a/vendor/github.com/HewlettPackard/dws/config/webhook/manifests.yaml +++ b/vendor/github.com/DataWorkflowServices/dws/config/webhook/manifests.yaml @@ -11,12 +11,12 @@ webhooks: service: name: webhook-service namespace: system - path: /mutate-dws-cray-hpe-com-v1alpha2-workflow + path: /mutate-dataworkflowservices-github-io-v1alpha2-workflow failurePolicy: Fail name: mworkflow.kb.io rules: - apiGroups: - - dws.cray.hpe.com + - dataworkflowservices.github.io apiVersions: - v1alpha2 operations: @@ -37,12 +37,12 @@ webhooks: service: name: webhook-service namespace: system - path: /validate-dws-cray-hpe-com-v1alpha2-workflow + path: /validate-dataworkflowservices-github-io-v1alpha2-workflow failurePolicy: Fail name: vworkflow.kb.io rules: - apiGroups: - - dws.cray.hpe.com + - dataworkflowservices.github.io apiVersions: - v1alpha2 operations: diff --git a/vendor/github.com/HewlettPackard/dws/config/webhook/service.yaml b/vendor/github.com/DataWorkflowServices/dws/config/webhook/service.yaml similarity index 100% rename from vendor/github.com/HewlettPackard/dws/config/webhook/service.yaml rename to vendor/github.com/DataWorkflowServices/dws/config/webhook/service.yaml diff --git a/vendor/github.com/HewlettPackard/dws/config/webhook/service_account.yaml b/vendor/github.com/DataWorkflowServices/dws/config/webhook/service_account.yaml similarity index 100% rename from vendor/github.com/HewlettPackard/dws/config/webhook/service_account.yaml rename to vendor/github.com/DataWorkflowServices/dws/config/webhook/service_account.yaml diff --git a/vendor/github.com/HewlettPackard/dws/config/webhook/webhook.go b/vendor/github.com/DataWorkflowServices/dws/config/webhook/webhook.go similarity index 100% rename from vendor/github.com/HewlettPackard/dws/config/webhook/webhook.go rename to vendor/github.com/DataWorkflowServices/dws/config/webhook/webhook.go diff --git a/vendor/github.com/HewlettPackard/dws/controllers/clientmount_controller.go b/vendor/github.com/DataWorkflowServices/dws/controllers/clientmount_controller.go similarity index 87% rename from vendor/github.com/HewlettPackard/dws/controllers/clientmount_controller.go rename to vendor/github.com/DataWorkflowServices/dws/controllers/clientmount_controller.go index 87bbc2107..a06797e7f 100644 --- a/vendor/github.com/HewlettPackard/dws/controllers/clientmount_controller.go +++ b/vendor/github.com/DataWorkflowServices/dws/controllers/clientmount_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, @@ -31,8 +31,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" "sigs.k8s.io/controller-runtime/pkg/predicate" - 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" ) // ClientMountReconciler reconciles a ClientMount object @@ -44,12 +44,12 @@ type ClientMountReconciler struct { const ( // finalizerClientMount defines the key used for the finalizer - finalizerClientMount = "dws.cray.hpe.com/client_mount" + finalizerClientMount = "dataworkflowservices.github.io/client_mount" ) -//+kubebuilder:rbac:groups=dws.cray.hpe.com,resources=clientmounts,verbs=get;list;watch;create;update;patch;delete -//+kubebuilder:rbac:groups=dws.cray.hpe.com,resources=clientmounts/status,verbs=get;update;patch -//+kubebuilder:rbac:groups=dws.cray.hpe.com,resources=clientmounts/finalizers,verbs=update +//+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=clientmounts,verbs=get;list;watch;create;update;patch;delete +//+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=clientmounts/status,verbs=get;update;patch +//+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=clientmounts/finalizers,verbs=update // Reconcile is part of the main kubernetes reconciliation loop which aims to // move the current state of the cluster closer to the desired state. diff --git a/vendor/github.com/HewlettPackard/dws/controllers/metrics/metrics.go b/vendor/github.com/DataWorkflowServices/dws/controllers/metrics/metrics.go similarity index 100% rename from vendor/github.com/HewlettPackard/dws/controllers/metrics/metrics.go rename to vendor/github.com/DataWorkflowServices/dws/controllers/metrics/metrics.go diff --git a/vendor/github.com/HewlettPackard/dws/controllers/workflow_controller.go b/vendor/github.com/DataWorkflowServices/dws/controllers/workflow_controller.go similarity index 93% rename from vendor/github.com/HewlettPackard/dws/controllers/workflow_controller.go rename to vendor/github.com/DataWorkflowServices/dws/controllers/workflow_controller.go index fb1576a60..81ae02d9d 100644 --- a/vendor/github.com/HewlettPackard/dws/controllers/workflow_controller.go +++ b/vendor/github.com/DataWorkflowServices/dws/controllers/workflow_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, @@ -37,14 +37,14 @@ 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/controllers/metrics" - "github.com/HewlettPackard/dws/utils/updater" + dwsv1alpha2 "github.com/DataWorkflowServices/dws/api/v1alpha2" + "github.com/DataWorkflowServices/dws/controllers/metrics" + "github.com/DataWorkflowServices/dws/utils/updater" ) const ( // finalizerDwsWorkflow is the finalizer string used by this controller - finalizerDwsWorkflow = "dws.cray.hpe.com/workflow" + finalizerDwsWorkflow = "dataworkflowservices.github.io/workflow" ) // Define condition values @@ -61,9 +61,9 @@ type WorkflowReconciler struct { ChildObjects []dwsv1alpha2.ObjectList } -//+kubebuilder:rbac:groups=dws.cray.hpe.com,resources=workflows,verbs=get;list;watch;update;patch -//+kubebuilder:rbac:groups=dws.cray.hpe.com,resources=workflows/finalizers,verbs=update -//+kubebuilder:rbac:groups=dws.cray.hpe.com,resources=computes,verbs=get;create;list;watch;update;patch;delete;deletecollection +//+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=workflows,verbs=get;list;watch;update;patch +//+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=workflows/finalizers,verbs=update +//+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=computes,verbs=get;create;list;watch;update;patch;delete;deletecollection // Reconcile is part of the main kubernetes reconciliation loop which aims to // move the current state of the cluster closer to the desired state. diff --git a/vendor/github.com/HewlettPackard/dws/utils/dwdparse/dwdparse.go b/vendor/github.com/DataWorkflowServices/dws/utils/dwdparse/dwdparse.go similarity index 100% rename from vendor/github.com/HewlettPackard/dws/utils/dwdparse/dwdparse.go rename to vendor/github.com/DataWorkflowServices/dws/utils/dwdparse/dwdparse.go diff --git a/vendor/github.com/HewlettPackard/dws/utils/dwdparse/zz_generated.deepcopy.go b/vendor/github.com/DataWorkflowServices/dws/utils/dwdparse/zz_generated.deepcopy.go similarity index 100% rename from vendor/github.com/HewlettPackard/dws/utils/dwdparse/zz_generated.deepcopy.go rename to vendor/github.com/DataWorkflowServices/dws/utils/dwdparse/zz_generated.deepcopy.go diff --git a/vendor/github.com/HewlettPackard/dws/utils/ports/ports.go b/vendor/github.com/DataWorkflowServices/dws/utils/ports/ports.go similarity index 100% rename from vendor/github.com/HewlettPackard/dws/utils/ports/ports.go rename to vendor/github.com/DataWorkflowServices/dws/utils/ports/ports.go diff --git a/vendor/github.com/HewlettPackard/dws/utils/updater/status_updater.go b/vendor/github.com/DataWorkflowServices/dws/utils/updater/status_updater.go similarity index 100% rename from vendor/github.com/HewlettPackard/dws/utils/updater/status_updater.go rename to vendor/github.com/DataWorkflowServices/dws/utils/updater/status_updater.go diff --git a/vendor/github.com/NearNodeFlash/lustre-fs-operator/api/v1beta1/lustrefilesystem_types.go b/vendor/github.com/NearNodeFlash/lustre-fs-operator/api/v1beta1/lustrefilesystem_types.go index 1b6d12c34..40d53d3dd 100644 --- a/vendor/github.com/NearNodeFlash/lustre-fs-operator/api/v1beta1/lustrefilesystem_types.go +++ b/vendor/github.com/NearNodeFlash/lustre-fs-operator/api/v1beta1/lustrefilesystem_types.go @@ -22,7 +22,7 @@ package v1beta1 import ( "strings" - "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" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/vendor/modules.txt b/vendor/modules.txt index e5a25c19d..12e1d041c 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,17 +1,17 @@ -# github.com/HewlettPackard/dws v0.0.1-0.20230907181649-2f6d9fca4249 +# github.com/DataWorkflowServices/dws v0.0.1-0.20230913204342-e78d55d24550 ## explicit; go 1.19 -github.com/HewlettPackard/dws/api/v1alpha2 -github.com/HewlettPackard/dws/config/crd/bases -github.com/HewlettPackard/dws/config/webhook -github.com/HewlettPackard/dws/controllers -github.com/HewlettPackard/dws/controllers/metrics -github.com/HewlettPackard/dws/utils/dwdparse -github.com/HewlettPackard/dws/utils/ports -github.com/HewlettPackard/dws/utils/updater +github.com/DataWorkflowServices/dws/api/v1alpha2 +github.com/DataWorkflowServices/dws/config/crd/bases +github.com/DataWorkflowServices/dws/config/webhook +github.com/DataWorkflowServices/dws/controllers +github.com/DataWorkflowServices/dws/controllers/metrics +github.com/DataWorkflowServices/dws/utils/dwdparse +github.com/DataWorkflowServices/dws/utils/ports +github.com/DataWorkflowServices/dws/utils/updater # github.com/HewlettPackard/structex v1.0.4 ## explicit; go 1.14 github.com/HewlettPackard/structex -# github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20230613180840-6178f2b04900 +# github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20230913205432-6ec0d2240086 ## explicit; go 1.19 github.com/NearNodeFlash/lustre-fs-operator/api/v1beta1 github.com/NearNodeFlash/lustre-fs-operator/config/crd/bases