Add review changes

Signed-off-by: Neaj Morshad <[email protected]>
kubedb · Nov 19, 2024 · cff3d8b · cff3d8b
1 parent 2e8e22a
commit cff3d8b
Show file tree

Hide file tree

Showing 7 changed files with 75 additions and 74 deletions.
diff --git a/apis/kubedb/v1alpha2/mssqlserver_helpers.go b/apis/kubedb/v1alpha2/mssqlserver_helpers.go
@@ -502,6 +502,11 @@ func (m *MSSQLServer) SetTLSDefaults() {
 		return
 	}
 
+	if m.Spec.TLS.ClientTLS == nil {
+		defaultValue := false
+		m.Spec.TLS.ClientTLS = &defaultValue
+	}
+
 	// Server-cert
 	defaultServerOrg := []string{kubedb.KubeDBOrganization}
 	defaultServerOrgUnit := []string{string(MSSQLServerServerCert)}

diff --git a/apis/kubedb/v1alpha2/mssqlserver_types.go b/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/apis/kubedb/v1alpha2/mssqlserver_webhook.go b/apis/kubedb/v1alpha2/mssqlserver_webhook.go
@@ -142,10 +142,6 @@ func (m *MSSQLServer) ValidateCreateOrUpdate() field.ErrorList {
 			allErr = append(allErr, field.Invalid(field.NewPath("spec").Child("tls").Child("issuerRef"),
 				m.Name, "spec.tls.issuerRef' is missing"))
 		}
-		if m.Spec.TLS.ClientTLS == nil {
-			allErr = append(allErr, field.Invalid(field.NewPath("spec").Child("tls").Child("clientTLS"),
-				m.Name, "spec.tls.clientTLS' is missing"))
-		}
 	}
 
 	if m.Spec.PodTemplate != nil {

diff --git a/apis/kubedb/v1alpha2/openapi_generated.go b/apis/kubedb/v1alpha2/openapi_generated.go
diff --git a/apis/kubedb/v1alpha2/zz_generated.deepcopy.go b/apis/kubedb/v1alpha2/zz_generated.deepcopy.go
diff --git a/apis/ops/v1alpha1/mssqlserver_ops_types.go b/apis/ops/v1alpha1/mssqlserver_ops_types.go
@@ -124,7 +124,7 @@ type MSSQLServerCustomConfigurationSpec struct {
 type MSSQLServerTLSSpec struct {
 	// SQLServerTLSSpec contains updated tls configurations for client and server.
 	// +optional
-	dbapi.SQLServerTLSConfig `json:",inline,omitempty"`
+	dbapi.MSSQLServerTLSConfig `json:",inline,omitempty"`
 
 	// RotateCertificates tells operator to initiate certificate rotation
 	// +optional

diff --git a/apis/ops/v1alpha1/zz_generated.deepcopy.go b/apis/ops/v1alpha1/zz_generated.deepcopy.go