Support management lib v1.2.0

aerospike · Jan 29, 2024 · 03d6548 · 03d6548
1 parent 4522505
commit 03d6548
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/api/v1/aerospikecluster_validating_webhook.go b/api/v1/aerospikecluster_validating_webhook.go
@@ -1681,7 +1681,7 @@ func validateAerospikeConfigSchema(
 ) error {
 	config := configSpec.Value
 
-	asConf, err := asconfig.NewMapAsConfig(aslog, version, config)
+	asConf, err := asconfig.NewMapAsConfig(aslog, config)
 	if err != nil {
 		return fmt.Errorf("failed to load config map by lib: %v", err)
 	}

diff --git a/controllers/configmap.go b/controllers/configmap.go
@@ -186,15 +186,13 @@ func (r *SingleClusterReconciler) buildConfigTemplate(rack *asdbv1.Rack) (
 		"aerospikecluster", utils.ClusterNamespacedName(r.aeroCluster),
 	)
 
-	version := strings.Split(r.aeroCluster.Spec.Image, ":")
-
 	configMap := rack.AerospikeConfig.Value
 	log.V(1).Info(
 		"AerospikeConfig", "config", configMap, "image",
 		r.aeroCluster.Spec.Image,
 	)
 
-	asConf, err := asconfig.NewMapAsConfig(r.Log, version[1], configMap)
+	asConf, err := asconfig.NewMapAsConfig(r.Log, configMap)
 	if err != nil {
 		return "", fmt.Errorf("failed to load config map by lib: %v", err)
 	}

diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.19
 
 require (
 	github.com/aerospike/aerospike-client-go/v6 v6.14.0
-	github.com/aerospike/aerospike-management-lib v1.1.0
+	github.com/aerospike/aerospike-management-lib v1.2.0
 	github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d
 	github.com/evanphx/json-patch v4.12.0+incompatible
 	github.com/go-logr/logr v1.3.0

diff --git a/go.sum b/go.sum
@@ -1,7 +1,7 @@
 github.com/aerospike/aerospike-client-go/v6 v6.14.0 h1:Z3FcGWJda1sagzdc6Akz4EJ13Pq55Uyn6qtFLrVUDd0=
 github.com/aerospike/aerospike-client-go/v6 v6.14.0/go.mod h1:/0Wm81GhMqem+9flWcpazPKoRfjFeG6WrQdXGiMNi0A=
-github.com/aerospike/aerospike-management-lib v1.1.0 h1:QchwRIzxxqwnjKHkqbvdDjYl6zHTXiFpmWcN3dSPPuI=
-github.com/aerospike/aerospike-management-lib v1.1.0/go.mod h1:NwegUX6or8xmwVMIueBmGTW7lfKlZ9XDQoCuhnQKMCA=
+github.com/aerospike/aerospike-management-lib v1.2.0 h1:aBs6ZTJeVAlWZGUyxAwEBorqQG2aqQh4Ut3yxpQlV9k=
+github.com/aerospike/aerospike-management-lib v1.2.0/go.mod h1:NwegUX6or8xmwVMIueBmGTW7lfKlZ9XDQoCuhnQKMCA=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
 github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d h1:Byv0BzEl3/e6D5CLfI0j/7hiIEtvGVFPCZ7Ei2oq8iQ=
 github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=