Skip to content

Commit d06b9ae

Browse files
CRDBUMPER-vendor-new-api (#147)
Vendor v1alpha10 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 6517907 commit d06b9ae

4 files changed

Lines changed: 15 additions & 15 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.20260217162004-9c3e31c5c6c6
77
github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20260217204444-10b3c2fa90bf
88
github.com/NearNodeFlash/nnf-ec v0.0.1-0.20251021182141-d22098d70c26 // indirect
9-
github.com/NearNodeFlash/nnf-sos v0.0.1-0.20260218125659-18af618157c0
9+
github.com/NearNodeFlash/nnf-sos v0.0.1-0.20260220155948-840d4bc605f5
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.20260217204444-10b3c2fa90bf
44
github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20260217204444-10b3c2fa90bf/go.mod h1:Zf+1bzBoqEufpP9SFo0k/GZj6kkBBPgjFMv5MYW0Pms=
55
github.com/NearNodeFlash/nnf-ec v0.0.1-0.20251021182141-d22098d70c26 h1:CHEvLPUEZDj0Z1hn0kXB//mHKh2eQ2EP/mMjy4zB9+g=
66
github.com/NearNodeFlash/nnf-ec v0.0.1-0.20251021182141-d22098d70c26/go.mod h1:slDsqUJtN2uZ5Z7z4J6wWrtKksQAaH4JqRzUonDXNKo=
7-
github.com/NearNodeFlash/nnf-sos v0.0.1-0.20260218125659-18af618157c0 h1:hiEbwj516TwY+3U3apDMD329OsPnMeFfGrExZNXlMjs=
8-
github.com/NearNodeFlash/nnf-sos v0.0.1-0.20260218125659-18af618157c0/go.mod h1:ZX9G7XzQKciyytLRG34OyvDPl3FzFc7Jh8HgSoFhxwg=
7+
github.com/NearNodeFlash/nnf-sos v0.0.1-0.20260220155948-840d4bc605f5 h1:uuFcQ88eTVzmnIzj3xtPFYCRpEv3+tvOpDU4sx8NBE8=
8+
github.com/NearNodeFlash/nnf-sos v0.0.1-0.20260220155948-840d4bc605f5/go.mod h1:ZX9G7XzQKciyytLRG34OyvDPl3FzFc7Jh8HgSoFhxwg=
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: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023-2025 Hewlett Packard Enterprise Development LP
2+
* Copyright 2023-2026 Hewlett Packard Enterprise Development LP
33
* Other additional copyright holders may be indicated within.
44
*
55
* The entirety of this work is licensed under the Apache License,
@@ -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-
nnfv1alpha9 "github.com/NearNodeFlash/nnf-sos/api/v1alpha9"
40+
nnfv1alpha10 "github.com/NearNodeFlash/nnf-sos/api/v1alpha10"
4141

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

335335
// Clone the default profile.
336-
defaultProf := &nnfv1alpha9.NnfStorageProfile{
336+
defaultProf := &nnfv1alpha10.NnfStorageProfile{
337337
ObjectMeta: metav1.ObjectMeta{
338338
Name: "default",
339339
Namespace: "nnf-system",
@@ -342,7 +342,7 @@ func (t *T) Prepare(ctx context.Context, k8sClient client.Client) error {
342342

343343
Expect(k8sClient.Get(ctx, client.ObjectKeyFromObject(defaultProf), defaultProf)).To(Succeed())
344344

345-
profile := &nnfv1alpha9.NnfStorageProfile{
345+
profile := &nnfv1alpha10.NnfStorageProfile{
346346
ObjectMeta: metav1.ObjectMeta{
347347
Name: o.storageProfile.name,
348348
Namespace: "nnf-system",
@@ -370,7 +370,7 @@ func (t *T) Prepare(ctx context.Context, k8sClient client.Client) error {
370370

371371
if o.containerProfile != nil {
372372
// Clone the provided base profile
373-
baseProfile := &nnfv1alpha9.NnfContainerProfile{
373+
baseProfile := &nnfv1alpha10.NnfContainerProfile{
374374
ObjectMeta: metav1.ObjectMeta{
375375
Name: o.containerProfile.base,
376376
Namespace: "nnf-system",
@@ -379,7 +379,7 @@ func (t *T) Prepare(ctx context.Context, k8sClient client.Client) error {
379379

380380
Expect(k8sClient.Get(ctx, client.ObjectKeyFromObject(baseProfile), baseProfile)).To(Succeed())
381381

382-
profile := &nnfv1alpha9.NnfContainerProfile{
382+
profile := &nnfv1alpha10.NnfContainerProfile{
383383
ObjectMeta: metav1.ObjectMeta{
384384
Name: o.containerProfile.name,
385385
Namespace: "nnf-system",
@@ -433,7 +433,7 @@ func (t *T) Prepare(ctx context.Context, k8sClient client.Client) error {
433433

434434
// Extract the File System Name and MGSNids from the persistent lustre instance. This
435435
// assumes an NNF Storage resource is created in the same name as the persistent instance
436-
storage := &nnfv1alpha9.NnfStorage{
436+
storage := &nnfv1alpha10.NnfStorage{
437437
ObjectMeta: metav1.ObjectMeta{
438438
Name: name,
439439
Namespace: corev1.NamespaceDefault,
@@ -570,7 +570,7 @@ func (t *T) Cleanup(ctx context.Context, k8sClient client.Client) error {
570570
if t.options.storageProfile != nil {
571571
By(fmt.Sprintf("Deleting storage profile '%s'", o.storageProfile.name))
572572

573-
profile := &nnfv1alpha9.NnfStorageProfile{
573+
profile := &nnfv1alpha10.NnfStorageProfile{
574574
ObjectMeta: metav1.ObjectMeta{
575575
Name: o.storageProfile.name,
576576
Namespace: "nnf-system",
@@ -584,7 +584,7 @@ func (t *T) Cleanup(ctx context.Context, k8sClient client.Client) error {
584584
if t.options.containerProfile != nil {
585585
By(fmt.Sprintf("Deleting container profile '%s'", o.containerProfile.name))
586586

587-
profile := &nnfv1alpha9.NnfContainerProfile{
587+
profile := &nnfv1alpha10.NnfContainerProfile{
588588
ObjectMeta: metav1.ObjectMeta{
589589
Name: o.containerProfile.name,
590590
Namespace: "nnf-system",

suite_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2022-2025 Hewlett Packard Enterprise Development LP
2+
* Copyright 2022-2026 Hewlett Packard Enterprise Development LP
33
* Other additional copyright holders may be indicated within.
44
*
55
* The entirety of this work is licensed under the Apache License,
@@ -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-
nnfv1alpha9 "github.com/NearNodeFlash/nnf-sos/api/v1alpha9"
46+
nnfv1alpha10 "github.com/NearNodeFlash/nnf-sos/api/v1alpha10"
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 = nnfv1alpha9.AddToScheme(scheme.Scheme)
116+
err = nnfv1alpha10.AddToScheme(scheme.Scheme)
117117
Expect(err).NotTo(HaveOccurred())
118118

119119
By("Creating Client")

0 commit comments

Comments
 (0)