From 29f5ba99bcd805a26440847d2e3d56c7b2599966 Mon Sep 17 00:00:00 2001 From: Dean Roehrich Date: Fri, 13 Sep 2024 15:21:20 -0500 Subject: [PATCH] Re-vendor (#215) Signed-off-by: Dean Roehrich --- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- .../dws/api/v1alpha2/storage_types.go | 11 +++++++++++ .../api/v1alpha2/systemconfiguration_types.go | 3 +++ .../dws/api/v1alpha2/zz_generated.deepcopy.go | 3 ++- .../api/v1alpha2/nnfsystemstorage_types.go | 5 +++++ .../nnf.cray.hpe.com_nnfsystemstorages.yaml | 6 ++++++ vendor/modules.txt | 8 ++++---- 8 files changed, 43 insertions(+), 17 deletions(-) diff --git a/go.mod b/go.mod index e4575901..27d6353a 100644 --- a/go.mod +++ b/go.mod @@ -3,8 +3,8 @@ module github.com/NearNodeFlash/nnf-dm go 1.21 require ( - github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20240906194513-9d4e51676bfe - github.com/NearNodeFlash/nnf-sos v0.0.1-0.20240911161256-41709d9c0141 + github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20240913195900-b3285e54755e + github.com/NearNodeFlash/nnf-sos v0.0.1-0.20240913194405-9d67b762adff github.com/onsi/ginkgo/v2 v2.17.1 github.com/onsi/gomega v1.32.0 github.com/prometheus/client_golang v1.16.0 @@ -22,7 +22,7 @@ require ( ) require ( - github.com/NearNodeFlash/nnf-ec v0.0.1-0.20240909140747-198c529022ce // indirect + github.com/NearNodeFlash/nnf-ec v0.0.1-0.20240912200758-f862bc773739 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -73,7 +73,7 @@ require ( ) require ( - github.com/DataWorkflowServices/dws v0.0.1-0.20240906193959-13d9956b3a4d + github.com/DataWorkflowServices/dws v0.0.1-0.20240913193141-737bcd946a02 go.openly.dev/pointy v1.3.0 ) diff --git a/go.sum b/go.sum index ddc29c97..71a86975 100644 --- a/go.sum +++ b/go.sum @@ -1,11 +1,11 @@ -github.com/DataWorkflowServices/dws v0.0.1-0.20240906193959-13d9956b3a4d h1:La5B/c881hNcY2fNnnkNhQYzxDBB5Ny5NM3pK753fkM= -github.com/DataWorkflowServices/dws v0.0.1-0.20240906193959-13d9956b3a4d/go.mod h1:6MrEEHISskyooSKcKU6R3mFqH6Yh6KzWgajhcw2s+nM= -github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20240906194513-9d4e51676bfe h1:ypw1bKONjS0N0VyNB7M10VZr0ApI1IVZbqyPHdhB5tc= -github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20240906194513-9d4e51676bfe/go.mod h1:2FDU8J1jJRCVN5dDm9n3dKGThJvHfo/gcl7hGTlqbQY= -github.com/NearNodeFlash/nnf-ec v0.0.1-0.20240909140747-198c529022ce h1:y02byxoUNy23wiLn3LT+OMSsMt+QPWrkgETxz5K6Eks= -github.com/NearNodeFlash/nnf-ec v0.0.1-0.20240909140747-198c529022ce/go.mod h1:oxdwMqfttOF9dabJhqrWlirCnMk8/8eyLMwl+hducjk= -github.com/NearNodeFlash/nnf-sos v0.0.1-0.20240911161256-41709d9c0141 h1:ogEiXwW9KFCraS3NWIxRkEuiyJ6yZzGbuih5Q5Jias0= -github.com/NearNodeFlash/nnf-sos v0.0.1-0.20240911161256-41709d9c0141/go.mod h1:VW96ysPz2V1/1lAkiq8SkXjc1Wjpatjc+EOyp2AlNQY= +github.com/DataWorkflowServices/dws v0.0.1-0.20240913193141-737bcd946a02 h1:ZidnleTEjdZX6geLAWTw3NMEsO8YLEQ9ubPx1fKGDeg= +github.com/DataWorkflowServices/dws v0.0.1-0.20240913193141-737bcd946a02/go.mod h1:6MrEEHISskyooSKcKU6R3mFqH6Yh6KzWgajhcw2s+nM= +github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20240913195900-b3285e54755e h1:fvJHwXbEDss0m642zVe3Hra0y/zh49Vnhqk27I3HrRc= +github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20240913195900-b3285e54755e/go.mod h1:VP4+66Hv5XnaJgzaQ0fooB4r4141aM5saoo8nCZQTGA= +github.com/NearNodeFlash/nnf-ec v0.0.1-0.20240912200758-f862bc773739 h1:T49ixk8TBeiYQ3CPpx463GL2gKk94dD9nXpoLBfdmqg= +github.com/NearNodeFlash/nnf-ec v0.0.1-0.20240912200758-f862bc773739/go.mod h1:oxdwMqfttOF9dabJhqrWlirCnMk8/8eyLMwl+hducjk= +github.com/NearNodeFlash/nnf-sos v0.0.1-0.20240913194405-9d67b762adff h1:gc/XbufsEW3ri2IKOkmsNbN10DrxH3Erasd1cNMdWVM= +github.com/NearNodeFlash/nnf-sos v0.0.1-0.20240913194405-9d67b762adff/go.mod h1:mlEVNo4t+zLZEll8XOh3EooOhI8ZeXpl3kRhRAA6J/8= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= diff --git a/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/storage_types.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/storage_types.go index 69a41845..55cb448d 100644 --- a/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/storage_types.go +++ b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/storage_types.go @@ -22,6 +22,7 @@ package v1alpha2 import ( "github.com/DataWorkflowServices/dws/utils/updater" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "sigs.k8s.io/controller-runtime/pkg/client" ) const ( @@ -165,6 +166,16 @@ type StorageList struct { Items []Storage `json:"items"` } +func (s *StorageList) GetObjectList() []client.Object { + objectList := []client.Object{} + + for i := range s.Items { + objectList = append(objectList, &s.Items[i]) + } + + return objectList +} + func init() { SchemeBuilder.Register(&Storage{}, &StorageList{}) } diff --git a/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/systemconfiguration_types.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/systemconfiguration_types.go index 3e4d29fb..2c65e3a0 100644 --- a/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/systemconfiguration_types.go +++ b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/systemconfiguration_types.go @@ -82,6 +82,9 @@ type SystemConfigurationSpec struct { type SystemConfigurationStatus struct { // Ready indicates when the SystemConfiguration has been reconciled Ready bool `json:"ready"` + + // Error information + ResourceError `json:",inline"` } //+kubebuilder:object:root=true diff --git a/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/zz_generated.deepcopy.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/zz_generated.deepcopy.go index f177a88b..97071e31 100644 --- a/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/zz_generated.deepcopy.go +++ b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/zz_generated.deepcopy.go @@ -1132,7 +1132,7 @@ func (in *SystemConfiguration) DeepCopyInto(out *SystemConfiguration) { out.TypeMeta = in.TypeMeta in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) in.Spec.DeepCopyInto(&out.Spec) - out.Status = in.Status + in.Status.DeepCopyInto(&out.Status) } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SystemConfiguration. @@ -1250,6 +1250,7 @@ func (in *SystemConfigurationSpec) DeepCopy() *SystemConfigurationSpec { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *SystemConfigurationStatus) DeepCopyInto(out *SystemConfigurationStatus) { *out = *in + in.ResourceError.DeepCopyInto(&out.ResourceError) } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SystemConfigurationStatus. diff --git a/vendor/github.com/NearNodeFlash/nnf-sos/api/v1alpha2/nnfsystemstorage_types.go b/vendor/github.com/NearNodeFlash/nnf-sos/api/v1alpha2/nnfsystemstorage_types.go index 70c593ac..6b114894 100644 --- a/vendor/github.com/NearNodeFlash/nnf-sos/api/v1alpha2/nnfsystemstorage_types.go +++ b/vendor/github.com/NearNodeFlash/nnf-sos/api/v1alpha2/nnfsystemstorage_types.go @@ -49,6 +49,11 @@ type NnfSystemStorageSpec struct { // SystemConfiguration IncludeRabbits []string `json:"includeRabbits,omitempty"` + // ExcludeDisabledRabbits looks at the Storage resource for a Rabbit and does not use it if it's + // marked as "disabled" + // +kubebuilder:default:=false + ExcludeDisabledRabbits bool `json:"excludeDisabledRabbits,omitempty"` + // ExcludeComputes is a list of compute nodes to exclude from the the compute nodes listed in the // SystemConfiguration ExcludeComputes []string `json:"excludeComputes,omitempty"` diff --git a/vendor/github.com/NearNodeFlash/nnf-sos/config/crd/bases/nnf.cray.hpe.com_nnfsystemstorages.yaml b/vendor/github.com/NearNodeFlash/nnf-sos/config/crd/bases/nnf.cray.hpe.com_nnfsystemstorages.yaml index a8e47f39..3e942d6f 100644 --- a/vendor/github.com/NearNodeFlash/nnf-sos/config/crd/bases/nnf.cray.hpe.com_nnfsystemstorages.yaml +++ b/vendor/github.com/NearNodeFlash/nnf-sos/config/crd/bases/nnf.cray.hpe.com_nnfsystemstorages.yaml @@ -307,6 +307,12 @@ spec: items: type: string type: array + excludeDisabledRabbits: + default: false + description: |- + ExcludeDisabledRabbits looks at the Storage resource for a Rabbit and does not use it if it's + marked as "disabled" + type: boolean excludeRabbits: description: ExludeRabbits is a list of Rabbits to exclude from the Rabbits in the SystemConfiguration diff --git a/vendor/modules.txt b/vendor/modules.txt index f60b6b9b..9addd624 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,16 +1,16 @@ -# github.com/DataWorkflowServices/dws v0.0.1-0.20240906193959-13d9956b3a4d +# github.com/DataWorkflowServices/dws v0.0.1-0.20240913193141-737bcd946a02 ## explicit; go 1.21 github.com/DataWorkflowServices/dws/api/v1alpha2 github.com/DataWorkflowServices/dws/utils/dwdparse github.com/DataWorkflowServices/dws/utils/updater -# github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20240906194513-9d4e51676bfe +# github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20240913195900-b3285e54755e ## explicit; go 1.21 github.com/NearNodeFlash/lustre-fs-operator/api/v1beta1 github.com/NearNodeFlash/lustre-fs-operator/config/crd/bases -# github.com/NearNodeFlash/nnf-ec v0.0.1-0.20240909140747-198c529022ce +# github.com/NearNodeFlash/nnf-ec v0.0.1-0.20240912200758-f862bc773739 ## explicit; go 1.19 github.com/NearNodeFlash/nnf-ec/pkg/rfsf/pkg/models -# github.com/NearNodeFlash/nnf-sos v0.0.1-0.20240911161256-41709d9c0141 +# github.com/NearNodeFlash/nnf-sos v0.0.1-0.20240913194405-9d67b762adff ## explicit; go 1.21 github.com/NearNodeFlash/nnf-sos/api/v1alpha2 github.com/NearNodeFlash/nnf-sos/config/crd/bases