Skip to content

Commit 24938de

Browse files
authored
Lookup all keys without the KAIROS_ prefix (#357)
1 parent 56e5d3f commit 24938de

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

pkg/utils/common.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -402,13 +402,13 @@ func NameFromRootfs(rootfs string) string {
402402
}
403403
// Add the k8s version and provider if present
404404
if variant == "standard" {
405-
k8sprovider, err := sdkUtils.OSRelease("KAIROS_SOFTWARE_VERSION_PREFIX", filepath.Join(rootfs, "etc/kairos-release"))
405+
k8sprovider, err := sdkUtils.OSRelease("SOFTWARE_VERSION_PREFIX", filepath.Join(rootfs, "etc/kairos-release"))
406406
if err != nil {
407407
internal.Log.Logger.Error().Err(err).Msg("failed to get image k8s provider")
408408
// return normal name without k8s stuff
409409
return fmt.Sprintf("%s-%s-%s-%s-%s-%s", flavor, flavorVersion, variant, arch, model, version)
410410
}
411-
k8sversion, err := sdkUtils.OSRelease("KAIROS_SOFTWARE_VERSION", filepath.Join(rootfs, "etc/kairos-release"))
411+
k8sversion, err := sdkUtils.OSRelease("SOFTWARE_VERSION", filepath.Join(rootfs, "etc/kairos-release"))
412412
if err != nil {
413413
internal.Log.Logger.Error().Err(err).Msg("failed to get image k8s version")
414414
// return normal name without k8s stuff

0 commit comments

Comments
 (0)