Merge branch 'idesai_free23c_enh' into 'master'

23c Free support and Dataguard Controller enhancements

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

Author: yunus-qureshi

config/samples/sidb/singleinstancedatabase_free.yaml

@@ -22,6 +22,7 @@ spec:
 
   ## Database image details
   image:
+    ## Oracle Database Free is only supported from DB version 23.2 onwards
     pullFrom: container-registry.oracle.com/database/free:latest
     prebuiltDB: true
 

config/samples/sidb/singleinstancedatabase_secrets.yaml

@@ -42,7 +42,7 @@ stringData:
 
 ---
 
-## Prebuilt-Database Admin password secret
+## Oracle Database Free Admin password secret
 apiVersion: v1
 kind: Secret
 metadata:

controllers/database/dataguardbroker_controller.go

@@ -355,6 +355,21 @@ func (r *DataguardBrokerReconciler) setupDataguardBrokerConfiguration(m *dbapi.D
 	sidbReadyPod corev1.Pod, adminPassword string, ctx context.Context, req ctrl.Request) ctrl.Result {
 	log := r.Log.WithValues("setupDataguardBrokerConfiguration", req.NamespacedName)
 
+	databases, _, err := dbcommons.GetDatabasesInDgConfig(sidbReadyPod, r, r.Config, ctx, req)
+	dbSet := make(map[string]struct{})
+	if err != nil {
+		if err.Error() != "databases in DG config is nil" {
+			return requeueY
+		}
+	}
+	if len(databases) > 0 {
+		log.Info("Databases in DG config are :")
+		for i := 0; i < len(databases); i++ {
+			log.Info(strings.Split(databases[i], ":")[0])
+			dbSet[strings.ToUpper(strings.Split(databases[i], ":")[0])] = struct{}{}
+		}
+	}
+
 	for i := 0; i < len(m.Spec.StandbyDatabaseRefs); i++ {
 
 		standbyDatabase := &dbapi.SingleInstanceDatabase{}
@@ -369,6 +384,12 @@ func (r *DataguardBrokerReconciler) setupDataguardBrokerConfiguration(m *dbapi.D
 			log.Error(err, err.Error())
 			return requeueY
 		}
+		_, ok := dbSet[standbyDatabase.Status.Sid]
+		if ok {
+			log.Info("A database with the same SID is already configured in the DG")
+			r.Recorder.Eventf(m, corev1.EventTypeWarning, "Spec Error", "A database with the same SID " + standbyDatabase.Status.Sid + " is already configured in the DG")
+			continue
+		}
 
 		// Check if dataguard broker is already configured for the standby database
 		if standbyDatabase.Status.DgBrokerConfigured {

controllers/database/singleinstancedatabase_controller.go

@@ -2037,17 +2037,27 @@ func (r *SingleInstanceDatabaseReconciler) validateDBReadiness(m *dbapi.SingleIn
 			m.Status.ReleaseUpdate = version
 		}
 	}
-	oemSupport, err := isOEMSupported(r,m.Status.ReleaseUpdate)
+	dbMajorVersion, err := strconv.Atoi(strings.Split(m.Status.ReleaseUpdate,".")[0])
 	if err != nil {
 		r.Log.Error(err, err.Error())
 		return requeueY, readyPod, err
 	}
-	if oemSupport {
-		m.Status.OemExpressUrl = oemExpressUrl
-	} else {
+	r.Log.Info("DB Major Version is " + strconv.Itoa(dbMajorVersion))
+	// Validating that free edition of the database is only supported from database 23c onwards
+	if (m.Spec.Edition == "free" && dbMajorVersion < 23){
+		r.Log.Info("Oracle Database Free is only supported from version 23c onwards")
+		r.Recorder.Eventf(m, corev1.EventTypeWarning, "Spec Error", "Oracle Database Free is only supported from version 23c onwards")
+		m.Status.Status = dbcommons.StatusError
+		return requeueN, readyPod, errors.New("Oracle Database Free is only supported from version 23c onwards")
+	}
+	// Checking if OEM is supported in the provided Database version 
+	if (dbMajorVersion >= 23 ) {
 		m.Status.OemExpressUrl = dbcommons.ValueUnavailable
+	} else {
+		m.Status.OemExpressUrl = oemExpressUrl
 	}
 
+
 	if strings.ToUpper(m.Status.Role) == "PRIMARY" && m.Status.DatafilesPatched != "true" {
 		eventReason := "Datapatch Pending"
 		eventMsg := "datapatch execution pending"
@@ -2623,6 +2633,13 @@ func (r *SingleInstanceDatabaseReconciler) updateORDSStatus(m *dbapi.SingleInsta
 func (r *SingleInstanceDatabaseReconciler) manageSingleInstanceDatabaseDeletion(req ctrl.Request, ctx context.Context,
 	m *dbapi.SingleInstanceDatabase) (ctrl.Result, error) {
 	log := r.Log.WithValues("manageSingleInstanceDatabaseDeletion", req.NamespacedName)
+	
+	log.Info("DG broker is configured with the DB " + m.Status.Sid + " : " + strconv.FormatBool(m.Status.DgBrokerConfigured))
+	if (m.Status.DgBrokerConfigured){
+		log.Info("Database cannot be deleted as it is present in a DataGuard Broker configuration")
+		r.Recorder.Eventf(m, corev1.EventTypeWarning, "Deleting", "Database cannot be deleted as it is present in a DataGuard Broker configuration")
+		return requeueN,nil
+	}
 
 	// Check if the SingleInstanceDatabase instance is marked to be deleted, which is
 	// indicated by the deletion timestamp being set.
@@ -3105,19 +3122,3 @@ func SetupStandbyDatabase(r *SingleInstanceDatabaseReconciler, stdby *dbapi.Sing
 
 	return nil
 }
-
-
-func isOEMSupported (r *SingleInstanceDatabaseReconciler,version string) (bool,error) {
-	majorVersion, err := strconv.Atoi(strings.Split(version,".")[0])
-	r.Log.Info("majorVersion of database is " + strconv.Itoa(majorVersion))
-	if err != nil {
-		return false,err
-	}
-	if majorVersion > 21{
-		r.Log.Info("major Version " + strconv.Itoa(majorVersion) +  " is greater that 21 so OEM Express is not supported")
-		return false,nil
-	} else {
-		r.Log.Info("major Version " + strconv.Itoa(majorVersion) + " is lesser than equal to 21 so OEM Express is supported")
-		return true,nil
-	}
-}

docs/sidb/README.md

@@ -26,6 +26,7 @@ Oracle Database Operator for Kubernetes (`OraOperator`) includes the Single Inst
       * [Creating an Oracle Data Guard Configuration](#creating-an-oracle-data-guard-configuration)
         * [Creating a Standby Database](#creating-a-standby-database)
         * [Setup DataGuardBroker Configuration for a Single Instance Database](#setup-dataguardbroker-configuration-for-a-single-instance-database)
+        * [Delete a standby database with dataguard broker configured](#delete-a-standby-database-with-dataguard-broker-configured)
   * [OracleRestDataService Resource](#oraclerestdataservice-resource)
     * [REST Enable a Database](#rest-enable-a-database)
       * [Provision ORDS](#provision-ords)
@@ -756,6 +757,24 @@ $ kubectl delete dataguardbroker dgbroker-sample
 
 **NOTE :** You can only delete DataGuard broker when role of `.spec.primaryDatabaseRef` is PRIMARY
 
+### Delete a standby database with dataguard broker configured
+
+To delete a standby database in a dataguard configuration, delete the dataguardbroker resource first followed by the standby database
+
+#### Delete DataguardBroker Resource
+```sh
+$ kubectl delete dataguardbroker dgbroker-sample 
+
+  dataguardbroker.database.oracle.com/dgbroker-sample deleted
+```
+
+#### Delete Standby Database
+```sh 
+$ kubectl delete singleinstancedatabase stdby-1
+
+  singleinstancedatabase.database.oracle.com "stdby-1" deleted
+```
+
 ## OracleRestDataService Resource
 
 The Oracle Database Operator creates the `OracleRestDataService` as a custom resource. We will refer `OracleRestDataService` as ORDS from now onwards. Creating ORDS as a custom resource enables the RESTful API access to the Oracle Database in K8s and enables it to be managed as a native Kubernetes object.