Skip to content

Commit

Permalink
chore: alias nvidia extensions to lts versions
Browse files Browse the repository at this point in the history
Alias old nvidia extensions schema to LTS versions so upgrades work and
users are not surprised with a new major version.

Signed-off-by: Noel Georgi <git@frezbo.dev>
  • Loading branch information
frezbo committed Aug 6, 2024
1 parent 8b4e0d9 commit 608a6f0
Show file tree
Hide file tree
Showing 2 changed files with 76 additions and 0 deletions.
8 changes: 8 additions & 0 deletions internal/profile/profile.go
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,14 @@ func extensionNameAlias(extensionName string) (string, bool) {
return "siderolabs/vmtoolsd-guest-agent", true
case "siderolabs/xe-guest-utilities": // extension got renamed
return "siderolabs/xen-guest-agent", true
case "siderolabs/nvidia-container-toolkit": // extension got renamed
return "siderolabs/nvidia-container-toolkit-lts", true
case "siderolabs/nvidia-open-gpu-kernel-modules": // extension got renamed
return "siderolabs/nvidia-open-gpu-kernel-modules-lts", true
case "siderolabs/nonfree-kmod-nvidia": // extension got renamed
return "siderolabs/nonfree-kmod-nvidia-lts", true
case "siderolabs/nvidia-fabricmanager": // extension got renamed
return "siderolabs/nvidia-fabric-manager-lts", true
default:
return "", false
}
Expand Down
68 changes: 68 additions & 0 deletions internal/profile/profile_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,22 @@ func (mockArtifactProducer) GetOfficialExtensions(context.Context, string) ([]ar
TaggedReference: ensure.Value(name.NewTag("ghcr.io/siderolabs/gasket-driver:20240101")),
Digest: "sha256:abcdef123456",
},
{
TaggedReference: ensure.Value(name.NewTag("ghcr.io/siderolabs/nvidia-container-toolkit-lts:v535.0.0-v1.15.0")),
Digest: "sha256:nvidia-toolkit",
},
{
TaggedReference: ensure.Value(name.NewTag("ghcr.io/siderolabs/nvidia-open-gpu-kernel-modules-lts:v535.0.0")),
Digest: "sha256:nvidia-open",
},
{
TaggedReference: ensure.Value(name.NewTag("ghcr.io/siderolabs/nonfree-kmod-nvidia-lts:v535.0.0")),
Digest: "sha256:nvidia-nonfree",
},
{
TaggedReference: ensure.Value(name.NewTag("ghcr.io/siderolabs/nvidia-fabricmanager:v535.0.0")),
Digest: "sha256:nvidia-fabric",
},
}, nil
}

Expand Down Expand Up @@ -482,6 +498,58 @@ func TestEnhanceFromSchematic(t *testing.T) {
},
},
},
{
name: "aliased nvidia extensions",
baseProfile: baseProfile,
schematic: schematic.Schematic{
Customization: schematic.Customization{
SystemExtensions: schematic.SystemExtensions{
OfficialExtensions: []string{
"siderolabs/nvidia-container-toolkit",
"siderolabs/nvidia-open-gpu-kernel-modules",
"siderolabs/nonfree-kmod-nvidia",
"siderolabs/nvidia-fabricmanager",
},
},
},
},
versionString: "v1.7.0",

expectedProfile: profile.Profile{
Platform: constants.PlatformMetal,
SecureBoot: pointer.To(false),
Arch: "amd64",
Version: "v1.7.0",
Customization: profile.CustomizationProfile{},
Input: profile.Input{
SystemExtensions: []profile.ContainerAsset{
{
OCIPath: "amd64-sha256:nvidia-toolkit.oci",
},
{
OCIPath: "amd64-sha256:nvidia-open.oci",
},
{
OCIPath: "amd64-sha256:nvidia-nonfree.oci",
},
{
OCIPath: "amd64-sha256:nvidia-fabric.oci",
},
{
TarballPath: "2335edfd1451ebc3e268956e4b12f2afc5a0799a082e8ffdbbd5dc55af123a27.tar",
},
},
},
Output: profile.Output{
Kind: profile.OutKindImage,
OutFormat: profile.OutFormatZSTD,
ImageOptions: &profile.ImageOptions{
DiskSize: profile.MinRAWDiskSize,
DiskFormat: profile.DiskFormatRaw,
},
},
},
},
{
name: "aliased extensions",
baseProfile: baseProfile,
Expand Down

0 comments on commit 608a6f0

Please sign in to comment.