Merge branch 'mmalvezz' into 'master'

bug 34677093

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

Author: mmalvezz

apis/database/v1alpha1/cdb_types.go

@@ -80,8 +80,6 @@ type CDBSpec struct {
 	WebServerUser WebServerUser `json:"webServerUser,omitempty"`
 	// Password for the Web Server User
 	WebServerPwd WebServerPassword `json:"webServerPwd,omitempty"`
-	// SCAN Name
-	SCANName string `json:"scanName,omitempty"`
 	// Name of the DB server
 	DBServer string `json:"dbServer,omitempty"`
 	// DB server port
@@ -152,7 +150,6 @@ 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.scanName",name="SCAN Name",type="string",description="SCAN Name"
 // +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

@@ -103,10 +103,11 @@ func (r *CDB) ValidateCreate() error {
                         field.Required(field.NewPath("spec").Child("cdbTlsCrt"), "Please specify CDB Tls Certificate(secret)"))
         }
 
-	if r.Spec.SCANName == "" {
+	/*if r.Spec.SCANName == "" {
 		allErrs = append(allErrs,
 			field.Required(field.NewPath("spec").Child("scanName"), "Please specify SCAN Name for CDB"))
-	}
+	}*/
+
 	if r.Spec.DBServer == "" {
 		allErrs = append(allErrs,
 			field.Required(field.NewPath("spec").Child("dbServer"), "Please specify Database Server Name or IP Address"))

config/crd/bases/database.oracle.com_cdbs.yaml

@@ -29,10 +29,6 @@ spec:
       jsonPath: .spec.dbPort
       name: DB Port
       type: integer
-    - description: SCAN Name
-      jsonPath: .spec.scanName
-      name: SCAN Name
-      type: string
     - description: Replicas
       jsonPath: .spec.replicas
       name: Replicas
@@ -183,9 +179,6 @@ spec:
               replicas:
                 description: Number of ORDS Containers to create
                 type: integer
-              scanName:
-                description: SCAN Name
-                type: string
               serviceName:
                 description: Name of the CDB Service
                 type: string

config/samples/multitenant/cdb.yaml

@@ -9,7 +9,6 @@ metadata:
   namespace: oracle-database-operator-system
 spec:
   cdbName: "devcdb"
-  scanName: "devdb"
   dbServer: "172.17.0.4"
   dbPort: 1521
   replicas: 1
@@ -41,4 +40,4 @@ spec:
   webServerPwd: 
     secret: 
       secretName: "cdb1-secret"
-      key: "webserver_pwd"  
+      key: "webserver_pwd"  

controllers/DBserver

@@ -0,0 +1,33 @@
+# This viminfo file was generated by Vim 7.4.
+# You may edit it if you're careful!
+
+# Value of 'encoding' when this file was written
+*encoding=utf-8
+
+
+# hlsearch on (H) or off (h):
+~H
+# Command Line History (newest to oldest):
+:q!
+:q
+
+# Search String History (newest to oldest):
+
+# Expression History (newest to oldest):
+
+# Input Line History (newest to oldest):
+
+# Input Line History (newest to oldest):
+
+# Registers:
+
+# File marks:
+'0  1  0  ~/WORKDIR/Ords22_operator/oracle-database-operator/controllers/grep
+
+# Jumplist (newest first):
+-'  1  0  ~/WORKDIR/Ords22_operator/oracle-database-operator/controllers/grep
+
+# History of marks within files (newest to oldest):
+
+> ~/WORKDIR/Ords22_operator/oracle-database-operator/controllers/grep
+	"	1	0

controllers/database/pdb_controller.go

@@ -444,10 +444,11 @@ func (r *PDBReconciler) callAPI(ctx context.Context, req ctrl.Request, pdb *dbap
 	}
 
 	caCert := secret.Data[pdb.Spec.PDBTlsCat.Secret.Key]
-
+        /*
 	r.Recorder.Eventf(pdb, corev1.EventTypeWarning, "ORDSINFO", string(rsaKeyPEM))
 	r.Recorder.Eventf(pdb, corev1.EventTypeWarning, "ORDSINFO", string(rsaCertPEM))
 	r.Recorder.Eventf(pdb, corev1.EventTypeWarning, "ORDSINFO", string(caCert))
+        */
 
 	certificate, err := tls.X509KeyPair([]byte(rsaCertPEM), []byte(rsaKeyPEM))
 	if err != nil {
@@ -501,7 +502,6 @@ func (r *PDBReconciler) callAPI(ctx context.Context, req ctrl.Request, pdb *dbap
 	if action == "GET" {
 		httpreq, err = http.NewRequest(action, url, nil)
 	} else {
-		fmt.Println("payload:", payload)
 		jsonValue, _ := json.Marshal(payload)
 		httpreq, err = http.NewRequest(action, url, bytes.NewBuffer(jsonValue))
 	}
@@ -641,7 +641,7 @@ 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)
 
-	pdb.Status.ConnString = cdb.Spec.SCANName + ":" + strconv.Itoa(cdb.Spec.DBPort) + "/" + pdb.Spec.PDBName
+	pdb.Status.ConnString = cdb.Spec.DBServer + ":" + strconv.Itoa(cdb.Spec.DBPort) + "/" + pdb.Spec.PDBName
 	log.Info("Created PDB Resource", "PDB Name", pdb.Spec.PDBName)
 	r.getPDBState(ctx, req, pdb)
 	return nil
@@ -695,7 +695,7 @@ 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.SCANName + ":" + strconv.Itoa(cdb.Spec.DBPort) + "/" + pdb.Spec.PDBName
+	pdb.Status.ConnString = cdb.Spec.DBServer + ":" + strconv.Itoa(cdb.Spec.DBPort) + "/" + pdb.Spec.PDBName
 	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 +763,7 @@ 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.SCANName + ":" + strconv.Itoa(cdb.Spec.DBPort) + "/" + pdb.Spec.PDBName
+	pdb.Status.ConnString = cdb.Spec.DBServer + ":" + strconv.Itoa(cdb.Spec.DBPort) + "/" + pdb.Spec.PDBName
 	log.Info("Successfully plugged PDB", "PDB Name", pdb.Spec.PDBName)
 	r.getPDBState(ctx, req, pdb)
 	return nil
@@ -883,7 +883,7 @@ 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.SCANName + ":" + strconv.Itoa(cdb.Spec.DBPort) + "/" + pdb.Spec.PDBName
+	pdb.Status.ConnString = cdb.Spec.DBServer + ":" + strconv.Itoa(cdb.Spec.DBPort) + "/" + pdb.Spec.PDBName
 
 	log.Info("Successfully modified PDB state", "PDB Name", pdb.Spec.PDBName)
 	r.getPDBState(ctx, req, pdb)
@@ -970,7 +970,7 @@ 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.SCANName + ":" + strconv.Itoa(cdb.Spec.DBPort) + "/" + pdb.Spec.PDBName
+	pdb.Status.ConnString = cdb.Spec.DBServer + ":" + strconv.Itoa(cdb.Spec.DBPort) + "/" + pdb.Spec.PDBName
 
 	log.Info("Successfully mapped PDB to Kubernetes resource", "PDB Name", pdb.Spec.PDBName)
 	return nil