Merge branch 'idesai_bug_fixes' into 'master'

DG and SIDB bug fixes

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

Author: yunus-qureshi

apis/database/v1alpha1/dataguardbroker_types.go

@@ -50,15 +50,15 @@ type DataguardBrokerSpec struct {
 	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
 
-	PrimaryDatabaseRef   string   `json:"primaryDatabaseRef"`
-	StandbyDatabaseRefs  []string `json:"standbyDatabaseRefs"`
-	SetAsPrimaryDatabase string   `json:"setAsPrimaryDatabase,omitempty"`
-	LoadBalancer         bool     `json:"loadBalancer,omitempty"`
-
+	PrimaryDatabaseRef   string   					   	  `json:"primaryDatabaseRef"`
+	StandbyDatabaseRefs  []string 					   	  `json:"standbyDatabaseRefs"`
+	SetAsPrimaryDatabase string   					   	  `json:"setAsPrimaryDatabase,omitempty"`
+	LoadBalancer         bool     					   	  `json:"loadBalancer,omitempty"`
+	ServiceAnnotations   map[string]string            	  `json:"serviceAnnotations,omitempty"`
 	// +kubebuilder:validation:Enum=MaxPerformance;MaxAvailability
-	ProtectionMode    string                           `json:"protectionMode"`
-	NodeSelector      map[string]string                `json:"nodeSelector,omitempty"`
-	FastStartFailOver DataguardBrokerFastStartFailOver `json:"fastStartFailOver,omitempty"`
+	ProtectionMode       string                           `json:"protectionMode"`
+	NodeSelector         map[string]string                `json:"nodeSelector,omitempty"`
+	FastStartFailOver    DataguardBrokerFastStartFailOver `json:"fastStartFailOver,omitempty"`
 }
 
 type DataguardBrokerFastStartFailOver struct {

apis/database/v1alpha1/dataguardbroker_webhook.go

@@ -69,6 +69,24 @@ var _ webhook.Defaulter = &DataguardBroker{}
 func (r *DataguardBroker) Default() {
 	dataguardbrokerlog.Info("default", "name", r.Name)
 
+	if (r.Spec.LoadBalancer) {
+		if r.Spec.ServiceAnnotations == nil {
+			r.Spec.ServiceAnnotations= make(map[string]string)
+		}
+		// Annotations required for a flexible load balancer on oci 
+		_, ok := r.Spec.ServiceAnnotations["service.beta.kubernetes.io/oci-load-balancer-shape"]
+		if(!ok) {
+			r.Spec.ServiceAnnotations["service.beta.kubernetes.io/oci-load-balancer-shape"] = "flexible"
+		}
+		_,ok = r.Spec.ServiceAnnotations["service.beta.kubernetes.io/oci-load-balancer-shape-flex-min"]
+		if(!ok) {
+			r.Spec.ServiceAnnotations["service.beta.kubernetes.io/oci-load-balancer-shape-flex-min"] = "10"
+		}
+		_,ok = r.Spec.ServiceAnnotations["service.beta.kubernetes.io/oci-load-balancer-shape-flex-max"]
+		if(!ok) {
+			r.Spec.ServiceAnnotations["service.beta.kubernetes.io/oci-load-balancer-shape-flex-max"] = "100"
+		}
+	}
 }
 
 // TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation.

apis/database/v1alpha1/singleinstancedatabase_webhook.go

@@ -72,6 +72,25 @@ var _ webhook.Defaulter = &SingleInstanceDatabase{}
 func (r *SingleInstanceDatabase) Default() {
 	singleinstancedatabaselog.Info("default", "name", r.Name)
 
+	if r.Spec.LoadBalancer {
+		// Annotations required for a flexible load balancer on oci 
+		if r.Spec.ServiceAnnotations == nil {
+			r.Spec.ServiceAnnotations= make(map[string]string)
+		}
+		_, ok := r.Spec.ServiceAnnotations["service.beta.kubernetes.io/oci-load-balancer-shape"]
+		if(!ok) {
+			r.Spec.ServiceAnnotations["service.beta.kubernetes.io/oci-load-balancer-shape"] = "flexible"
+		}
+		_,ok = r.Spec.ServiceAnnotations["service.beta.kubernetes.io/oci-load-balancer-shape-flex-min"]
+		if(!ok) {
+			r.Spec.ServiceAnnotations["service.beta.kubernetes.io/oci-load-balancer-shape-flex-min"] = "10"
+		}
+		_,ok = r.Spec.ServiceAnnotations["service.beta.kubernetes.io/oci-load-balancer-shape-flex-max"]
+		if(!ok) {
+			r.Spec.ServiceAnnotations["service.beta.kubernetes.io/oci-load-balancer-shape-flex-max"] = "100"
+		}
+	}
+
 	if r.Spec.AdminPassword.KeepSecret == nil {
 		keepSecret := true
 		r.Spec.AdminPassword.KeepSecret = &keepSecret

config/samples/sidb/dataguardbroker.yaml

@@ -15,8 +15,8 @@ spec:
 
   ## Standby DB pod CRD Metadata Name to add this DB to DG config
   standbyDatabaseRefs:
-  #  - standbyDatabase-sample1
-  #  - standbyDatabase-sample2
+  #  - standbydatabase-sample
+  #  - standbydatabase-sample1
 
   ## Type of service . Applicable on cloud enviroments only
   ## if loadBalService : false , service type = "NodePort" . else "LoadBalancer"
@@ -26,4 +26,4 @@ spec:
   protectionMode: MaxAvailability
 
   ## Manual Switchover to this database to make it primary(if not already), requires target Database SID . 
-  setAsPrimaryDatabase: ""
+  setAsPrimaryDatabase: ""

config/samples/sidb/singleinstancedatabase_standby.yaml

@@ -6,18 +6,16 @@
 apiVersion: database.oracle.com/v1alpha1
 kind: SingleInstanceDatabase
 metadata:
-  # Creates base sidb-sample. Use singleinstancedatabase_clone.yaml for cloning
+  # Creates base standbydatabase-sample. Use singleinstancedatabase_clone.yaml for cloning
   #                           and singleinstancedatabase_patch.yaml for patching
-  name: sidb-sample
+  name: standbydatabase-sample
   namespace: default
 spec:
 
   ## Use only alphanumeric characters for sid
-  sid: ORCL1
+  sid: ORCLS
 
-  ## Reference to a source primary database from which
-  ## Format: 1. Intra-cluster: you can give name of the primary database or the database connect string in `<host>:<port>/<service_name>` format
-  ##         2. Inter-cluster: Database connect string in `<host>:<port>/<service_name>` format
+  ## Reference to a source primary database name
   primaryDatabaseRef: "sidb-sample"
 
   ## Enable this flag for creating Physical Standby Database

controllers/database/dataguardbroker_controller.go

@@ -103,10 +103,14 @@ func (r *DataguardBrokerReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 
 	// Manage SingleInstanceDatabase Deletion
 	result, err := r.manageDataguardBrokerDeletion(req, ctx, dataguardBroker)
-	if result.Requeue || err != nil {
+	if result.Requeue {
 		r.Log.Info("Reconcile queued")
 		return result, err
 	}
+	if err != nil {
+		r.Log.Error(err,err.Error())
+		return result,err
+	}
 
 	// Fetch Primary Database Reference
 	singleInstanceDatabase := &dbapi.SingleInstanceDatabase{}
@@ -251,6 +255,15 @@ func (r *DataguardBrokerReconciler) instantiateSVCSpec(m *dbapi.DataguardBroker)
 			Labels: map[string]string{
 				"app": m.Name,
 			},
+			Annotations : func() map[string]string {
+				annotations := make(map[string]string)
+				if len(m.Spec.ServiceAnnotations) != 0 {
+					for key, value := range m.Spec.ServiceAnnotations {
+						annotations[key] = value
+					}
+				}
+				return annotations
+			}(),
 		},
 		Spec: corev1.ServiceSpec{
 			Ports: []corev1.ServicePort{
@@ -1052,33 +1065,6 @@ func (r *DataguardBrokerReconciler) manageDataguardBrokerDeletion(req ctrl.Reque
 	// indicated by the deletion timestamp being set.
 	isDataguardBrokerMarkedToBeDeleted := m.GetDeletionTimestamp() != nil
 	if isDataguardBrokerMarkedToBeDeleted {
-
-		// Make a singleinstancedatabase with empty 
-		singleInstanceDatabase := &dbapi.SingleInstanceDatabase{}
-		err := r.Get(ctx, types.NamespacedName{Namespace: req.Namespace, Name: m.Spec.PrimaryDatabaseRef}, singleInstanceDatabase)
-		if err != nil {
-			log.Error(err,err.Error())
-			return requeueY,err
-		}
-		// Get its POD
-		// Validate if Primary Database Reference is ready
-		result, sidbReadyPod, _ := r.validateSidbReadiness(m, singleInstanceDatabase, ctx, req)
-		if result.Requeue {
-			log.Info("Reconcile queued")
-			return result, nil
-		}
-		// Get its Role 
-		out, err := dbcommons.GetDatabaseRole(sidbReadyPod, r, r.Config, ctx, req, singleInstanceDatabase.Spec.Edition)
-		// check if its PRIMARY
-		if strings.ToUpper(out) != "PRIMARY" {
-			eventReason := "Deletion"
-			eventMsg := "DataGuard Broker cannot be deleted since primaryDatabaseRef is not in PRIMARY role"
-			log.Info("DataGuard Broker cannot be deleted since primaryDatabaseRef is not in PRIMARY role")
-			r.Recorder.Eventf(m, corev1.EventTypeWarning, eventReason, eventMsg)
-			return requeueN, nil
-		}
-		// if not PRIMARY throw error and log it 
-
 		if controllerutil.ContainsFinalizer(m, dataguardBrokerFinalizer) {
 			// Run finalization logic for dataguardBrokerFinalizer. If the
 			// finalization logic fails, don't remove the finalizer so
@@ -1138,8 +1124,22 @@ func (r *DataguardBrokerReconciler) cleanupDataguardBroker(req ctrl.Request, ctx
 		return result, nil
 	}
 
+	// Get its Role 
+	out, err := dbcommons.GetDatabaseRole(sidbReadyPod, r, r.Config, ctx, req, singleInstanceDatabase.Spec.Edition)
+	if err != nil {
+		log.Error(err, err.Error())
+		return requeueY, err
+	}
+	// check if its PRIMARY database
+	if strings.ToUpper(out) != "PRIMARY" {
+		eventReason := "Deletion"
+		eventMsg := "DataGuard Broker cannot be deleted since primaryDatabaseRef is not in PRIMARY role"
+		r.Recorder.Eventf(m, corev1.EventTypeWarning, eventReason, eventMsg)
+		return requeueY, errors.New(eventMsg)
+	}
+
 	// Get Primary database to remove dataguard configuration
-	_, out, err := dbcommons.GetDatabasesInDgConfig(sidbReadyPod, r, r.Config, ctx, req)
+	_, out, err = dbcommons.GetDatabasesInDgConfig(sidbReadyPod, r, r.Config, ctx, req)
 	if err != nil {
 		log.Error(err, err.Error())
 		return requeueY, err

controllers/database/singleinstancedatabase_controller.go

@@ -149,6 +149,10 @@ func (r *SingleInstanceDatabaseReconciler) Reconcile(ctx context.Context, req ct
 		r.Log.Info("Reconcile queued")
 		return result, nil
 	}
+	if err != nil {
+		r.Log.Error(err,err.Error())
+		return result, err
+	}
 
 	// First validate
 	result, err = r.validate(singleInstanceDatabase, cloneFromDatabase, referredPrimaryDatabase, ctx, req)
@@ -2633,13 +2637,7 @@ 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.
@@ -2697,6 +2695,13 @@ func (r *SingleInstanceDatabaseReconciler) cleanupSingleInstanceDatabase(req ctr
 		return requeueY, nil
 	}
 
+	if (m.Status.DgBrokerConfigured){
+		eventReason := "Cannot Delete"
+		eventMsg := "Database cannot be deleted as it is present in a DataGuard Broker configuration"
+		r.Recorder.Eventf(m, corev1.EventTypeWarning, eventReason, eventReason)
+		return requeueY,errors.New(eventMsg)
+	}
+
 	// call deletePods() with zero pods in avaiable and nil readyPod to delete all pods
 	result, err := r.deletePods(ctx, req, m, []corev1.Pod{}, corev1.Pod{}, 0, 0)
 	if result.Requeue {