Skip to content

Commit f5617b5

Browse files
CRDBUMPER-vendor-new-api
Vendor v1alpha9 API from github.com/NearNodeFlash/nnf-sos. ACTION: If any of the code in this repo was referencing non-local APIs, the references to them may have been inadvertently modified. Verify that any non-local APIs are being referenced by their correct versions. ACTION: Begin by running "make vet". Repair any issues that it finds. Then run "make test" and continue repairing issues until the tests pass. Signed-off-by: Matt Richerson <matthew.richerson@hpe.com>
1 parent 40b8a8e commit f5617b5

4 files changed

Lines changed: 13 additions & 13 deletions

File tree

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/DataWorkflowServices/dws v0.0.1-0.20251021205822-9b2fb19eb9fb
77
github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20250827135601-4d150db05d08
88
github.com/NearNodeFlash/nnf-ec v0.0.1-0.20250902204910-828ccfe450c3 // indirect
9-
github.com/NearNodeFlash/nnf-sos v0.0.1-0.20250910191707-694eda76a3d0
9+
github.com/NearNodeFlash/nnf-sos v0.0.1-0.20251022132926-182d70c0379c
1010
github.com/onsi/ginkgo/v2 v2.22.2
1111
github.com/onsi/gomega v1.36.2
1212
go.openly.dev/pointy v1.3.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20250827135601-4d150db05d08
44
github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20250827135601-4d150db05d08/go.mod h1:1lpNL1ZYtVwDU6Fuju5u/xiza6Z2Ua8KWZeaGBKpn5o=
55
github.com/NearNodeFlash/nnf-ec v0.0.1-0.20250902204910-828ccfe450c3 h1:CAJW97TU2fzzECwbwgmYkYe0kzvkZccXg6f8Ukom8Ws=
66
github.com/NearNodeFlash/nnf-ec v0.0.1-0.20250902204910-828ccfe450c3/go.mod h1:slDsqUJtN2uZ5Z7z4J6wWrtKksQAaH4JqRzUonDXNKo=
7-
github.com/NearNodeFlash/nnf-sos v0.0.1-0.20250910191707-694eda76a3d0 h1:IPvOz9ZYP4XTmofIlSiuw3L0d6UxFbrFZ51fLNEkf5g=
8-
github.com/NearNodeFlash/nnf-sos v0.0.1-0.20250910191707-694eda76a3d0/go.mod h1:wT5lUEvqLjpPGGbuyWmJYhThvTDkJM4Rqe22DrT7zdw=
7+
github.com/NearNodeFlash/nnf-sos v0.0.1-0.20251022132926-182d70c0379c h1:mpSWuKoH6xvoggDkAQpBnKxjZOcHhfZqnFNE+C3eIE4=
8+
github.com/NearNodeFlash/nnf-sos v0.0.1-0.20251022132926-182d70c0379c/go.mod h1:FT3MSnZ8Dj6RUA5jmT20wQPXipYBUrChgNcQv25J3lU=
99
github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
1010
github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
1111
github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=

