Merge branch 'mmalvezz' into 'master'

bug 34699326 + usecase01

See merge request rac-docker-dev/oracle-database-operator!231

Author: mmalvezz

apis/database/v1alpha1/cdb_types.go

@@ -86,6 +86,7 @@ type CDBSpec struct {
 	DBPort int `json:"dbPort,omitempty"`
 	// Node Selector for running the Pod
 	NodeSelector map[string]string `json:"nodeSelector,omitempty"`
+        DBTnsurl string `json:"dbTnsurl,omitempty"`  
 }
 
 // CDBSecret defines the secretName
@@ -150,6 +151,7 @@ type CDBStatus struct {
 // +kubebuilder:printcolumn:JSONPath=".spec.cdbName",name="CDB Name",type="string",description="Name of the CDB"
 // +kubebuilder:printcolumn:JSONPath=".spec.dbServer",name="DB Server",type="string",description=" Name of the DB Server"
 // +kubebuilder:printcolumn:JSONPath=".spec.dbPort",name="DB Port",type="integer",description="DB server port"
+// +kubebuilder:printcolumn:JSONPath=".spec.dbTnsurl",name="TNS STRING",type="string",description=" string of the tnsalias"
 // +kubebuilder:printcolumn:JSONPath=".spec.replicas",name="Replicas",type="integer",description="Replicas"
 // +kubebuilder:printcolumn:JSONPath=".status.phase",name="Status",type="string",description="Status of the CDB Resource"
 // +kubebuilder:printcolumn:JSONPath=".status.msg",name="Message",type="string",description="Error message, if any"

apis/database/v1alpha1/cdb_webhook.go

@@ -88,7 +88,7 @@ func (r *CDB) ValidateCreate() error {
 
 	var allErrs field.ErrorList
 
-	if r.Spec.ServiceName == "" {
+	if r.Spec.ServiceName == "" && r.Spec.DBServer != "" {
 		allErrs = append(allErrs,
 			field.Required(field.NewPath("spec").Child("serviceName"), "Please specify CDB Service name"))
 	}
@@ -108,15 +108,21 @@ func (r *CDB) ValidateCreate() error {
 			field.Required(field.NewPath("spec").Child("scanName"), "Please specify SCAN Name for CDB"))
 	}*/
 
-	if r.Spec.DBServer == "" {
+	if ((r.Spec.DBServer == "" && r.Spec.DBTnsurl == "") || (r.Spec.DBServer != "" && r.Spec.DBTnsurl != ""))  {
 		allErrs = append(allErrs,
-			field.Required(field.NewPath("spec").Child("dbServer"), "Please specify Database Server Name or IP Address"))
+			field.Required(field.NewPath("spec").Child("dbServer"), "Please specify Database Server Name/IP Address or tnsalias string"))
 	}
-	if r.Spec.DBPort == 0 {
+
+        if r.Spec.DBTnsurl != "" && ( r.Spec.DBServer != "" || r.Spec.DBPort != 0 || r.Spec.ServiceName != "" ) { 
+		allErrs = append(allErrs,
+			field.Required(field.NewPath("spec").Child("dbServer"), "DBtnsurl is orthogonal to (DBServer,DBport,Services)"))
+        }
+ 
+	if r.Spec.DBPort == 0 && r.Spec.DBServer != "" {
 		allErrs = append(allErrs,
 			field.Required(field.NewPath("spec").Child("dbPort"), "Please specify DB Server Port"))
 	}
-	if r.Spec.DBPort < 0 {
+	if r.Spec.DBPort < 0 && r.Spec.DBServer != "" {
 		allErrs = append(allErrs,
 			field.Required(field.NewPath("spec").Child("dbPort"), "Please specify a valid DB Server Port"))
 	}

controllers/DBserver

@@ -449,6 +449,10 @@ func (r *CDBReconciler) createPodSpec(cdb *dbapi.CDB) corev1.PodSpec {
 						Name:  "ORACLE_HOST",
 						Value: cdb.Spec.DBServer,
 					},
+                                        {
+                                                Name:  "DBTNSURL",
+                                                Value: cdb.Spec.DBTnsurl,
+                                        },
 					{
 						Name:  "TLSCRT",
 						Value: cdb.Spec.CDBTlsCrt.Secret.Key,

controllers/database/cdb_controller.go

@@ -641,7 +641,12 @@ func (r *PDBReconciler) createPDB(ctx context.Context, req ctrl.Request, pdb *db
 
 	r.Recorder.Eventf(pdb, corev1.EventTypeNormal, "Created", "PDB '%s' created successfully", pdb.Spec.PDBName)
 
+        if cdb.Spec.DBServer != "" {
 	pdb.Status.ConnString = cdb.Spec.DBServer + ":" + strconv.Itoa(cdb.Spec.DBPort) + "/" + pdb.Spec.PDBName
+        } else { 
+         pdb.Status.ConnString = cdb.Spec.DBTnsurl
+        }
+        
 	log.Info("Created PDB Resource", "PDB Name", pdb.Spec.PDBName)
 	r.getPDBState(ctx, req, pdb)
 	return nil
@@ -695,7 +700,13 @@ func (r *PDBReconciler) clonePDB(ctx context.Context, req ctrl.Request, pdb *dba
 
 	r.Recorder.Eventf(pdb, corev1.EventTypeNormal, "Created", "PDB '%s' cloned successfully", pdb.Spec.PDBName)
 
-	pdb.Status.ConnString = cdb.Spec.DBServer + ":" + strconv.Itoa(cdb.Spec.DBPort) + "/" + pdb.Spec.PDBName
+        if cdb.Spec.DBServer != "" {
+        pdb.Status.ConnString = cdb.Spec.DBServer + ":" + strconv.Itoa(cdb.Spec.DBPort) + "/" + pdb.Spec.PDBName
+        } else {
+         pdb.Status.ConnString = cdb.Spec.DBTnsurl
+        }
+  
+
 	log.Info("Cloned PDB successfully", "Source PDB Name", pdb.Spec.SrcPDBName, "Clone PDB Name", pdb.Spec.PDBName)
 	r.getPDBState(ctx, req, pdb)
 	return nil
@@ -763,7 +774,12 @@ func (r *PDBReconciler) plugPDB(ctx context.Context, req ctrl.Request, pdb *dbap
 
 	r.Recorder.Eventf(pdb, corev1.EventTypeNormal, "Created", "PDB '%s' plugged successfully", pdb.Spec.PDBName)
 
-	pdb.Status.ConnString = cdb.Spec.DBServer + ":" + strconv.Itoa(cdb.Spec.DBPort) + "/" + pdb.Spec.PDBName
+        if cdb.Spec.DBServer != "" {
+        pdb.Status.ConnString = cdb.Spec.DBServer + ":" + strconv.Itoa(cdb.Spec.DBPort) + "/" + pdb.Spec.PDBName
+        } else {
+         pdb.Status.ConnString = cdb.Spec.DBTnsurl
+        }
+
 	log.Info("Successfully plugged PDB", "PDB Name", pdb.Spec.PDBName)
 	r.getPDBState(ctx, req, pdb)
 	return nil
@@ -883,7 +899,13 @@ func (r *PDBReconciler) modifyPDB(ctx context.Context, req ctrl.Request, pdb *db
 	}
 
 	r.Recorder.Eventf(pdb, corev1.EventTypeNormal, "Modified", "PDB '%s' modified successfully", pdb.Spec.PDBName)
-	pdb.Status.ConnString = cdb.Spec.DBServer + ":" + strconv.Itoa(cdb.Spec.DBPort) + "/" + pdb.Spec.PDBName
+
+        if cdb.Spec.DBServer != "" {
+        pdb.Status.ConnString = cdb.Spec.DBServer + ":" + strconv.Itoa(cdb.Spec.DBPort) + "/" + pdb.Spec.PDBName
+        } else {
+         pdb.Status.ConnString = cdb.Spec.DBTnsurl
+        }
+
 
 	log.Info("Successfully modified PDB state", "PDB Name", pdb.Spec.PDBName)
 	r.getPDBState(ctx, req, pdb)
@@ -970,7 +992,13 @@ func (r *PDBReconciler) mapPDB(ctx context.Context, req ctrl.Request, pdb *dbapi
 
 	pdb.Status.OpenMode = objmap["open_mode"].(string)
 	pdb.Status.TotalSize = fmt.Sprintf("%.2f", totSizeInGB) + "G"
-	pdb.Status.ConnString = cdb.Spec.DBServer + ":" + strconv.Itoa(cdb.Spec.DBPort) + "/" + pdb.Spec.PDBName
+
+        if cdb.Spec.DBServer != "" {
+        pdb.Status.ConnString = cdb.Spec.DBServer + ":" + strconv.Itoa(cdb.Spec.DBPort) + "/" + pdb.Spec.PDBName
+        } else {
+         pdb.Status.ConnString = cdb.Spec.DBTnsurl
+        }
+
 
 	log.Info("Successfully mapped PDB to Kubernetes resource", "PDB Name", pdb.Spec.PDBName)
 	return nil