From 3307d4f9d4c1096b528b94d8782d74f4252a688e Mon Sep 17 00:00:00 2001 From: jamesbeedy Date: Fri, 29 May 2026 22:01:39 +0000 Subject: [PATCH] fix: accept newer microceph versions --- service/version.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/service/version.go b/service/version.go index 511ce9473..8113815e3 100644 --- a/service/version.go +++ b/service/version.go @@ -80,16 +80,14 @@ func validateVersion(serviceType types.ServiceType, daemonVersion string) error } case types.MicroCeph: - regex := regexp.MustCompile(`\d+\.\d+\.\d+`) - match := regex.FindString(daemonVersion) + match := regexp.MustCompile(`[0-9]+\.[0-9]+(?:\.[0-9]+)?`).FindString(daemonVersion) if match == "" { - return fmt.Errorf("%s version format not supported (%s)", serviceType, daemonVersion) + return fmt.Errorf("%s version %q is not supported", serviceType, daemonVersion) } - daemonVersion = semver.Canonical("v" + match) - expectedVersion := semver.Canonical("v" + microCephMinVersion) - if semver.Compare(semver.MajorMinor(daemonVersion), semver.MajorMinor(expectedVersion)) != 0 { - return fmt.Errorf("%s version %q is not supported", serviceType, daemonVersion) + err := compareVersion(match, microCephMinVersion, serviceType) + if err != nil { + return err } }