internal/options.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import (
3737

3838
dwsv1alpha7 "github.com/DataWorkflowServices/dws/api/v1alpha7"
3939
lusv1alpha1 "github.com/NearNodeFlash/lustre-fs-operator/api/v1alpha1"
40-
nnfv1alpha8 "github.com/NearNodeFlash/nnf-sos/api/v1alpha8"
40+
nnfv1alpha9 "github.com/NearNodeFlash/nnf-sos/api/v1alpha9"
4141

4242
"github.com/DataWorkflowServices/dws/utils/dwdparse"
4343
)
@@ -320,7 +320,7 @@ func (t *T) Prepare(ctx context.Context, k8sClient client.Client) error {
320320
By(fmt.Sprintf("Creating storage profile '%s'", o.storageProfile.name))
321321

322322
// Clone the default profile.
323-
defaultProf := &nnfv1alpha8.NnfStorageProfile{
323+
defaultProf := &nnfv1alpha9.NnfStorageProfile{
324324
ObjectMeta: metav1.ObjectMeta{
325325
Name: "default",
326326
Namespace: "nnf-system",
@@ -329,7 +329,7 @@ func (t *T) Prepare(ctx context.Context, k8sClient client.Client) error {
329329

330330
Expect(k8sClient.Get(ctx, client.ObjectKeyFromObject(defaultProf), defaultProf)).To(Succeed())
331331

332-
profile := &nnfv1alpha8.NnfStorageProfile{
332+
profile := &nnfv1alpha9.NnfStorageProfile{
333333
ObjectMeta: metav1.ObjectMeta{
334334
Name: o.storageProfile.name,
335335
Namespace: "nnf-system",
@@ -357,7 +357,7 @@ func (t *T) Prepare(ctx context.Context, k8sClient client.Client) error {
357357

358358
if o.containerProfile != nil {
359359
// Clone the provided base profile
360-
baseProfile := &nnfv1alpha8.NnfContainerProfile{
360+
baseProfile := &nnfv1alpha9.NnfContainerProfile{
361361
ObjectMeta: metav1.ObjectMeta{
362362
Name: o.containerProfile.base,
363363
Namespace: "nnf-system",
@@ -366,7 +366,7 @@ func (t *T) Prepare(ctx context.Context, k8sClient client.Client) error {
366366

367367
Expect(k8sClient.Get(ctx, client.ObjectKeyFromObject(baseProfile), baseProfile)).To(Succeed())
368368

369-
profile := &nnfv1alpha8.NnfContainerProfile{
369+
profile := &nnfv1alpha9.NnfContainerProfile{
370370
ObjectMeta: metav1.ObjectMeta{
371371
Name: o.containerProfile.name,
372372
Namespace: "nnf-system",
@@ -420,7 +420,7 @@ func (t *T) Prepare(ctx context.Context, k8sClient client.Client) error {
420420

421421
// Extract the File System Name and MGSNids from the persistent lustre instance. This
422422
// assumes an NNF Storage resource is created in the same name as the persistent instance
423-
storage := &nnfv1alpha8.NnfStorage{
423+
storage := &nnfv1alpha9.NnfStorage{
424424
ObjectMeta: metav1.ObjectMeta{
425425
Name: name,
426426
Namespace: corev1.NamespaceDefault,
@@ -557,7 +557,7 @@ func (t *T) Cleanup(ctx context.Context, k8sClient client.Client) error {
557557
if t.options.storageProfile != nil {
558558
By(fmt.Sprintf("Deleting storage profile '%s'", o.storageProfile.name))
559559

560-
profile := &nnfv1alpha8.NnfStorageProfile{
560+
profile := &nnfv1alpha9.NnfStorageProfile{
561561
ObjectMeta: metav1.ObjectMeta{
562562
Name: o.storageProfile.name,
563563
Namespace: "nnf-system",
@@ -571,7 +571,7 @@ func (t *T) Cleanup(ctx context.Context, k8sClient client.Client) error {
571571
if t.options.containerProfile != nil {
572572
By(fmt.Sprintf("Deleting container profile '%s'", o.containerProfile.name))
573573

574-
profile := &nnfv1alpha8.NnfContainerProfile{
574+
profile := &nnfv1alpha9.NnfContainerProfile{
575575
ObjectMeta: metav1.ObjectMeta{
576576
Name: o.containerProfile.name,
577577
Namespace: "nnf-system",

suite_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ import (
4343

4444
dwsv1alpha7 "github.com/DataWorkflowServices/dws/api/v1alpha7"
4545
lusv1alpha1 "github.com/NearNodeFlash/lustre-fs-operator/api/v1alpha1"
46-
nnfv1alpha8 "github.com/NearNodeFlash/nnf-sos/api/v1alpha8"
46+
nnfv1alpha9 "github.com/NearNodeFlash/nnf-sos/api/v1alpha9"
4747
)
4848

4949
var (
@@ -113,7 +113,7 @@ var _ = BeforeSuite(func() {
113113
err = lusv1alpha1.AddToScheme(scheme.Scheme)
114114
Expect(err).NotTo(HaveOccurred())
115115

116-
err = nnfv1alpha8.AddToScheme(scheme.Scheme)
116+
err = nnfv1alpha9.AddToScheme(scheme.Scheme)
117117
Expect(err).NotTo(HaveOccurred())
118118

119119
By("Creating Client")

0 commit comments

Comments
 (0)