commit 0ccc85ba1eb4e067dc3eea0dd58b9ab0ebf48d29
author Serge Bazanski <serge@monogon.tech> Mon Nov 20 12:59:20 2023 +0100
committer Serge Bazanski <serge@monogon.tech> Thu Dec 21 14:46:59 2023 +0000
tree 82ed8db26475204d2b73f44626b751a474763883
parent 8d64a3bad1f73197398b28dacecef57266980c1a

metropolis/node: add version to status

This implements submitting the Node's version to its' Status report to
the control plane.

This version is then displayed to the user in metroctl.

Change-Id: I70eadb9a7001b6e50931245e8a6274da2fbdc5bc
Reviewed-on: https://review.monogon.dev/c/monogon/+/2334
Tested-by: Jenkins CI
Reviewed-by: Lorenz Brun <lorenz@monogon.tech>

metropolis/cli/metroctl/test/BUILD.bazel

diff --git a/metropolis/cli/metroctl/test/BUILD.bazel b/metropolis/cli/metroctl/test/BUILD.bazel
index 382c73f..36f5a2d 100644
--- a/metropolis/cli/metroctl/test/BUILD.bazel
+++ b/metropolis/cli/metroctl/test/BUILD.bazel
@@ -1,5 +1,7 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 
+# TODO(q3k): clean this up to just a go_test.
+
 go_test(
     name = "metroctl_test",
     srcs = ["test.go"],
@@ -16,6 +18,8 @@
         "//metropolis/pkg/cmd",
         "//metropolis/test/launch/cluster",
         "//metropolis/test/util",
+        "//metropolis/version",
+        "//version",
     ],
 )
 
@@ -29,5 +33,7 @@
         "//metropolis/pkg/cmd",
         "//metropolis/test/launch/cluster",
         "//metropolis/test/util",
+        "//metropolis/version",
+        "//version",
     ],
 )

metropolis/cli/metroctl/test/test.go

diff --git a/metropolis/cli/metroctl/test/test.go b/metropolis/cli/metroctl/test/test.go
index 0145cfe..969b4cc 100644
--- a/metropolis/cli/metroctl/test/test.go
+++ b/metropolis/cli/metroctl/test/test.go
@@ -15,6 +15,8 @@
 	"source.monogon.dev/metropolis/pkg/cmd"
 	"source.monogon.dev/metropolis/test/launch/cluster"
 	"source.monogon.dev/metropolis/test/util"
+	mversion "source.monogon.dev/metropolis/version"
+	"source.monogon.dev/version"
 )
 
 // resolveMetroctl resolves metroctl filesystem path. It will return a correct
@@ -238,10 +240,10 @@
 			line := scanner.Text()
 			t.Logf("Line: %q", line)
 
-			var onid, ostate, onaddr, onstatus, onroles, ontpm string
+			var onid, ostate, onaddr, onstatus, onroles, ontpm, onver string
 			var ontimeout int
 
-			_, err = fmt.Sscanf(line, "%s%s%s%s%s%s%ds", &onid, &ostate, &onaddr, &onstatus, &onroles, &ontpm, &ontimeout)
+			_, err = fmt.Sscanf(line, "%s%s%s%s%s%s%s%ds", &onid, &ostate, &onaddr, &onstatus, &onroles, &ontpm, &onver, &ontimeout)
 			if err != nil {
 				return fmt.Errorf("while parsing metroctl output: %v", err)
 			}
@@ -263,6 +265,9 @@
 			if want, got := "yes", ontpm; want != got {
 				return fmt.Errorf("node tpm mismatch: wanted %q, got %q", want, got)
 			}
+			if want, got := version.Semver(mversion.Version), onver; want != got {
+				return fmt.Errorf("node version mismatch: wanted %q, got %q", want, got)
+			}
 			if ontimeout < 0 || ontimeout > 30 {
 				return fmt.Errorf("node timeout mismatch")
 			}