Merge branch 'mmalvezz' into 'master'

bug 35357707

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

Author: mmalvezz

config/samples/multitenant/cdb_secret.yaml

@@ -9,9 +9,9 @@ metadata:
   namespace: oracle-database-operator-system
 type: Opaque 
 data: 
-  ords_pwd: "d2VsY29tZTE=" 
-  sysadmin_pwd: "V0VsY29tZV8xMiMj"
-  cdbadmin_user: "QyMjREJBUElfQ0RCX0FETUlO"
-  cdbadmin_pwd: "V0VsY29tZV8xMiMj"
-  webserver_user: "c3FsX2FkbWlu"
-  webserver_pwd: "d2VsY29tZTE="
+  ords_pwd: "[base64 encode value]"
+  sysadmin_pwd: "[base64 encode value]"
+  cdbadmin_user: "[base64 encode value]"
+  cdbadmin_pwd: "[base64 encode value]"
+  webserver_user: "[base64 encode values]"
+  webserver_pwd: "[base64 encode values]"

config/samples/multitenant/pdb_secret.yaml

@@ -9,5 +9,5 @@ metadata:
   namespace: oracle-database-operator-system
 type: Opaque 
 data: 
-  sysadmin_user: "cGRiYWRtaW4="
-  sysadmin_pwd: "V0VsY29tZV8xMiMj"
+  sysadmin_user: "[ base64 encode value]"
+  sysadmin_pwd: "[ base64 encode value]"

controllers/database/pdb_controller.go

@@ -49,6 +49,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"net/http"
+	"regexp"
 	"strconv"
 	"strings"
 	"time"
@@ -490,7 +491,7 @@ func (r *PDBReconciler) callAPI(ctx context.Context, req ctrl.Request, pdb *dbap
 		return "", err
 	}
 	webUser := string(secret.Data[cdb.Spec.WebServerUser.Secret.Key])
-        webUser = strings.TrimSpace(webUser)
+	webUser = strings.TrimSpace(webUser)
 
 	// Get Web Server User Password
 	secret = &corev1.Secret{}
@@ -504,8 +505,7 @@ func (r *PDBReconciler) callAPI(ctx context.Context, req ctrl.Request, pdb *dbap
 		return "", err
 	}
 	webUserPwd := string(secret.Data[cdb.Spec.WebServerPwd.Secret.Key])
