Use pointer client tls field

Signed-off-by: Neaj Morshad <[email protected]>
kubedb · Nov 18, 2024 · 4f0a6e5 · 4f0a6e5
1 parent 8cd38b0
commit 4f0a6e5
Show file tree

Hide file tree

Showing 7 changed files with 73 additions and 73 deletions.
diff --git a/go.mod b/go.mod
@@ -32,7 +32,7 @@ require (
 	k8s.io/klog/v2 v2.130.1
 	kmodules.xyz/client-go v0.30.32
 	kmodules.xyz/custom-resources v0.30.0
-	kubedb.dev/apimachinery v0.49.0-rc.0.0.20241118084711-f93d33ddb83e
+	kubedb.dev/apimachinery v0.49.0-rc.0.0.20241118100310-eaa4e1c88438
 	sigs.k8s.io/controller-runtime v0.18.4
 	xorm.io/xorm v1.3.6
 )

diff --git a/go.sum b/go.sum
@@ -804,8 +804,8 @@ kmodules.xyz/monitoring-agent-api v0.30.2 h1:sAgz5P5EXZqhlj1NzJ+QltAgeIx5bGSMj+a
 kmodules.xyz/monitoring-agent-api v0.30.2/go.mod h1:BoZFPDDRB7J39CcUsSDlzgW8PQCwik4ILPleyUob+Mg=
 kmodules.xyz/offshoot-api v0.30.1 h1:TrulAYO+oBsXe9sZZGTmNWIuI8qD2izMpgcTSPvgAmI=
 kmodules.xyz/offshoot-api v0.30.1/go.mod h1:T3mpjR6fui0QzOcmQvIuANytW48fe9ytmy/1cgx6D4g=
-kubedb.dev/apimachinery v0.49.0-rc.0.0.20241118084711-f93d33ddb83e h1:8U2ubH20d0BsfDS/qKttrGvX78xy/mAboKxKhJmaJbM=
-kubedb.dev/apimachinery v0.49.0-rc.0.0.20241118084711-f93d33ddb83e/go.mod h1:KHMku01LAZnDSVqURo5cWnAFBH5LRbOdd2V2XnDVBVA=
+kubedb.dev/apimachinery v0.49.0-rc.0.0.20241118100310-eaa4e1c88438 h1:ZWfejX6wX81JB2Fac+By8xXjfYMFwp7/Kf+X2JJKRZE=
+kubedb.dev/apimachinery v0.49.0-rc.0.0.20241118100310-eaa4e1c88438/go.mod h1:KHMku01LAZnDSVqURo5cWnAFBH5LRbOdd2V2XnDVBVA=
 kubeops.dev/petset v0.0.7 h1:F77BTRfUqRVO7kNc8q2oFSSviDmYBqni/osXqu0kgJ4=
 kubeops.dev/petset v0.0.7/go.mod h1:lt0SZV4ohRy7RiwLNUnMoauG4lCbcRbSqhMg20rdUQg=
 lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=

diff --git a/mssqlserver/kubedb_client_builder.go b/mssqlserver/kubedb_client_builder.go
@@ -122,7 +122,7 @@ func (o *KubeDBClientBuilder) getConnectionString() (string, error) {
 
 	// TLS Configuration
 	tlsConfig := ""
-	if o.db.Spec.TLS.ClientTLS != nil && *o.db.Spec.TLS.ClientTLS == true {
+	if o.db.Spec.TLS.ClientTLS != nil && *o.db.Spec.TLS.ClientTLS {
 		tlsConfig = "encrypt=true;TrustServerCertificate=true;"
 	}
 

diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/mssqlserver_types.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/mssqlserver_types.go
@@ -104,7 +104,7 @@ type MSSQLServerSpec struct {
 	PodTemplate *ofst.PodTemplateSpec `json:"podTemplate,omitempty"`
 
 	// TLS contains tls configurations for client and server.
-	TLS *SQLServerTLSConfig `json:"tls,omitempty"`
+	TLS *MSSQLServerTLSConfig `json:"tls,omitempty"`
 
 	// ServiceTemplates is an optional configuration for services used to expose database
 	// +optional
@@ -132,7 +132,7 @@ type MSSQLServerSpec struct {
 	Archiver *Archiver `json:"archiver,omitempty"`
 }
 
-type SQLServerTLSConfig struct {
+type MSSQLServerTLSConfig struct {
 	kmapi.TLSConfig `json:",inline"`
 
 	// +optional

diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/openapi_generated.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/openapi_generated.go
diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/zz_generated.deepcopy.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/zz_generated.deepcopy.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -1564,7 +1564,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.49.0-rc.0.0.20241118084711-f93d33ddb83e
+# kubedb.dev/apimachinery v0.49.0-rc.0.0.20241118100310-eaa4e1c88438
 ## explicit; go 1.22.1
 kubedb.dev/apimachinery/apis
 kubedb.dev/apimachinery/apis/catalog