dev: rework version checker

Author: sunsingerus

pkg/controller/chi/worker-app-version.go

@@ -16,15 +16,11 @@ package chi
 
 import (
 	"context"
-	"fmt"
-
 	api "github.com/altinity/clickhouse-operator/pkg/apis/clickhouse.altinity.com/v1"
 	"github.com/altinity/clickhouse-operator/pkg/apis/swversion"
 	"github.com/altinity/clickhouse-operator/pkg/controller/common/poller/domain"
 )
 
-var errUnknownVersion = fmt.Errorf("unknown version")
-
 func (w *worker) getTagBasedVersion(host *api.Host) *swversion.SoftWareVersion {
 	// Fetch tag from the image
 	var tagBasedVersion *swversion.SoftWareVersion
@@ -35,30 +31,24 @@ func (w *worker) getTagBasedVersion(host *api.Host) *swversion.SoftWareVersion {
 }
 
 // getHostClickHouseVersion gets host ClickHouse version
-func (w *worker) getHostClickHouseVersion(ctx context.Context, host *api.Host) (*swversion.SoftWareVersion, error) {
+func (w *worker) getHostClickHouseVersion(ctx context.Context, host *api.Host) *swversion.SoftWareVersion {
 	version, err := w.ensureClusterSchemer(host).HostClickHouseVersion(ctx, host)
 	if err != nil {
-		w.a.V(1).M(host).F().Warning("Failed to get ClickHouse version on host: %s", host.GetName())
-		return nil, err
+		w.a.V(1).M(host).F().Warning("Failed to get ClickHouse version on host: %s err: %v", host.GetName(), err)
+		return nil
 	}
 
 	w.a.V(1).M(host).F().Info("Get ClickHouse version on host: %s version: %s", host.GetName(), version)
-	v := swversion.NewSoftWareVersion(version)
-	if v.IsUnknown() {
-		return nil, errUnknownVersion
-	}
-
-	return v, nil
+	return swversion.NewSoftWareVersion(version)
 }
 
 func (w *worker) pollHostForClickHouseVersion(ctx context.Context, host *api.Host) (version *swversion.SoftWareVersion, err error) {
 	err = domain.PollHost(
 		ctx,
 		host,
 		func(_ctx context.Context, _host *api.Host) bool {
-			var e error
-			version, e = w.getHostClickHouseVersion(_ctx, _host)
-			if e == nil {
+			version = w.getHostClickHouseVersion(_ctx, _host)
+			if version.IsKnown() {
 				return true
 			}
 			w.a.V(1).M(host).F().Warning("Host is NOT alive: %s ", host.GetName())

pkg/controller/chi/worker-reconciler-helper.go

@@ -43,27 +43,28 @@ func (w *worker) getHostSoftwareVersion(ctx context.Context, host *api.Host) *sw
 		if tagBasedOnly, description := opts.tagBasedOnly(host); tagBasedOnly {
 			return swversion.MinVersion().SetDescription("set min version cause unable to parse from the tag: '%s' via '%s'", tagBasedVersion.GetOriginal(), description)
 		}
-		w.a.V(1).M(host).F().Info("Fallback to host-detected version. Tag: '%s' Host: %s ", tagBasedVersion.GetOriginal(), host.GetName())
+		w.a.V(1).M(host).F().Info("Fallback to app-based version. Tag: '%s' Host: %s ", tagBasedVersion.GetOriginal(), host.GetName())
 	}
 
 	// Try to report version from the app
-	if appBasedVersion, err := w.getHostClickHouseVersion(ctx, host); err == nil {
+	if appBasedVersion := w.getHostClickHouseVersion(ctx, host); appBasedVersion.IsKnown() {
 		// Able to fetch version from the app - report version
 		return appBasedVersion.SetDescription("fetched from the host")
 	}
 
 	// Unable to acquire any version - report min one
-	return swversion.MinVersion().SetDescription("min - unable to acquire neither from the tag nor from the host")
+	return swversion.MinVersion().SetDescription("min - unable to acquire neither from the tag nor from the app")
 }
 
 func (w *worker) isHostSoftwareAbleToRespond(ctx context.Context, host *api.Host) error {
 	// Check whether the software is able to respond its version
-	version, err := w.getHostClickHouseVersion(ctx, host)
-	if err != nil {
-		w.a.V(1).M(host).F().Info("Host software is not alive - version NOT detected. Host: %s Err: %v", host.GetName(), err)
+	version := w.getHostClickHouseVersion(ctx, host)
+	if version.IsKnown() {
+		w.a.V(1).M(host).F().Info("Host software is alive - version detected. Host: %s version: %s", host.GetName(), version)
+	} else {
+		w.a.V(1).M(host).F().Info("Host software is not alive - version NOT detected. Host: %s ", host.GetName())
 	}
 
-	w.a.V(1).M(host).F().Info("Host software is alive - version detected. Host: %s version: %s", host.GetName(), version)
 	return nil
 }