kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix the issue that system/runtime overlays are not auto-rebuilt

Browse Source 
Signed-off-by: xu yang <xyang@ciq.com>
This commit is contained in:
xu yang
2024-06-19 09:31:32 +00:00
parent 630156d514
commit 170d03e751
3 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@@ -45,6 +45,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Fix a regression that caused an error when passing flags to `wwctl container exec` and `wwctl container shell`. #1250
## v4.5.x, unreleased
### Fixed
- Fix the issue that system/runtime overlays are not auto-rebuilt. #1216
## v4.5.3, 2024-06-07
### Added

3
internal/pkg/overlay/overlay.go
View File

@@ -127,9 +127,10 @@ func OverlayInit(overlayName string) error {
Build the given overlays for a node and create a Image for them
*/
func BuildOverlay(nodeInfo node.NodeInfo, context string, overlayNames []string) error {
if len(overlayNames) == 0 {
if len(overlayNames) == 0 && context == "" {
return nil
}
// create the dir where the overlay images will reside
name := fmt.Sprintf("overlay %s/%v", nodeInfo.Id.Get(), overlayNames)
overlayImage := OverlayImage(nodeInfo.Id.Get(), context, overlayNames)

31
internal/pkg/overlay/overlay_test.go
View File

@@ -40,11 +40,11 @@ var buildOverlayTests = []struct {
contents: nil,
},
{
description: "if only context is specified then no overlay image is generated",
description: "if only context is specified then context named image is generated",
nodeName: "",
context: "system",
overlays: nil,
image: "",
image: "__SYSTEM__.img",
contents: nil,
},
{
@@ -80,19 +80,19 @@ var buildOverlayTests = []struct {
contents: []string{"o1.txt", "o2.txt"},
},
{
description: "if no node system overlays are specified, then no overlay image is generated",
description: "if no node system overlays are specified, then context pointed overlay is generated",
nodeName: "node1",
context: "system",
overlays: nil,
image: "",
image: "node1/__SYSTEM__.img",
contents: nil,
},
{
description: "if no node runtime overlays are specified, then no overlay image is generated",
description: "if no node runtime overlays are specified, then context pointed overlay is generated",
nodeName: "node1",
context: "runtime",
overlays: nil,
image: "",
image: "node1/__RUNTIME__.img",
contents: nil,
},
{
@@ -147,9 +147,6 @@ func Test_BuildOverlay(t *testing.T) {
}
for _, tt := range buildOverlayTests {
assert.True(t, (tt.image != "" && tt.contents != nil) || (tt.image == "" && tt.contents == nil),
"image and contents must eiher be populated or empty together")
nodeInfo := node.NodeInfo{}
nodeInfo.Id.Set(tt.nodeName)
t.Run(tt.description, func(t *testing.T) {
@@ -196,18 +193,18 @@ var buildAllOverlaysTests = []struct {
createdOverlays: nil,
},
{
description: "a node with no overlays creates no overlays",
description: "a node with no overlays creates default system/runtime overlays",
nodes: []string{"node1"},
systemOverlays: nil,
runtimeOverlays: nil,
createdOverlays: nil,
systemOverlays: [][]string{{"o1"}},
runtimeOverlays: [][]string{{"o1"}},
createdOverlays: []string{"node1/__SYSTEM__.img.gz", "node1/__RUNTIME__.img.gz"},
},
{
description: "multiple nodes with no overlays creates no overlays",
description: "multiple nodes with no overlays creates default system/runtime overlays",
nodes: []string{"node1", "node2"},
systemOverlays: nil,
runtimeOverlays: nil,
createdOverlays: nil,
systemOverlays: [][]string{{"o1"}, {"o2"}},
runtimeOverlays: [][]string{{"o1"}, {"o2"}},
createdOverlays: []string{"node1/__SYSTEM__.img.gz", "node1/__RUNTIME__.img.gz", "node2/__SYSTEM__.img.gz", "node2/__RUNTIME__.img.gz"},
},
{
description: "a system overlay for a node generates a system overlay for that node",