Skip to content

Commit b2d275c

Browse files
ajfloederajfloeder
authored
Merge release v0.1.15
Release v0.1.15
2 parents 6e7919c + 758e688 commit b2d275c

3 files changed

Lines changed: 55 additions & 10 deletions

File tree

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ toolchain go1.22.5
77
require (
88
github.com/DataWorkflowServices/dws v0.0.1-0.20250424161110-635a3b991607
99
github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20250425152023-c5cd382612d7
10-
github.com/NearNodeFlash/nnf-ec v0.0.1-0.20250416170223-aeb7554e777b // indirect
11-
github.com/NearNodeFlash/nnf-sos v0.0.1-0.20250425160245-ae09190c4beb
10+
github.com/NearNodeFlash/nnf-ec v0.0.1-0.20250508164611-4e8b76ddad31 // indirect
11+
github.com/NearNodeFlash/nnf-sos v0.0.1-0.20250508182118-6dc2325affff
1212
github.com/onsi/ginkgo/v2 v2.22.2
1313
github.com/onsi/gomega v1.36.2
1414
go.openly.dev/pointy v1.3.0

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ github.com/DataWorkflowServices/dws v0.0.1-0.20250424161110-635a3b991607 h1:KQfD
22
github.com/DataWorkflowServices/dws v0.0.1-0.20250424161110-635a3b991607/go.mod h1:i9v4K2d64a9uyd9ZazOJ85RWzVQjIgHWXkLo895KDAE=
33
github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20250425152023-c5cd382612d7 h1:FxMaus1rRbrE/GkU8bF5cRvbqSyqBpxNV12BApQ9zmw=
44
github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20250425152023-c5cd382612d7/go.mod h1:A6zVcD/8ydhY7UuUGU9/VBU0iB8Sw46x0/RI9SkWcn8=
5-
github.com/NearNodeFlash/nnf-ec v0.0.1-0.20250416170223-aeb7554e777b h1:J1h0RWYCgs90lpvtfo4nzoZqMtSmOqiQpLhN+QFGH+Y=
6-
github.com/NearNodeFlash/nnf-ec v0.0.1-0.20250416170223-aeb7554e777b/go.mod h1:lx13ustzE/+39fLECky+CFKkAV8GYlX9eaI6IGmHQkY=
7-
github.com/NearNodeFlash/nnf-sos v0.0.1-0.20250425160245-ae09190c4beb h1:v+xQ7POcNryB5iGf+yvro2XQ8bRIlfHMTZYUjsXKQNA=
8-
github.com/NearNodeFlash/nnf-sos v0.0.1-0.20250425160245-ae09190c4beb/go.mod h1:U/h9ExL4Lfu7q8riTaf15i0d0/yTS2jmwLYQENx3Vxo=
5+
github.com/NearNodeFlash/nnf-ec v0.0.1-0.20250508164611-4e8b76ddad31 h1:86N4qhxqWmNy/Oszo2xIi1jURpMsXyFQamo9DdLey14=
6+
github.com/NearNodeFlash/nnf-ec v0.0.1-0.20250508164611-4e8b76ddad31/go.mod h1:lx13ustzE/+39fLECky+CFKkAV8GYlX9eaI6IGmHQkY=
7+
github.com/NearNodeFlash/nnf-sos v0.0.1-0.20250508182118-6dc2325affff h1:4gaYVr70uRgT47OuNklYxEZrWmOrb1403ZiUWkTVDjs=
8+
github.com/NearNodeFlash/nnf-sos v0.0.1-0.20250508182118-6dc2325affff/go.mod h1:7Q04Qh/316C/CU5YNgoUGwpJ4zKwZHIL1PDqFp+amQg=
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=

‎upgrade-tester/upgrade-gitops-maker.sh‎

Lines changed: 49 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,10 @@ configure_v0_1_11_manifests() {
354354
sed -n '1,/^patches/p' environments/"$GITOPS_ENV"/nnf-dm/kustomization.yaml-orig | grep -vE '^patches:' > environments/"$GITOPS_ENV"/nnf-dm/kustomization.yaml
355355

356356
# Roll back the API version in SystemConfiguration.
357-
sed -i.bak -e 's/v1alpha3/v1alpha2/' environments/"$GITOPS_ENV"/site-config/systemconfiguration.yaml && rm environments/"$GITOPS_ENV"/site-config/systemconfiguration.yaml.bak
357+
sed -i.bak -e 's/v1alpha./v1alpha2/' environments/"$GITOPS_ENV"/site-config/systemconfiguration.yaml && rm environments/"$GITOPS_ENV"/site-config/systemconfiguration.yaml.bak
358+
359+
# SystemStatus isn't available yet.
360+
cp /dev/null environments/"$GITOPS_ENV"/site-config/systemstatus.yaml
358361

359362
# Fix indentation bug in nnf-sos DaemonSet that affects the KIND
360363
# environment.
@@ -393,7 +396,10 @@ configure_v0_1_12_manifests() {
393396
sed -n '1,/^patches/p' environments/"$GITOPS_ENV"/nnf-dm/kustomization.yaml-orig | grep -vE '^patches:' > environments/"$GITOPS_ENV"/nnf-dm/kustomization.yaml
394397

395398
# Roll back the API version in SystemConfiguration.
396-
sed -i.bak -e 's/v1alpha3/v1alpha2/' environments/"$GITOPS_ENV"/site-config/systemconfiguration.yaml && rm environments/"$GITOPS_ENV"/site-config/systemconfiguration.yaml.bak
399+
sed -i.bak -e 's/v1alpha./v1alpha2/' environments/"$GITOPS_ENV"/site-config/systemconfiguration.yaml && rm environments/"$GITOPS_ENV"/site-config/systemconfiguration.yaml.bak
400+
401+
# SystemStatus isn't available yet.
402+
cp /dev/null environments/"$GITOPS_ENV"/site-config/systemstatus.yaml
397403

398404
# The CRD upgrade helpers were not being used with this release. So remove
399405
# them.
@@ -427,7 +433,10 @@ configure_v0_1_13_manifests() {
427433
sed -n '1,/^patches/p' environments/"$GITOPS_ENV"/nnf-dm/kustomization.yaml-orig | grep -vE '^patches:' > environments/"$GITOPS_ENV"/nnf-dm/kustomization.yaml
428434

429435
# Roll back the API version in SystemConfiguration.
430-
sed -i.bak -e 's/v1alpha3/v1alpha2/' environments/"$GITOPS_ENV"/site-config/systemconfiguration.yaml && rm environments/"$GITOPS_ENV"/site-config/systemconfiguration.yaml.bak
436+
sed -i.bak -e 's/v1alpha./v1alpha2/' environments/"$GITOPS_ENV"/site-config/systemconfiguration.yaml && rm environments/"$GITOPS_ENV"/site-config/systemconfiguration.yaml.bak
437+
438+
# SystemStatus isn't available yet.
439+
cp /dev/null environments/"$GITOPS_ENV"/site-config/systemstatus.yaml
431440

432441
# The CRD upgrade helpers were not being used with this release. So remove
433442
# them.
@@ -477,7 +486,10 @@ configure_v0_1_14_manifests() {
477486
sed -n '1,/^patches/p' environments/"$GITOPS_ENV"/nnf-dm/kustomization.yaml-orig | grep -vE '^patches:' > environments/"$GITOPS_ENV"/nnf-dm/kustomization.yaml
478487

479488
# Roll back the API version in SystemConfiguration.
480-
sed -i.bak -e 's/v1alpha3/v1alpha2/' environments/"$GITOPS_ENV"/site-config/systemconfiguration.yaml && rm environments/"$GITOPS_ENV"/site-config/systemconfiguration.yaml.bak
489+
sed -i.bak -e 's/v1alpha./v1alpha2/' environments/"$GITOPS_ENV"/site-config/systemconfiguration.yaml && rm environments/"$GITOPS_ENV"/site-config/systemconfiguration.yaml.bak
490+
491+
# SystemStatus isn't available yet.
492+
cp /dev/null environments/"$GITOPS_ENV"/site-config/systemstatus.yaml
481493

482494
# The CRD upgrade helpers were not being used with this release. So remove
483495
# them.
@@ -525,6 +537,12 @@ configure_v0_1_15_manifests() {
525537
# Chop off the end of the file, where we think the patches section lives.
526538
sed -n '1,/^patches/p' environments/"$GITOPS_ENV"/nnf-dm/kustomization.yaml-orig | grep -vE '^patches:' > environments/"$GITOPS_ENV"/nnf-dm/kustomization.yaml
527539

540+
# Roll back the API version in SystemConfiguration.
541+
sed -i.bak -e 's/v1alpha./v1alpha3/' environments/"$GITOPS_ENV"/site-config/systemconfiguration.yaml && rm environments/"$GITOPS_ENV"/site-config/systemconfiguration.yaml.bak
542+
543+
# SystemStatus isn't available yet.
544+
cp /dev/null environments/"$GITOPS_ENV"/site-config/systemstatus.yaml
545+
528546
# The storage-version-migrator is the only CRD upgrade helper in this
529547
# release. Remove the other one.
530548
remove_storedversions_maint
@@ -554,12 +572,39 @@ configure_v0_1_15_manifests() {
554572
msg "Created branch $BRANCH2 with support for nnf-storedversions-maint"
555573
}
556574

575+
# =====================================
576+
# Configure v0.1.16 manifests.
577+
#
578+
configure_v0_1_16_manifests() {
579+
TAG=v0.1.16
580+
TARBALL="manifests-$TAG.tar"
581+
BRANCH="rel-$TAG"
582+
git checkout main
583+
git checkout -b "$BRANCH"
584+
get_and_unpack_manfest "$TAG" "$TARBALL"
585+
set_branch_in_bootstraps "$BRANCH"
586+
587+
git mv environments/"$GITOPS_ENV"/nnf-dm/kustomization.yaml environments/"$GITOPS_ENV"/nnf-dm/kustomization.yaml-orig
588+
# Remove the patches section.
589+
# Chop off the end of the file, where we think the patches section lives.
590+
sed -n '1,/^patches/p' environments/"$GITOPS_ENV"/nnf-dm/kustomization.yaml-orig | grep -vE '^patches:' > environments/"$GITOPS_ENV"/nnf-dm/kustomization.yaml
591+
592+
git add environments
593+
git commit -s -m "Release $TAG"
594+
595+
./tools/verify-deployment.sh -e "$GITOPS_ENV"
596+
597+
$NO_PUSH_DBG git push --set-upstream origin "$BRANCH"
598+
msg "Created branch $BRANCH"
599+
}
600+
557601
create_new_repo
558602
configure_v0_1_11_manifests
559603
configure_v0_1_12_manifests
560604
configure_v0_1_13_manifests
561605
configure_v0_1_14_manifests
562606
configure_v0_1_15_manifests
607+
configure_v0_1_16_manifests
563608

564609
if [[ -z $NO_PUSH ]]; then
565610
echo

0 commit comments

Comments
 (0)