Merge pull request #225 from gianlucam76/update-compatibility-checks

Update libsveltos pin
projectsveltos · Sep 4, 2024 · 6a9f71d · 6a9f71d
2 parents 523f2b0 + 43c189d
commit 6a9f71d
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/controllers/healthcheckreport_collection.go b/controllers/healthcheckreport_collection.go
@@ -154,7 +154,7 @@ func collectAndProcessHealthCheckReportsFromCluster(ctx context.Context, c clien
 		return err
 	}
 
-	if !sveltos_upgrade.IsVersionCompatible(ctx, remoteClient, version) {
+	if !sveltos_upgrade.IsSveltosAgentVersionCompatible(ctx, remoteClient, version) {
 		logger.V(logs.LogDebug).Info(compatibilityErrorMsg)
 		return errors.New(compatibilityErrorMsg)
 	}

diff --git a/controllers/reloaderreport_collection.go b/controllers/reloaderreport_collection.go
@@ -86,7 +86,7 @@ func collectAndProcessReloaderReportsFromCluster(ctx context.Context, c client.C
 		return err
 	}
 
-	if !sveltos_upgrade.IsVersionCompatible(ctx, remoteClient, version) {
+	if !sveltos_upgrade.IsSveltosAgentVersionCompatible(ctx, remoteClient, version) {
 		logger.V(logs.LogDebug).Info(compatibilityErrorMsg)
 		return errors.New(compatibilityErrorMsg)
 	}

diff --git a/controllers/suite_utils_test.go b/controllers/suite_utils_test.go
@@ -255,7 +255,7 @@ func prepareCluster() *clusterv1.Cluster {
 			Name:      "sveltos-agent-version",
 		},
 		Data: map[string]string{
-			"sveltos-agent-version": version,
+			"version": version,
 		},
 	}
 	err := testEnv.Client.Create(context.TODO(), cm)

diff --git a/go.mod b/go.mod
@@ -13,7 +13,7 @@ require (
 	github.com/onsi/gomega v1.34.2
 	github.com/pkg/errors v0.9.1
 	github.com/projectsveltos/addon-controller v0.37.1-0.20240901122549-ceccffdd0089
-	github.com/projectsveltos/libsveltos v0.37.1-0.20240903133242-23de3048ef2a
+	github.com/projectsveltos/libsveltos v0.37.1-0.20240904135406-8f573456bb10
 	github.com/prometheus/client_golang v1.20.2
 	github.com/slack-go/slack v0.14.0
 	github.com/spf13/pflag v1.0.5

diff --git a/go.sum b/go.sum
@@ -384,8 +384,8 @@ github.com/poy/onpar v1.1.2 h1:QaNrNiZx0+Nar5dLgTVp5mXkyoVFIbepjyEoGSnhbAY=
 github.com/poy/onpar v1.1.2/go.mod h1:6X8FLNoxyr9kkmnlqpK6LSoiOtrO6MICtWwEuWkLjzg=
 github.com/projectsveltos/addon-controller v0.37.1-0.20240901122549-ceccffdd0089 h1:4wGduXFyah+hDUKoEU7Mldv7xKxlFBICINWjSH0JJE8=
 github.com/projectsveltos/addon-controller v0.37.1-0.20240901122549-ceccffdd0089/go.mod h1:5wL+MLny5wnGLryLbxv3ljvLB/XPu1XgbKDJWu3G5o8=
-github.com/projectsveltos/libsveltos v0.37.1-0.20240903133242-23de3048ef2a h1:ydhJD/+j1iT/qwsS/dInlqSJ+Zz9VkW0XUmEP6Rk2js=
-github.com/projectsveltos/libsveltos v0.37.1-0.20240903133242-23de3048ef2a/go.mod h1:YZQWtvZUDfg2VbjrPEGVQZa/yxq0n+KMV58iro7L5yg=
+github.com/projectsveltos/libsveltos v0.37.1-0.20240904135406-8f573456bb10 h1:54IvFGpL8g4tYbFXr/C+XZ3F2whmGoWVzfZBiNqH6C0=
+github.com/projectsveltos/libsveltos v0.37.1-0.20240904135406-8f573456bb10/go.mod h1:YZQWtvZUDfg2VbjrPEGVQZa/yxq0n+KMV58iro7L5yg=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
 github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g=