Merge branch 'mmalvezz' into 'master'

ords 22.2 https implementation

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

Author: rcitton-oracle

README.md

@@ -10,7 +10,7 @@ In this v0.2.0 release, `OraOperator` supports the following database configurat
 * Oracle Autonomous Database on dedicated Cloud infrastructure (ADB-D)
 * Containerized Single Instance databases (SIDB) deployed in the Oracle Kubernetes Engine (OKE) and any k8s where OraOperator is deployed
 * Containerized Sharded databases (SHARDED) deployed in OKE and any k8s where OraOperator is deployed
-* Oracle On-Premises Databases (CDB/PDBs, Exadata)
+* Oracle Multitenant Databases (CDB/PDBs)
 * Oracle Database Cloud Service (DBCS) (VMDB)
 * Oracle Autonomous Container Database (ACD) (infrastructure) the infrastructure for provisionning Autonomous Databases.
 
@@ -25,7 +25,7 @@ This release of Oracle Database Operator for Kubernetes (the operator) supports
 * ACD: provision, bind, restart, terminate (soft/hard)
 * SIDB: Provision, clone, patch (in-place/out-of-place), update database initialization parameters, update database configuration (Flashback, archiving), Oracle Enterprise Manager (EM) Express (a basic observability console), Oracle REST Data Service (ORDS) to support REST based SQL, PDB management, SQL Developer Web, and Application Express (Apex)
 * SHARDED: Provision/deploy sharded databases and the shard topology, Add a new shard, Delete an existing shard
-* On-Premises Database: Bind to a CDB, Create a  PDB, Plug a  PDB, Unplug a PDB, Delete a PDB, Clone a PDB, Open/Close a PDB
+* Oracle Multitenant Database: Bind to a CDB, Create a  PDB, Plug a  PDB, Unplug a PDB, Delete a PDB, Clone a PDB, Open/Close a PDB
 * Database Cloud Service: Provision, Bind, Scale Up/Down, Liveness Probe, Manual Backup
 
 The upcoming releases will support new configurations, operations and capabilities.
@@ -99,7 +99,7 @@ The quickstarts are designed for specific database configurations:
 * [Oracle Autonomous Container Database](./docs/acd/README.md)
 * [Containerized Oracle Single Instance Database](./docs/sidb/README.md)
 * [Containerized Oracle Sharded Database](./docs/sharding/README.md)
-* [Oracle On-Premises Database](./docs/onpremdb/README.md)
+* [Oracle Multitenant Database](./docs/multitenant/README.md)
 * [Oracle Database Cloud Service](./docs/dbcs/README.md)
 
 YAML file templates are available under [`/config/samples`](./config/samples/). You can copy and edit these template files to configure them for your use cases. 

apis/database/v1alpha1/cdb_types.go

