Update ignite client (#188)

Signed-off-by: Muhammad Raisul Islam Evan <raisul@appscode.com>

Author: Evanraisul

go.mod

@@ -37,7 +37,7 @@ require (
 	k8s.io/klog/v2 v2.130.1
 	kmodules.xyz/client-go v0.32.6
 	kmodules.xyz/custom-resources v0.32.0
-	kubedb.dev/apimachinery v0.56.0
+	kubedb.dev/apimachinery v0.56.1-0.20250718121809-af2b0a656c75
 	sigs.k8s.io/controller-runtime v0.20.4
 	xorm.io/xorm v1.3.9
 )

go.sum

@@ -546,8 +546,8 @@ kmodules.xyz/monitoring-agent-api v0.32.0 h1:cMQbWvbTc4JWeLI/zYE0HLefsdFYBzqvATL
 kmodules.xyz/monitoring-agent-api v0.32.0/go.mod h1:zgRKiJcuK7FOHy0Y1TsONRbJfgnPCs8t4Zh/6Afr+yU=
 kmodules.xyz/offshoot-api v0.32.0 h1:gogc5scSZe2JoXtZof72UGRl3Tit0kFaFRMkLLT1D8o=
 kmodules.xyz/offshoot-api v0.32.0/go.mod h1:tled7OxYZ3SkUJcrVFVVYyd+zXjsRSEm1R6Q3k4gcx0=
-kubedb.dev/apimachinery v0.56.0 h1:3vOdnv03sQiDJ17w25gsu+1acAUB5PLq/1oBhEsLuno=
-kubedb.dev/apimachinery v0.56.0/go.mod h1:Iw40Vbo63tNqgQA5pTue0WHBvPaxWsJy6MEWfZmACQw=
+kubedb.dev/apimachinery v0.56.1-0.20250718121809-af2b0a656c75 h1:KSIEzP4RUuMQ63mWBKQ8Tkth4jh+31Borcy3lWetcnQ=
+kubedb.dev/apimachinery v0.56.1-0.20250718121809-af2b0a656c75/go.mod h1:Iw40Vbo63tNqgQA5pTue0WHBvPaxWsJy6MEWfZmACQw=
 kubeops.dev/petset v0.0.10 h1:sNaqmHrD9bW7pcrWnwPoiQrKvdRwRX0BaRQc5QA78Bg=
 kubeops.dev/petset v0.0.10/go.mod h1:uHL83kggwmtSxdlIfxNbY2isV22iYV6YjADv0y+Z7YA=
 kubeops.dev/sidekick v0.0.11 h1:OydXdIH6cYSiWxKIWvrywk95WhhHSERkc7RNPOmTekc=

ignite/kubedb_client_builder.go

@@ -37,6 +37,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
+const Public_Cache_Name = "PUBLIC"
+
 type KubeDBClientBuilder struct {
 	kc      client.Client
 	db      *api.Ignite
@@ -79,7 +81,7 @@ func (o *KubeDBClientBuilder) WithTimeout(d time.Duration) *KubeDBClientBuilder
 	return o
 }
 
-func (o *KubeDBClientBuilder) GetIgniteBinaryClient() (*BinaryClient, error) {
+func (o *KubeDBClientBuilder) GetIgniteConnectionInfo() ignite.ConnInfo {
 	igniteConnectionInfo := ignite.ConnInfo{
 		Network: "tcp",
 		Host:    o.Address(),
@@ -91,8 +93,14 @@ func (o *KubeDBClientBuilder) GetIgniteBinaryClient() (*BinaryClient, error) {
 			Timeout: o.timeout,
 		},
 	}
+	return igniteConnectionInfo
+}
+
+func (o *KubeDBClientBuilder) GetIgniteBinaryClient() (*BinaryClient, error) {
+	igniteConnectionInfo := o.GetIgniteConnectionInfo()
+
 	if !o.db.Spec.DisableSecurity {
-		err, username, password := o.getUsernamePassword()
+		err, username, password := o.GetUsernamePassword()
 		if err != nil {
 			return nil, err
 		}
@@ -123,14 +131,19 @@ func (o *KubeDBClientBuilder) GetIgniteBinaryClient() (*BinaryClient, error) {
 	}, nil
 }
 
-func (o *KubeDBClientBuilder) GetIgniteSqlClient() (*SqlClient, error) {
+func (o *KubeDBClientBuilder) GetIgniteDataSource() string {
 	dataSource := fmt.Sprintf(
 		"tcp://%s:%d/PUBLIC?version=1.1.0"+
 			"&timeout=%d",
 		o.Address(), kubedb.IgniteThinPort, o.timeout)
+	return dataSource
+}
+
+func (o *KubeDBClientBuilder) GetIgniteSqlClient() (*SqlClient, error) {
+	dataSource := o.GetIgniteDataSource()
 
 	if !o.db.Spec.DisableSecurity {
-		err, username, password := o.getUsernamePassword()
+		err, username, password := o.GetUsernamePassword()
 		if err != nil {
 			return nil, nil
 		}
@@ -155,7 +168,7 @@ func (o *KubeDBClientBuilder) GetIgniteSqlClient() (*SqlClient, error) {
 	}, nil
 }
 
-func (o *KubeDBClientBuilder) getUsernamePassword() (error, string, string) {
+func (o *KubeDBClientBuilder) GetUsernamePassword() (error, string, string) {
 	authSecret := &core.Secret{}
 
 	err := o.kc.Get(o.ctx, types.NamespacedName{
@@ -174,7 +187,7 @@ func (o *KubeDBClientBuilder) getUsernamePassword() (error, string, string) {
 
 func (igBin *BinaryClient) CreateCache(cacheName string) error {
 	// create cache
-	if err := igBin.CacheCreateWithName(cacheName); err != nil {
+	if err := igBin.CacheGetOrCreateWithName(cacheName); err != nil {
 		klog.Error(err, "failed to create cache: %v")
 		return err
 	}

vendor/kubedb.dev/apimachinery/apis/kubedb/constants.go

@@ -1512,9 +1512,8 @@ const (
 	IgniteInitScriptDir        = "/scripts"
 	IgniteConfigVolName        = "ignite-config"
 	IgniteWorkVolName          = "ignite-work"
+	IgniteWorkVolPath          = "/opt/ignite/apache-ignite/work"
 	IgniteConfigFileName       = "node-configuration.xml"
-	IgniteDataVolName          = "data"
-	IgniteDataDir              = "/ignite/data"
 	IgniteContainerName        = "ignite"
 	IgniteConfigDir            = "/ignite/config"
 	IgniteRestPortName         = "rest"

vendor/modules.txt

@@ -1784,7 +1784,7 @@ kmodules.xyz/offshoot-api/api/v1
 kmodules.xyz/offshoot-api/api/v1/conversion
 kmodules.xyz/offshoot-api/api/v2
 kmodules.xyz/offshoot-api/util
-# kubedb.dev/apimachinery v0.56.0
+# kubedb.dev/apimachinery v0.56.1-0.20250718121809-af2b0a656c75
 ## explicit; go 1.23.0
 kubedb.dev/apimachinery/apis
 kubedb.dev/apimachinery/apis/catalog