diff --git a/Dockerfile b/Dockerfile index af7dd4ca1..65b7b46ea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,7 @@ RUN go list -f '{{.Path}}@{{.Version}}' -m all | sed 1d | grep -e 'go-cache' -e ARG COMMIT_HASH ARG GIT_BRANCH ARG BUILD_TIMESTAMP -ARG SEM_VER +ARG SEM_VER=0.0.0 # Copy and build agent code COPY shared ../shared diff --git a/cli/apiserver/provider.go b/cli/apiserver/provider.go index 71f1a4cf3..b032cd4c8 100644 --- a/cli/apiserver/provider.go +++ b/cli/apiserver/provider.go @@ -5,12 +5,13 @@ import ( "encoding/json" "errors" "fmt" - "github.com/up9inc/mizu/shared/kubernetes" "io/ioutil" "net/http" "net/url" "time" + "github.com/up9inc/mizu/shared/kubernetes" + "github.com/up9inc/mizu/cli/config" "github.com/up9inc/mizu/shared" "github.com/up9inc/mizu/shared/logger" @@ -28,7 +29,7 @@ const DefaultTimeout = 5 * time.Second func NewProvider(url string, retries int, timeout time.Duration) *Provider { return &Provider{ - url: url, + url: url, retries: config.GetIntEnvConfig(config.ApiServerRetries, retries), client: &http.Client{ Timeout: timeout, diff --git a/cli/mizu/version/versionCheck.go b/cli/mizu/version/versionCheck.go index ceefe0921..63f02ff2c 100644 --- a/cli/mizu/version/versionCheck.go +++ b/cli/mizu/version/versionCheck.go @@ -24,6 +24,11 @@ func CheckVersionCompatibility(apiServerProvider *apiserver.Provider) (bool, err return false, err } + if !semver.SemVersion(apiSemVer).IsValid() { + logger.Log.Errorf(uiUtils.Red, fmt.Sprintf("api version (%s) is not a valid SemVer", apiSemVer)) + return false, nil + } + if semver.SemVersion(apiSemVer).Major() == semver.SemVersion(mizu.SemVer).Major() && semver.SemVersion(apiSemVer).Minor() == semver.SemVersion(mizu.SemVer).Minor() { return true, nil diff --git a/debug.Dockerfile b/debug.Dockerfile index 354351cd3..2c91746d5 100644 --- a/debug.Dockerfile +++ b/debug.Dockerfile @@ -28,7 +28,7 @@ RUN go list -f '{{.Path}}@{{.Version}}' -m all | sed 1d | grep -e 'go-cache' -e ARG COMMIT_HASH ARG GIT_BRANCH ARG BUILD_TIMESTAMP -ARG SEM_VER +ARG SEM_VER=0.0.0 # Copy and build agent code COPY shared ../shared