@@ -51,12 +51,19 @@ type CDBSpec struct {
 	CDBName string `json:"cdbName,omitempty"`
 	// Name of the CDB Service
 	ServiceName string `json:"serviceName,omitempty"`
+
+	TestVariable string `json:"TestVariable,omitempty"`
+
 	// Password for the CDB System Administrator
 	SysAdminPwd CDBSysAdminPassword `json:"sysAdminPwd,omitempty"`
 	// User in the root container with sysdba priviledges to manage PDB lifecycle
 	CDBAdminUser CDBAdminUser `json:"cdbAdminUser,omitempty"`
 	// Password for the CDB Administrator to manage PDB lifecycle
 	CDBAdminPwd CDBAdminPassword `json:"cdbAdminPwd,omitempty"`
+
+	CDBTlsKey CDBTLSKEY `json:"cdbTlsKey,omitempty"`
+	CDBTlsCrt CDBTLSCRT `json:"cdbTlsCrt,omitempty"`
+
 	// Password for user ORDS_PUBLIC_USER
 	ORDSPwd ORDSPassword `json:"ordsPwd,omitempty"`
 	// ORDS server port. For now, keep it as 8888. TO BE USED IN FUTURE RELEASE.
@@ -120,6 +127,14 @@ type WebServerPassword struct {
 	Secret CDBSecret `json:"secret"`
 }
 
+type CDBTLSKEY struct {
+	Secret CDBSecret `json:"secret"`
+}
+
+type CDBTLSCRT struct {
+	Secret CDBSecret `json:"secret"`
+}
+
 // CDBStatus defines the observed state of CDB
 type CDBStatus struct {
 	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster

apis/database/v1alpha1/cdb_webhook.go

@@ -92,6 +92,12 @@ func (r *CDB) ValidateCreate() error {
 		allErrs = append(allErrs,
 			field.Required(field.NewPath("spec").Child("serviceName"), "Please specify CDB Service name"))
 	}
+
+	if r.Spec.TestVariable == "" {
+		allErrs = append(allErrs,
+			field.Required(field.NewPath("spec").Child("TestVariable"), "Please specify CDB testvarable"))
+	}
+
 	if r.Spec.SCANName == "" {
 		allErrs = append(allErrs,
 			field.Required(field.NewPath("spec").Child("scanName"), "Please specify SCAN Name for CDB"))

apis/database/v1alpha1/pdb_types.go

@@ -47,6 +47,10 @@ type PDBSpec struct {
 	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
 
+	PDBTlsKey PDBTLSKEY `json:"pdbTlsKey,omitempty"`
+	PDBTlsCrt PDBTLSCRT `json:"pdbTlsCrt,omitempty"`
+	PDBTlsCat PDBTLSCAT `json:"pdbTlsCat,omitempty"`
+
 	// Name of the CDB Custom Resource that runs the ORDS container
 	CDBResName string `json:"cdbResName,omitempty"`
 	// Name of the CDB
@@ -132,6 +136,18 @@ type PDBSecret struct {
 	Key        string `json:"key"`
 }
 
+type PDBTLSKEY struct {
+	Secret PDBSecret `json:"secret"`
+}
+
+type PDBTLSCRT struct {
+	Secret PDBSecret `json:"secret"`
+}
+
+type PDBTLSCAT struct {
+	Secret PDBSecret `json:"secret"`
+}
+
 // PDBStatus defines the observed state of PDB
 type PDBStatus struct {
 	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
@@ -157,7 +173,7 @@ type PDBStatus struct {
 
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
-// +kubebuilder:printcolumn:JSONPath=".status.connString",name="Connect String",type="string",description="The connect string to be used"
+// +kubebuilder:printcolumn:JSONPath=".status.connString",name="Connect_String",type="string",description="The connect string to be used"
 // +kubebuilder:printcolumn:JSONPath=".spec.cdbName",name="CDB Name",type="string",description="Name of the CDB"
 // +kubebuilder:printcolumn:JSONPath=".spec.pdbName",name="PDB Name",type="string",description="Name of the PDB"
 // +kubebuilder:printcolumn:JSONPath=".status.openMode",name="PDB State",type="string",description="PDB Open Mode"

apis/database/v1alpha1/zz_generated.deepcopy.go

@@ -702,6 +702,8 @@ func (in *CDBSpec) DeepCopyInto(out *CDBSpec) {
 	out.SysAdminPwd = in.SysAdminPwd
 	out.CDBAdminUser = in.CDBAdminUser
 	out.CDBAdminPwd = in.CDBAdminPwd
+	out.CDBTlsKey = in.CDBTlsKey
+	out.CDBTlsCrt = in.CDBTlsCrt
 	out.ORDSPwd = in.ORDSPwd
 	out.WebServerUser = in.WebServerUser
 	out.WebServerPwd = in.WebServerPwd
@@ -755,6 +757,38 @@ func (in *CDBSysAdminPassword) DeepCopy() *CDBSysAdminPassword {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *CDBTLSCRT) DeepCopyInto(out *CDBTLSCRT) {
+	*out = *in
+	out.Secret = in.Secret
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CDBTLSCRT.
+func (in *CDBTLSCRT) DeepCopy() *CDBTLSCRT {
+	if in == nil {
+		return nil
+	}
+	out := new(CDBTLSCRT)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *CDBTLSKEY) DeepCopyInto(out *CDBTLSKEY) {
+	*out = *in
+	out.Secret = in.Secret
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CDBTLSKEY.
+func (in *CDBTLSKEY) DeepCopy() *CDBTLSKEY {
+	if in == nil {
+		return nil
+	}
+	out := new(CDBTLSKEY)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *CatalogSpec) DeepCopyInto(out *CatalogSpec) {
 	*out = *in
@@ -1662,6 +1696,9 @@ func (in *PDBSecret) DeepCopy() *PDBSecret {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *PDBSpec) DeepCopyInto(out *PDBSpec) {
 	*out = *in
+	out.PDBTlsKey = in.PDBTlsKey
+	out.PDBTlsCrt = in.PDBTlsCrt
+	out.PDBTlsCat = in.PDBTlsCat
 	out.AdminName = in.AdminName
 	out.AdminPwd = in.AdminPwd
 	if in.ReuseTempFile != nil {
@@ -1723,6 +1760,54 @@ func (in *PDBStatus) DeepCopy() *PDBStatus {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *PDBTLSCAT) DeepCopyInto(out *PDBTLSCAT) {
+	*out = *in
+	out.Secret = in.Secret
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PDBTLSCAT.
+func (in *PDBTLSCAT) DeepCopy() *PDBTLSCAT {
+	if in == nil {
+		return nil
+	}
+	out := new(PDBTLSCAT)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *PDBTLSCRT) DeepCopyInto(out *PDBTLSCRT) {
+	*out = *in
+	out.Secret = in.Secret
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PDBTLSCRT.
+func (in *PDBTLSCRT) DeepCopy() *PDBTLSCRT {
+	if in == nil {
+		return nil
+	}
+	out := new(PDBTLSCRT)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *PDBTLSKEY) DeepCopyInto(out *PDBTLSKEY) {
+	*out = *in
+	out.Secret = in.Secret
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PDBTLSKEY.
+func (in *PDBTLSKEY) DeepCopy() *PDBTLSKEY {
+	if in == nil {
+		return nil
+	}
+	out := new(PDBTLSKEY)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *PITSpec) DeepCopyInto(out *PITSpec) {
 	*out = *in