-        webUserPwd = strings.TrimSpace(webUserPwd)
-
+	webUserPwd = strings.TrimSpace(webUserPwd)
 
 	var httpreq *http.Request
 	if action == "GET" {
@@ -681,9 +681,11 @@ func (r *PDBReconciler) createPDB(ctx context.Context, req ctrl.Request, pdb *db
 	if cdb.Spec.DBServer != "" {
 		pdb.Status.ConnString = cdb.Spec.DBServer + ":" + strconv.Itoa(cdb.Spec.DBPort) + "/" + pdb.Spec.PDBName
 	} else {
+		ParseTnsAlias(&(cdb.Spec.DBTnsurl), &(pdb.Spec.PDBName))
 		pdb.Status.ConnString = cdb.Spec.DBTnsurl
 	}
 
+	log.Info("New connect strinng", "tnsurl", cdb.Spec.DBTnsurl)
 	log.Info("Created PDB Resource", "PDB Name", pdb.Spec.PDBName)
 	r.getPDBState(ctx, req, pdb)
 	return nil
@@ -756,6 +758,7 @@ func (r *PDBReconciler) clonePDB(ctx context.Context, req ctrl.Request, pdb *dba
 	if cdb.Spec.DBServer != "" {
 		pdb.Status.ConnString = cdb.Spec.DBServer + ":" + strconv.Itoa(cdb.Spec.DBPort) + "/" + pdb.Spec.PDBName
 	} else {
+		ParseTnsAlias(&(cdb.Spec.DBTnsurl), &(pdb.Spec.PDBName))
 		pdb.Status.ConnString = cdb.Spec.DBTnsurl
 	}
 
@@ -887,6 +890,14 @@ func (r *PDBReconciler) unplugPDB(ctx context.Context, req ctrl.Request, pdb *db
 
 	pdb.Status.Phase = pdbPhaseUnplug
 	pdb.Status.Msg = "Waiting for PDB to be unplugged"
+
+	if cdb.Spec.DBServer != "" {
+		pdb.Status.ConnString = cdb.Spec.DBServer + ":" + strconv.Itoa(cdb.Spec.DBPort) + "/" + pdb.Spec.PDBName
+	} else {
+		ParseTnsAlias(&(cdb.Spec.DBTnsurl), &(pdb.Spec.PDBName))
+		pdb.Status.ConnString = cdb.Spec.DBTnsurl
+	}
+
 	if err := r.Status().Update(ctx, pdb); err != nil {
 		log.Error(err, "Failed to update status for :"+pdb.Name, "err", err.Error())
 	}
@@ -1085,6 +1096,7 @@ func (r *PDBReconciler) mapPDB(ctx context.Context, req ctrl.Request, pdb *dbapi
 	if cdb.Spec.DBServer != "" {
 		pdb.Status.ConnString = cdb.Spec.DBServer + ":" + strconv.Itoa(cdb.Spec.DBPort) + "/" + pdb.Spec.PDBName
 	} else {
+		ParseTnsAlias(&(cdb.Spec.DBTnsurl), &(pdb.Spec.PDBName))
 		pdb.Status.ConnString = cdb.Spec.DBTnsurl
 	}
 
@@ -1235,3 +1247,29 @@ func (r *PDBReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		WithOptions(controller.Options{MaxConcurrentReconciles: 100}).
 		Complete(r)
 }
+
+/*************************************************************
+Enh 35357707 - PROVIDE THE PDB TNSALIAS INFORMATION
+**************************************************************/
+
+func ParseTnsAlias(tns *string, pdbsrv *string) {
+	fmt.Printf("Analyzing string [%s]\n", *tns)
+	fmt.Printf("Relacing  srv [%s]\n", *pdbsrv)
+
+	if strings.Contains(strings.ToUpper(*tns), "SERVICE_NAME") == false {
+		fmt.Print("Cannot generate tns alias for pdb")
+		return
+	}
+
+	if strings.Contains(strings.ToUpper(*tns), "ORACLE_SID") == true {
+		fmt.Print("Cannot generate tns alias for pdb")
+		return
+	}
+
+	*pdbsrv = fmt.Sprintf("SERVICE_NAME=%s", *pdbsrv)
+	tnsreg := regexp.MustCompile(`SERVICE_NAME=\w+`)
+	*tns = tnsreg.ReplaceAllString(*tns, *pdbsrv)
+
+	fmt.Printf("Newstring [%s]\n", *tns)
+
+}

docs/multitenant/README.md

@@ -122,9 +122,8 @@ Please refer [here](./provisioning/example_setup_using_oci_oke_cluster.md) for s
 
   You can build this image by using the ORDS [Dockerfile](../../../ords/Dockerfile)
 
-  > **_NOTE:_** The current version of Oracle DB Operator Multitenant Controller has been tested with **ords 22.2.1.202.1302** version.
 
-Please refer [here](./provisioning/ords_image.md) for the steps to build ORDS Docker Image with  **ords 22.2.1.202.1302** version.
+Please refer [here](./provisioning/ords_image.md) for the steps to build ORDS Docker Image 
 
 
 + ## Kubernetes Secrets

docs/multitenant/provisioning/cdb_secret.log

@@ -9,9 +9,9 @@ metadata:
   namespace: oracle-database-operator-system
 type: Opaque
 data:
-  ords_pwd: "V0VsY29tZV8yMSMj"
-  sysadmin_pwd: "V0VsY29tZV8yMSMj"
-  cdbadmin_user: "QyMjREJBUElfQ0RCX0FETUlO"
-  cdbadmin_pwd: "V0VsY29tZV8yMSMj"
-  webserver_user: "c3FsX2FkbWlu"
-  webserver_pwd: "d2VsY29tZTE="
+  ords_pwd: "[ base64 encode values ]"
+  sysadmin_pwd: "[ base64 encode values ]"
+  cdbadmin_user: "[ base64 encode values ]"
+  cdbadmin_pwd: "[ base64 encode values ]"
+  webserver_user: "[ base64 encode values ]"
+  webserver_pwd: "[base64 encode values ]"

docs/multitenant/provisioning/cdb_secret.yaml

@@ -9,5 +9,5 @@ metadata:
   namespace: oracle-database-operator-system
 type: Opaque
 data:
-  sysadmin_user: "cGRiYWRtaW4="
-  sysadmin_pwd: "V0VsY29tZV8yMSMj"
+  sysadmin_user: "[ base64 encode values ]"
+  sysadmin_pwd: "[base64 encode values ]"

docs/multitenant/provisioning/pdb.log

@@ -5,7 +5,7 @@
 
 - [INTRODUCTION](#introduction)
 - [OPERATION STEPS ](#operation-steps)
-- [Download latest version from orahub ](#download-latest-version-from-orahub-a-namedownloada)
+- [Download latest version from github ](#download-latest-version-from-orahub-a-namedownloada)
 - [Upload webhook certificates](#upload-webhook-certificates-a-namewebhooka)
 - [Create the dboperator](#create-the-dboperator-a-namedboperatora)
 - [Create Secret for container registry](#create-secret-for-container-registry)
@@ -20,7 +20,7 @@
 
 
 
-###### INTRODUCTION
+##### INTRODUCTION
 
 This readme is a step by step guide used to implement database multi tenant operator. It assumes that a kubernets cluster and a database server are already available (no matter if single instance or RAC). kubectl must be configured in order to reach k8s cluster.
 
@@ -48,12 +48,13 @@ The following table reports the parameters required to configure and use oracle
 | pdbTlsCrt     | <certfile\>                 | [standalone.https.cert][cr]                     |
 | pdbTlsCat     | <certauth\>                 | certificate authority                           |
 
-
+> A [makfile](./makefile) is available to sped up the command execution for the multitenant setup and test. See the comments in the header of file  
 
 ### OPERATIONAL STEPS 
 ----
 
-##### Download latest version from github <a name="Download"></a>
+
+#### Download latest version from github <a name="Download"></a>
 
 
 ```bash
@@ -77,13 +78,13 @@ make operator-yaml IMG=<public_container_registry>operator:latest
 
 > <span style="color:red"> **NOTE:** If you are using oracle-container-registry make sure to accept the license agreement otherwise the operator image pull fails. </span>
 ----
-##### Upload webhook certificates <a name="webhook"></a>
+#### Upload webhook certificates <a name="webhook"></a>
 
 ```bash
 kubectl apply -f https://github.com/jetstack/cert-manager/releases/latest/download/cert-manager.yaml
 ```
 
-##### Create the dboperator <a name="dboperator"></a>
+#### Create the dboperator <a name="dboperator"></a>
 
 ```bash
 cd oracle-database-operator
@@ -100,7 +101,7 @@ oracle-database-operator-controller-manager-557ff6c659-xpswv   1/1     Running
 
 ```
 ----
-##### Create secret for container registry
+#### Create secret for container registry
 
 + Make sure to login to your container registry and then create the secret for you container registry.  
 
@@ -118,7 +119,7 @@ container-registry-secret   kubernetes.io/dockerconfigjson   1      19s
 webhook-server-cert         kubernetes.io/tls 
 ```
 ----
-##### Build ords immage <a name="ordsimage"></a>
+#### Build ords immage <a name="ordsimage"></a>
 
 + Build the ords image, downloading ords software is no longer needed; just build the image and push it to your repository
 
@@ -137,7 +138,7 @@ docker push <public-container-registry>/ords-dboper:latest
 [example of execution](./ImagePush.log)
 
 ----
-##### Database Configuration
+#### Database Configuration
 
 + Configure Database
 
@@ -152,7 +153,7 @@ GRANT SYSDBA TO <CDB_ADMIN_USER> CONTAINER = ALL;
 GRANT CREATE SESSION TO <CDB_ADMIN_USER> CONTAINER = ALL;
 ```
 ----
-##### Create CDB secret 
+#### Create CDB secret 
 
 + Create secret for CDB connection 
 
@@ -207,7 +208,7 @@ webhook-server-cert         kubernetes.io/tls                3      4m55s
 
 >**TIPS:** Use the following commands to analyze contents of an existing secret  ```bash kubectl   get secret <secret name> -o yaml -n <namespace_name>```
 ----
-##### Create Certificates
+#### Create Certificates
 
 + Create certificates: At this stage we need to create certificates on our local machine and upload into kubernetes cluster by creating new secrets.
 
@@ -261,7 +262,7 @@ kubectl create secret generic db-ca --from-file=<certfile> -n oracle-database-op
 
 
 ----
-###### Apply cdb.yaml
+#### Apply cdb.yaml
 
 + Create ords container 
 
@@ -339,7 +340,7 @@ spec:
 [example of cdb.yaml](./cdb.yaml)
 
 ----
-###### CDB - Logs and throuble shutting 
+#### CDB - Logs and throuble shutting 
 
 + Check the status of ords container 
 
@@ -400,7 +401,7 @@ NAME      CDB NAME   DB SERVER              DB PORT   REPLICAS   STATUS   MESSAG
 [Example of executions](./ordsconfig.log)
 
 -----
-###### Create PDB secret
+#### Create PDB secret
 
 
 ```bash
@@ -433,7 +434,7 @@ pdb1-secret                 Opaque                           2      79m <---
 webhook-server-cert         kubernetes.io/tls                3      79m
 ```
 ---
-###### Apply pdb yaml file to create pdb 
+#### Apply pdb yaml file to create pdb 
 
 ```bash
 /usr/bin/kubectl apply -f pdb.yaml  -n oracle-database-operator-system
@@ -523,7 +524,7 @@ kubectl logs -f $(kubectl get pods -n oracle-database-operator-system|grep oracl
 ```
 
 ---
-###### Other actions
+#### Other actions
 
 Configure and use other yaml files to perform pluggable database life cycle managment action **modify_pdb_open.yaml**  **modify_pdb_close.yaml**