From 6a4dc19f7aabded1eba55f8c4263ac8d8ec3f246 Mon Sep 17 00:00:00 2001 From: Dean Roehrich Date: Fri, 20 Oct 2023 14:17:30 -0500 Subject: [PATCH] Update the project for kubebuilder go/v4 layout Change the layout to follow the Standard Go Project Layout, as described in https://book.kubebuilder.io/migration/v3vsv4. This allows newer releases of kubebuilder to be used with this repo. Signed-off-by: Dean Roehrich --- Dockerfile | 6 +++--- Makefile | 4 ++-- PROJECT | 2 +- main.go => cmd/main.go | 2 +- daemons/compute/server/servers/server_default.go | 2 +- go.mod | 6 ++++++ go.sum | 6 ------ .../controller}/datamovement_controller.go | 4 ++-- .../controller}/datamovement_controller_test.go | 4 ++-- .../controller}/datamovementmanager_controller.go | 4 ++-- .../controller}/datamovementmanager_controller_test.go | 4 ++-- .../controller}/fakeProgressOutput.sh | 0 .../controller}/metrics/metrics.go | 0 {controllers => internal/controller}/suite_test.go | 10 +++++----- .../dws/api/v1alpha2/zz_generated.deepcopy.go | 1 - .../dws/utils/dwdparse/zz_generated.deepcopy.go | 1 - .../api/v1beta1/zz_generated.deepcopy.go | 1 - .../crd/bases/lus.cray.hpe.com_lustrefilesystems.yaml | 2 +- .../nnf-sos/api/v1alpha1/nnfstorageprofile_types.go | 2 +- .../nnf-sos/api/v1alpha1/zz_generated.deepcopy.go | 4 ++-- .../config/crd/bases/nnf.cray.hpe.com_nnfaccesses.yaml | 2 +- .../bases/nnf.cray.hpe.com_nnfcontainerprofiles.yaml | 2 +- .../crd/bases/nnf.cray.hpe.com_nnfdatamovements.yaml | 2 +- .../crd/bases/nnf.cray.hpe.com_nnfnodeecdata.yaml | 2 +- .../config/crd/bases/nnf.cray.hpe.com_nnfnodes.yaml | 2 +- .../crd/bases/nnf.cray.hpe.com_nnfnodestorages.yaml | 2 +- .../crd/bases/nnf.cray.hpe.com_nnfportmanagers.yaml | 2 +- .../crd/bases/nnf.cray.hpe.com_nnfstorageprofiles.yaml | 4 ++-- .../config/crd/bases/nnf.cray.hpe.com_nnfstorages.yaml | 2 +- vendor/modules.txt | 9 ++++++--- 30 files changed, 47 insertions(+), 47 deletions(-) rename main.go => cmd/main.go (99%) rename {controllers => internal/controller}/datamovement_controller.go (99%) rename {controllers => internal/controller}/datamovement_controller_test.go (99%) rename {controllers => internal/controller}/datamovementmanager_controller.go (99%) rename {controllers => internal/controller}/datamovementmanager_controller_test.go (98%) rename {controllers => internal/controller}/fakeProgressOutput.sh (100%) rename {controllers => internal/controller}/metrics/metrics.go (100%) rename {controllers => internal/controller}/suite_test.go (92%) diff --git a/Dockerfile b/Dockerfile index 93ab416a..83cbbe39 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,12 +33,12 @@ COPY vendor/ vendor/ # and so that source changes don't invalidate our downloaded layer # Copy the go source -COPY main.go main.go +COPY cmd/ cmd/ COPY api/ api/ -COPY controllers/ controllers/ +COPY internal/ internal/ # Build -RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o manager main.go +RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o manager cmd/main.go ############################################################################### FROM builder as testing diff --git a/Makefile b/Makefile index 26e77d6a..a537445f 100644 --- a/Makefile +++ b/Makefile @@ -132,10 +132,10 @@ build-daemon: manifests generate fmt vet ## Build standalone nnf-datamovement da GOOS=linux GOARCH=amd64 go build -ldflags="-X '$(PACKAGE).version=$(RPM_VERSION)'" -o bin/nnf-dm daemons/compute/server/main.go build: generate fmt vet ## Build manager binary. - go build -o bin/manager main.go + go build -o bin/manager cmd/main.go run: manifests generate fmt vet ## Run a controller from your host. - go run ./main.go + go run cmd/main.go docker-build: VERSION ?= $(shell cat .version) docker-build: .version ## Build docker image with the manager. diff --git a/PROJECT b/PROJECT index 7570cc8f..12799d1c 100644 --- a/PROJECT +++ b/PROJECT @@ -1,6 +1,6 @@ domain: cray.hpe.com layout: -- go.kubebuilder.io/v3 +- go.kubebuilder.io/v4 plugins: manifests.sdk.operatorframework.io/v2: {} scorecard.sdk.operatorframework.io/v2: {} diff --git a/main.go b/cmd/main.go similarity index 99% rename from main.go rename to cmd/main.go index 4ef7a38a..fe2f3260 100644 --- a/main.go +++ b/cmd/main.go @@ -44,7 +44,7 @@ import ( nnfv1alpha1 "github.com/NearNodeFlash/nnf-sos/api/v1alpha1" dmv1alpha1 "github.com/NearNodeFlash/nnf-dm/api/v1alpha1" - "github.com/NearNodeFlash/nnf-dm/controllers" + controllers "github.com/NearNodeFlash/nnf-dm/internal/controller" //+kubebuilder:scaffold:imports ) diff --git a/daemons/compute/server/servers/server_default.go b/daemons/compute/server/servers/server_default.go index b5d59f89..b4ce5ed8 100644 --- a/daemons/compute/server/servers/server_default.go +++ b/daemons/compute/server/servers/server_default.go @@ -57,7 +57,7 @@ import ( dmv1alpha1 "github.com/NearNodeFlash/nnf-dm/api/v1alpha1" nnfv1alpha1 "github.com/NearNodeFlash/nnf-sos/api/v1alpha1" - dmctrl "github.com/NearNodeFlash/nnf-dm/controllers" + dmctrl "github.com/NearNodeFlash/nnf-dm/internal/controller" pb "github.com/NearNodeFlash/nnf-dm/daemons/compute/client-go/api" diff --git a/go.mod b/go.mod index 492a22df..c1d9c2ff 100644 --- a/go.mod +++ b/go.mod @@ -2,6 +2,12 @@ module github.com/NearNodeFlash/nnf-dm go 1.19 +replace github.com/NearNodeFlash/lustre-fs-operator => ../lustre-fs-operator + +replace github.com/DataWorkflowServices/dws => ../dws + +replace github.com/NearNodeFlash/nnf-sos => ../nnf-sos + require ( github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20231010163846-1ecbc574e6af github.com/NearNodeFlash/nnf-sos v0.0.1-0.20231010164913-dbe940193534 diff --git a/go.sum b/go.sum index 7eca85f3..57cfac19 100644 --- a/go.sum +++ b/go.sum @@ -1,11 +1,5 @@ -github.com/DataWorkflowServices/dws v0.0.1-0.20231010162938-b6d65b00cad6 h1:+j1ex3+PaJApQzCR7reMIJULPL+a7uOHYRJdSQVRWhA= -github.com/DataWorkflowServices/dws v0.0.1-0.20231010162938-b6d65b00cad6/go.mod h1:grHFCu0CoUK8exzS57r6cdf4qHpG1Pv5nl0n7evpaUM= -github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20231010163846-1ecbc574e6af h1:ZBNdD/ax/v7QWHCDazyYpYCVxz8E1hKmqU7nezmYGs0= -github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20231010163846-1ecbc574e6af/go.mod h1:stbNYHHfXr9Ep6wp6fJL4gAW1TKGuouFo682nhU8Eec= github.com/NearNodeFlash/nnf-ec v0.0.0-20231010162453-a8168bb6a52f h1:aWtSSQLLk9mUZj94mowirQeVw9saf80gVe10X0rZe8o= github.com/NearNodeFlash/nnf-ec v0.0.0-20231010162453-a8168bb6a52f/go.mod h1:oxdwMqfttOF9dabJhqrWlirCnMk8/8eyLMwl+hducjk= -github.com/NearNodeFlash/nnf-sos v0.0.1-0.20231010164913-dbe940193534 h1:JeSH4KIRyW5hoYgHoQU0G1I5VvKsRyeIF3MTaHVWEiA= -github.com/NearNodeFlash/nnf-sos v0.0.1-0.20231010164913-dbe940193534/go.mod h1:Zf0JMC0pe98w8xvqm+ugkHsHuUT860IorvXLGyNRoDM= 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/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= diff --git a/controllers/datamovement_controller.go b/internal/controller/datamovement_controller.go similarity index 99% rename from controllers/datamovement_controller.go rename to internal/controller/datamovement_controller.go index 403b64e1..6257e75d 100644 --- a/controllers/datamovement_controller.go +++ b/internal/controller/datamovement_controller.go @@ -17,7 +17,7 @@ * limitations under the License. */ -package controllers +package controller import ( "bufio" @@ -53,7 +53,7 @@ import ( dwsv1alpha2 "github.com/DataWorkflowServices/dws/api/v1alpha2" dmv1alpha1 "github.com/NearNodeFlash/nnf-dm/api/v1alpha1" - "github.com/NearNodeFlash/nnf-dm/controllers/metrics" + "github.com/NearNodeFlash/nnf-dm/internal/controller/metrics" nnfv1alpha1 "github.com/NearNodeFlash/nnf-sos/api/v1alpha1" ) diff --git a/controllers/datamovement_controller_test.go b/internal/controller/datamovement_controller_test.go similarity index 99% rename from controllers/datamovement_controller_test.go rename to internal/controller/datamovement_controller_test.go index f42a4acc..89e1bd5c 100644 --- a/controllers/datamovement_controller_test.go +++ b/internal/controller/datamovement_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, @@ -17,7 +17,7 @@ * limitations under the License. */ -package controllers +package controller import ( "context" diff --git a/controllers/datamovementmanager_controller.go b/internal/controller/datamovementmanager_controller.go similarity index 99% rename from controllers/datamovementmanager_controller.go rename to internal/controller/datamovementmanager_controller.go index 610dc95d..4782b536 100644 --- a/controllers/datamovementmanager_controller.go +++ b/internal/controller/datamovementmanager_controller.go @@ -17,7 +17,7 @@ * limitations under the License. */ -package controllers +package controller import ( "context" @@ -47,7 +47,7 @@ import ( lusv1beta1 "github.com/NearNodeFlash/lustre-fs-operator/api/v1beta1" dmv1alpha1 "github.com/NearNodeFlash/nnf-dm/api/v1alpha1" - "github.com/NearNodeFlash/nnf-dm/controllers/metrics" + "github.com/NearNodeFlash/nnf-dm/internal/controller/metrics" ) const ( diff --git a/controllers/datamovementmanager_controller_test.go b/internal/controller/datamovementmanager_controller_test.go similarity index 98% rename from controllers/datamovementmanager_controller_test.go rename to internal/controller/datamovementmanager_controller_test.go index bef105b1..e6187b7c 100644 --- a/controllers/datamovementmanager_controller_test.go +++ b/internal/controller/datamovementmanager_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, @@ -17,7 +17,7 @@ * limitations under the License. */ -package controllers +package controller import ( "context" diff --git a/controllers/fakeProgressOutput.sh b/internal/controller/fakeProgressOutput.sh similarity index 100% rename from controllers/fakeProgressOutput.sh rename to internal/controller/fakeProgressOutput.sh diff --git a/controllers/metrics/metrics.go b/internal/controller/metrics/metrics.go similarity index 100% rename from controllers/metrics/metrics.go rename to internal/controller/metrics/metrics.go diff --git a/controllers/suite_test.go b/internal/controller/suite_test.go similarity index 92% rename from controllers/suite_test.go rename to internal/controller/suite_test.go index 294d42f9..02b3d6ea 100644 --- a/controllers/suite_test.go +++ b/internal/controller/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, @@ -17,7 +17,7 @@ * limitations under the License. */ -package controllers +package controller import ( "context" @@ -91,9 +91,9 @@ var _ = BeforeSuite(func() { By("bootstrapping test environment") testEnv = &envtest.Environment{ CRDDirectoryPaths: []string{ - filepath.Join("..", "vendor", "github.com", "NearNodeFlash", "lustre-fs-operator", "config", "crd", "bases"), - filepath.Join("..", "vendor", "github.com", "NearNodeFlash", "nnf-sos", "config", "crd", "bases"), - filepath.Join("..", "config", "crd", "bases"), + filepath.Join("..", "..", "vendor", "github.com", "NearNodeFlash", "lustre-fs-operator", "config", "crd", "bases"), + filepath.Join("..", "..", "vendor", "github.com", "NearNodeFlash", "nnf-sos", "config", "crd", "bases"), + filepath.Join("..", "..", "config", "crd", "bases"), }, ErrorIfCRDPathMissing: 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 311f6469..6cd87773 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 @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated /* * Copyright 2023 Hewlett Packard Enterprise Development LP diff --git a/vendor/github.com/DataWorkflowServices/dws/utils/dwdparse/zz_generated.deepcopy.go b/vendor/github.com/DataWorkflowServices/dws/utils/dwdparse/zz_generated.deepcopy.go index d27486be..f0fb4512 100644 --- a/vendor/github.com/DataWorkflowServices/dws/utils/dwdparse/zz_generated.deepcopy.go +++ b/vendor/github.com/DataWorkflowServices/dws/utils/dwdparse/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated /* * Copyright 2023 Hewlett Packard Enterprise Development LP diff --git a/vendor/github.com/NearNodeFlash/lustre-fs-operator/api/v1beta1/zz_generated.deepcopy.go b/vendor/github.com/NearNodeFlash/lustre-fs-operator/api/v1beta1/zz_generated.deepcopy.go index 994469fe..fa8f4646 100644 --- a/vendor/github.com/NearNodeFlash/lustre-fs-operator/api/v1beta1/zz_generated.deepcopy.go +++ b/vendor/github.com/NearNodeFlash/lustre-fs-operator/api/v1beta1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated /* * Copyright 2023 Hewlett Packard Enterprise Development LP diff --git a/vendor/github.com/NearNodeFlash/lustre-fs-operator/config/crd/bases/lus.cray.hpe.com_lustrefilesystems.yaml b/vendor/github.com/NearNodeFlash/lustre-fs-operator/config/crd/bases/lus.cray.hpe.com_lustrefilesystems.yaml index f72a7e45..3dc8210c 100644 --- a/vendor/github.com/NearNodeFlash/lustre-fs-operator/config/crd/bases/lus.cray.hpe.com_lustrefilesystems.yaml +++ b/vendor/github.com/NearNodeFlash/lustre-fs-operator/config/crd/bases/lus.cray.hpe.com_lustrefilesystems.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.12.0 + controller-gen.kubebuilder.io/version: v0.13.0 name: lustrefilesystems.lus.cray.hpe.com spec: group: lus.cray.hpe.com diff --git a/vendor/github.com/NearNodeFlash/nnf-sos/api/v1alpha1/nnfstorageprofile_types.go b/vendor/github.com/NearNodeFlash/nnf-sos/api/v1alpha1/nnfstorageprofile_types.go index d247e5b6..ee746527 100644 --- a/vendor/github.com/NearNodeFlash/nnf-sos/api/v1alpha1/nnfstorageprofile_types.go +++ b/vendor/github.com/NearNodeFlash/nnf-sos/api/v1alpha1/nnfstorageprofile_types.go @@ -74,7 +74,7 @@ type NnfStorageProfileLustreData struct { // CapacityMGT specifies the size of the MGT device. // +kubebuilder:validation:Pattern:="^\\d+(KiB|KB|MiB|MB|GiB|GB|TiB|TB)$" - // +kubebuilder:default:="1GiB" + // +kubebuilder:default:="5GiB" CapacityMGT string `json:"capacityMgt,omitempty"` // CapacityMDT specifies the size of the MDT device. This is also diff --git a/vendor/github.com/NearNodeFlash/nnf-sos/api/v1alpha1/zz_generated.deepcopy.go b/vendor/github.com/NearNodeFlash/nnf-sos/api/v1alpha1/zz_generated.deepcopy.go index fc3e61d1..6c75078e 100644 --- a/vendor/github.com/NearNodeFlash/nnf-sos/api/v1alpha1/zz_generated.deepcopy.go +++ b/vendor/github.com/NearNodeFlash/nnf-sos/api/v1alpha1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated /* * Copyright 2023 Hewlett Packard Enterprise Development LP @@ -604,7 +603,8 @@ func (in *NnfNodeECDataStatus) DeepCopyInto(out *NnfNodeECDataStatus) { if val == nil { (*out)[key] = nil } else { - in, out := &val, &outVal + inVal := (*in)[key] + in, out := &inVal, &outVal *out = make(NnfNodeECPrivateData, len(*in)) for key, val := range *in { (*out)[key] = val diff --git a/vendor/github.com/NearNodeFlash/nnf-sos/config/crd/bases/nnf.cray.hpe.com_nnfaccesses.yaml b/vendor/github.com/NearNodeFlash/nnf-sos/config/crd/bases/nnf.cray.hpe.com_nnfaccesses.yaml index b3e32f2e..87c96d37 100644 --- a/vendor/github.com/NearNodeFlash/nnf-sos/config/crd/bases/nnf.cray.hpe.com_nnfaccesses.yaml +++ b/vendor/github.com/NearNodeFlash/nnf-sos/config/crd/bases/nnf.cray.hpe.com_nnfaccesses.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.12.0 + controller-gen.kubebuilder.io/version: v0.13.0 name: nnfaccesses.nnf.cray.hpe.com spec: group: nnf.cray.hpe.com diff --git a/vendor/github.com/NearNodeFlash/nnf-sos/config/crd/bases/nnf.cray.hpe.com_nnfcontainerprofiles.yaml b/vendor/github.com/NearNodeFlash/nnf-sos/config/crd/bases/nnf.cray.hpe.com_nnfcontainerprofiles.yaml index f598f15f..46e3b8a1 100644 --- a/vendor/github.com/NearNodeFlash/nnf-sos/config/crd/bases/nnf.cray.hpe.com_nnfcontainerprofiles.yaml +++ b/vendor/github.com/NearNodeFlash/nnf-sos/config/crd/bases/nnf.cray.hpe.com_nnfcontainerprofiles.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.12.0 + controller-gen.kubebuilder.io/version: v0.13.0 name: nnfcontainerprofiles.nnf.cray.hpe.com spec: group: nnf.cray.hpe.com diff --git a/vendor/github.com/NearNodeFlash/nnf-sos/config/crd/bases/nnf.cray.hpe.com_nnfdatamovements.yaml b/vendor/github.com/NearNodeFlash/nnf-sos/config/crd/bases/nnf.cray.hpe.com_nnfdatamovements.yaml index 45f0100a..2440aa6a 100644 --- a/vendor/github.com/NearNodeFlash/nnf-sos/config/crd/bases/nnf.cray.hpe.com_nnfdatamovements.yaml +++ b/vendor/github.com/NearNodeFlash/nnf-sos/config/crd/bases/nnf.cray.hpe.com_nnfdatamovements.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.12.0 + controller-gen.kubebuilder.io/version: v0.13.0 name: nnfdatamovements.nnf.cray.hpe.com spec: group: nnf.cray.hpe.com diff --git a/vendor/github.com/NearNodeFlash/nnf-sos/config/crd/bases/nnf.cray.hpe.com_nnfnodeecdata.yaml b/vendor/github.com/NearNodeFlash/nnf-sos/config/crd/bases/nnf.cray.hpe.com_nnfnodeecdata.yaml index fbb4a2c9..62b91d56 100644 --- a/vendor/github.com/NearNodeFlash/nnf-sos/config/crd/bases/nnf.cray.hpe.com_nnfnodeecdata.yaml +++ b/vendor/github.com/NearNodeFlash/nnf-sos/config/crd/bases/nnf.cray.hpe.com_nnfnodeecdata.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.12.0 + controller-gen.kubebuilder.io/version: v0.13.0 name: nnfnodeecdata.nnf.cray.hpe.com spec: group: nnf.cray.hpe.com diff --git a/vendor/github.com/NearNodeFlash/nnf-sos/config/crd/bases/nnf.cray.hpe.com_nnfnodes.yaml b/vendor/github.com/NearNodeFlash/nnf-sos/config/crd/bases/nnf.cray.hpe.com_nnfnodes.yaml index adb45727..3508c678 100644 --- a/vendor/github.com/NearNodeFlash/nnf-sos/config/crd/bases/nnf.cray.hpe.com_nnfnodes.yaml +++ b/vendor/github.com/NearNodeFlash/nnf-sos/config/crd/bases/nnf.cray.hpe.com_nnfnodes.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.12.0 + controller-gen.kubebuilder.io/version: v0.13.0 name: nnfnodes.nnf.cray.hpe.com spec: group: nnf.cray.hpe.com diff --git a/vendor/github.com/NearNodeFlash/nnf-sos/config/crd/bases/nnf.cray.hpe.com_nnfnodestorages.yaml b/vendor/github.com/NearNodeFlash/nnf-sos/config/crd/bases/nnf.cray.hpe.com_nnfnodestorages.yaml index 60365f77..b4083b3f 100644 --- a/vendor/github.com/NearNodeFlash/nnf-sos/config/crd/bases/nnf.cray.hpe.com_nnfnodestorages.yaml +++ b/vendor/github.com/NearNodeFlash/nnf-sos/config/crd/bases/nnf.cray.hpe.com_nnfnodestorages.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.12.0 + controller-gen.kubebuilder.io/version: v0.13.0 name: nnfnodestorages.nnf.cray.hpe.com spec: group: nnf.cray.hpe.com diff --git a/vendor/github.com/NearNodeFlash/nnf-sos/config/crd/bases/nnf.cray.hpe.com_nnfportmanagers.yaml b/vendor/github.com/NearNodeFlash/nnf-sos/config/crd/bases/nnf.cray.hpe.com_nnfportmanagers.yaml index dee321fa..7dc6dc15 100644 --- a/vendor/github.com/NearNodeFlash/nnf-sos/config/crd/bases/nnf.cray.hpe.com_nnfportmanagers.yaml +++ b/vendor/github.com/NearNodeFlash/nnf-sos/config/crd/bases/nnf.cray.hpe.com_nnfportmanagers.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.12.0 + controller-gen.kubebuilder.io/version: v0.13.0 name: nnfportmanagers.nnf.cray.hpe.com spec: group: nnf.cray.hpe.com diff --git a/vendor/github.com/NearNodeFlash/nnf-sos/config/crd/bases/nnf.cray.hpe.com_nnfstorageprofiles.yaml b/vendor/github.com/NearNodeFlash/nnf-sos/config/crd/bases/nnf.cray.hpe.com_nnfstorageprofiles.yaml index cd752d16..9a239a9e 100644 --- a/vendor/github.com/NearNodeFlash/nnf-sos/config/crd/bases/nnf.cray.hpe.com_nnfstorageprofiles.yaml +++ b/vendor/github.com/NearNodeFlash/nnf-sos/config/crd/bases/nnf.cray.hpe.com_nnfstorageprofiles.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.12.0 + controller-gen.kubebuilder.io/version: v0.13.0 name: nnfstorageprofiles.nnf.cray.hpe.com spec: group: nnf.cray.hpe.com @@ -118,7 +118,7 @@ spec: pattern: ^\d+(KiB|KB|MiB|MB|GiB|GB|TiB|TB)$ type: string capacityMgt: - default: 1GiB + default: 5GiB description: CapacityMGT specifies the size of the MGT device. pattern: ^\d+(KiB|KB|MiB|MB|GiB|GB|TiB|TB)$ type: string diff --git a/vendor/github.com/NearNodeFlash/nnf-sos/config/crd/bases/nnf.cray.hpe.com_nnfstorages.yaml b/vendor/github.com/NearNodeFlash/nnf-sos/config/crd/bases/nnf.cray.hpe.com_nnfstorages.yaml index 1262f751..6fd79aef 100644 --- a/vendor/github.com/NearNodeFlash/nnf-sos/config/crd/bases/nnf.cray.hpe.com_nnfstorages.yaml +++ b/vendor/github.com/NearNodeFlash/nnf-sos/config/crd/bases/nnf.cray.hpe.com_nnfstorages.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.12.0 + controller-gen.kubebuilder.io/version: v0.13.0 name: nnfstorages.nnf.cray.hpe.com spec: group: nnf.cray.hpe.com diff --git a/vendor/modules.txt b/vendor/modules.txt index 3bcf70a2..736695d9 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,16 +1,16 @@ -# github.com/DataWorkflowServices/dws v0.0.1-0.20231010162938-b6d65b00cad6 +# github.com/DataWorkflowServices/dws v0.0.1-0.20231010162938-b6d65b00cad6 => ../dws ## explicit; go 1.19 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.20231010163846-1ecbc574e6af +# github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20231010163846-1ecbc574e6af => ../lustre-fs-operator ## explicit; go 1.19 github.com/NearNodeFlash/lustre-fs-operator/api/v1beta1 github.com/NearNodeFlash/lustre-fs-operator/config/crd/bases # github.com/NearNodeFlash/nnf-ec v0.0.0-20231010162453-a8168bb6a52f ## explicit; go 1.19 github.com/NearNodeFlash/nnf-ec/pkg/rfsf/pkg/models -# github.com/NearNodeFlash/nnf-sos v0.0.1-0.20231010164913-dbe940193534 +# github.com/NearNodeFlash/nnf-sos v0.0.1-0.20231010164913-dbe940193534 => ../nnf-sos ## explicit; go 1.19 github.com/NearNodeFlash/nnf-sos/api/v1alpha1 github.com/NearNodeFlash/nnf-sos/config/crd/bases @@ -747,3 +747,6 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml +# github.com/NearNodeFlash/lustre-fs-operator => ../lustre-fs-operator +# github.com/DataWorkflowServices/dws => ../dws +# github.com/NearNodeFlash/nnf-sos => ../nnf-sos