Merge branch 'ords_bugs' into 'master'

Ords Github bugs

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

Author: yunus-qureshi

apis/database/v1alpha1/oraclerestdataservice_webhook.go

@@ -112,6 +112,14 @@ func (r *OracleRestDataService) ValidateCreate() error {
 		}
 	}
 
+	// Validating databaseRef and ORDS kind name not to be same
+	if r.Spec.DatabaseRef == r.Name {
+		allErrs = append(allErrs,
+			field.Forbidden(field.NewPath("Name"),
+					 "cannot be same as DatabaseRef: " + r.Spec.DatabaseRef))
+
+	}
+
 	if len(allErrs) == 0 {
 		return nil
 	}

commons/database/constants.go

@@ -364,7 +364,7 @@ const UninstallORDSCMD string = "\numask 177" +
 
 const GetORDSStatus string = "curl -sSkv -k -X GET https://localhost:8443/ords/_/db-api/stable/metadata-catalog/"
 
-const ValidateAdminPassword string = "conn sys/%s@${ORACLE_SID} as sysdba\nshow user"
+const ValidateAdminPassword string = "conn sys/\\\"%s\\\"@${ORACLE_SID} as sysdba\nshow user"
 
 const ReconcileError string = "ReconcileError"
 

controllers/database/oraclerestdataservice_controller.go

@@ -370,6 +370,8 @@ func (r *OracleRestDataServiceReconciler) validateSIDBReadiness(m *dbapi.OracleR
 		log.Info(eventMsg)
 		return requeueY, sidbReadyPod
 	} else {
+		eventMsg := "login attempt failed for database admin password in secret " + m.Spec.AdminPassword.SecretName
+		log.Info(eventMsg)
 		return requeueY, sidbReadyPod
 	}