Skip to content

Commit 8a41ac2

Browse files
matthew-richersonmatthew-richerson
authored
Merge release v0.1.22
Release v0.1.22
2 parents e274c83 + 042d996 commit 8a41ac2

4 files changed

Lines changed: 22 additions & 22 deletions

File tree

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ module github.com/NearNodeFlash/nnf-integration-test
33
go 1.23.9
44

55
require (
6-
github.com/DataWorkflowServices/dws v0.0.1-0.20251201192617-99a03aa3170f
7-
github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20251210162744-b3f481b47161
6+
github.com/DataWorkflowServices/dws v0.0.1-0.20260217162004-9c3e31c5c6c6
7+
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.20251210164542-0745ce4c3473
9+
github.com/NearNodeFlash/nnf-sos v0.0.1-0.20260220193431-be51e73232f8
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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
github.com/DataWorkflowServices/dws v0.0.1-0.20251201192617-99a03aa3170f h1:ezj0+9HY6VvPnJbDoIXr/IzwBFe1X2pLLEZpHodOulU=
2-
github.com/DataWorkflowServices/dws v0.0.1-0.20251201192617-99a03aa3170f/go.mod h1:NbNOIG2ybY2XHVSJn0KF7edPlX3I1ji7je6MGzuPeaA=
3-
github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20251210162744-b3f481b47161 h1:7NCIXYOp8jW/OS3KQg27+xw5DikxoHJRYRLWiT6fQ8I=
4-
github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20251210162744-b3f481b47161/go.mod h1:4QNBl5vMm4dFW49oqXa/1NzIjgt8EJKuAixmeoIVLCU=
1+
github.com/DataWorkflowServices/dws v0.0.1-0.20260217162004-9c3e31c5c6c6 h1:L/T+zQdDjLv+gCFE1baLaY2ONyFHmWhhLkFwJFyLWd8=
2+
github.com/DataWorkflowServices/dws v0.0.1-0.20260217162004-9c3e31c5c6c6/go.mod h1:NbNOIG2ybY2XHVSJn0KF7edPlX3I1ji7je6MGzuPeaA=
3+
github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20260217204444-10b3c2fa90bf h1:PBCcXHVyRxWy6NpOmKK8Nf+zoMaaECHipeSlvtUSqtg=
4+
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.20251210164542-0745ce4c3473 h1:VgFA+7Tklv0TNjkdcNtCRJspheNaP3wxMxjCMgKtOX4=
8-
github.com/NearNodeFlash/nnf-sos v0.0.1-0.20251210164542-0745ce4c3473/go.mod h1:6EQR4F5Wscxpy4ekZOdu9+xfkfuvrD1ZeM6Z+zi/gdA=
7+
github.com/NearNodeFlash/nnf-sos v0.0.1-0.20260220193431-be51e73232f8 h1:qPKIvfHF3v0/Ew/zxhmt/pwEQ0aG9nPgczCDt4/i/Aw=
8+
github.com/NearNodeFlash/nnf-sos v0.0.1-0.20260220193431-be51e73232f8/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: 10 additions & 10 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",
@@ -362,15 +362,15 @@ func (t *T) Prepare(ctx context.Context, k8sClient client.Client) error {
362362
}
363363

364364
if o.storageProfile.lvCreateCmd != "" {
365-
profile.Data.XFSStorage.CmdLines.LvCreate = o.storageProfile.lvCreateCmd
365+
profile.Data.XFSStorage.BlockDeviceCommands.RabbitCommands.LvCreate = o.storageProfile.lvCreateCmd
366366
}
367367

368368
Expect(k8sClient.Create(ctx, profile)).To(Succeed())
369369
}
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)