metropolis: replace version stamp with product info
This removes the stamped metropolis version library and the associated
stampgo infrastructure, and replaces it with the product info file.
The info is now stored in a separate file in the rootfs, instead of
embedded in the core binary. This has the benefit that the core binary
no longer needs to be relinked when stamping info changes.
The version logging in core/main, and the tconsole are updated to show
some of the additional info from the product info.
Change-Id: Ic5ed0e3598e8da71b96748e8d7abfedff41acd3f
Reviewed-on: https://review.monogon.dev/c/monogon/+/4207
Tested-by: Jenkins CI
Reviewed-by: Tim Windelschmidt <tim@monogon.tech>
diff --git a/metropolis/node/core/update/BUILD.bazel b/metropolis/node/core/update/BUILD.bazel
index 532b917..0ce75b4 100644
--- a/metropolis/node/core/update/BUILD.bazel
+++ b/metropolis/node/core/update/BUILD.bazel
@@ -11,8 +11,8 @@
deps = [
"//go/logging",
"//metropolis/node/abloader/spec",
+ "//metropolis/node/core/productinfo",
"//metropolis/proto/api",
- "//metropolis/version",
"//osbase/blockdev",
"//osbase/build/mkimage/osimage",
"//osbase/efivarfs",
@@ -20,7 +20,6 @@
"//osbase/kexec",
"//osbase/oci/osimage",
"//osbase/oci/registry",
- "//version",
"@com_github_cenkalti_backoff_v4//:backoff",
"@org_golang_google_grpc//codes",
"@org_golang_google_grpc//status",
diff --git a/metropolis/node/core/update/e2e/testos/testos.bzl b/metropolis/node/core/update/e2e/testos/testos.bzl
index c59af8c..b0665c0 100644
--- a/metropolis/node/core/update/e2e/testos/testos.bzl
+++ b/metropolis/node/core/update/e2e/testos/testos.bzl
@@ -12,6 +12,7 @@
name = "rootfs_" + variant,
files = {
"/init": ":testos_" + variant,
+ "/etc/product-info.json": ":product_info_" + variant,
"/etc/resolv.conf": "//osbase/net/dns:resolv.conf",
},
fsspecs = [
diff --git a/metropolis/node/core/update/update.go b/metropolis/node/core/update/update.go
index 53bcb96..d620677 100644
--- a/metropolis/node/core/update/update.go
+++ b/metropolis/node/core/update/update.go
@@ -26,7 +26,7 @@
"google.golang.org/protobuf/proto"
"source.monogon.dev/go/logging"
- mversion "source.monogon.dev/metropolis/version"
+ "source.monogon.dev/metropolis/node/core/productinfo"
"source.monogon.dev/osbase/blockdev"
"source.monogon.dev/osbase/build/mkimage/osimage"
"source.monogon.dev/osbase/efivarfs"
@@ -34,7 +34,6 @@
"source.monogon.dev/osbase/kexec"
ociosimage "source.monogon.dev/osbase/oci/osimage"
"source.monogon.dev/osbase/oci/registry"
- "source.monogon.dev/version"
abloaderpb "source.monogon.dev/metropolis/node/abloader/spec"
apb "source.monogon.dev/metropolis/proto/api"
@@ -284,7 +283,7 @@
RetryNotify: func(err error, d time.Duration) {
s.Logger.Warningf("Error while fetching OS image, retrying in %v: %v", d, err)
},
- UserAgent: "MonogonOS/" + version.Semver(mversion.Version),
+ UserAgent: "MonogonOS/" + productinfo.Get().VersionString,
Scheme: imageRef.Scheme,
Host: imageRef.Host,
Repository: imageRef.Repository,