Added env vars for tcps support

Signed-off-by: abhisbyk <[email protected]>

Author: abhisbyk

apis/database/v1alpha1/singleinstancedatabase_types.go

@@ -65,6 +65,8 @@ type SingleInstanceDatabaseSpec struct {
 	FlashBack          bool              `json:"flashBack,omitempty"`
 	ArchiveLog         bool              `json:"archiveLog,omitempty"`
 	ForceLogging       bool              `json:"forceLog,omitempty"`
+	EnableTCPS         bool              `json:"enableTCPS,omitempty"`
+	TcpsPort           int               `json:"tcpsPort,omitempty"`
 
 	CloneFrom            string `json:"cloneFrom,omitempty"`
 	ReadinessCheckPeriod int    `json:"readinessCheckPeriod,omitempty"`

config/crd/bases/database.oracle.com_singleinstancedatabases.yaml

@@ -87,6 +87,8 @@ spec:
                 - enterprise
                 - express
                 type: string
+              enableTCPS:
+                type: boolean
               flashBack:
                 type: boolean
               forceLog:
@@ -160,6 +162,8 @@ spec:
                 maxLength: 12
                 pattern: ^[a-zA-Z0-9]+$
                 type: string
+              tcpsPort:
+                type: integer
             required:
             - image
             type: object

config/samples/sidb/singleinstancedatabase.yaml

@@ -44,6 +44,12 @@ spec:
   ## Enable/Disable ForceLogging
   forceLog: false
 
+  ## Enable TCPS
+  enableTCPS: false
+
+  ## TCPS custom port
+  tcpsPort: 1522
+
   ## NA if cloning from a SourceDB (cloneFrom is set)
   ## Specify both sgaSize and pgaSize (in MB) or dont specify both
   ## Specify Non-Zero value to use

controllers/database/singleinstancedatabase_controller.go

@@ -78,6 +78,9 @@ type SingleInstanceDatabaseReconciler struct {
 var requeueY ctrl.Result = ctrl.Result{Requeue: true, RequeueAfter: 15 * time.Second}
 var requeueN ctrl.Result = ctrl.Result{}
 
+// Service Port Declaration
+var svc_port string
+
 const singleInstanceDatabaseFinalizer = "database.oracle.com/singleinstancedatabasefinalizer"
 
 //+kubebuilder:rbac:groups=database.oracle.com,resources=singleinstancedatabases,verbs=get;list;watch;create;update;patch;delete
@@ -134,6 +137,14 @@ func (r *SingleInstanceDatabaseReconciler) Reconcile(ctx context.Context, req ct
 		r.Status().Update(ctx, singleInstanceDatabase)
 	}
 
+	// Service Port Initialization
+	svc_port = func() string {
+		if singleInstanceDatabase.Spec.EnableTCPS {
+			return strconv.Itoa(singleInstanceDatabase.Spec.TcpsPort)
+		}
+		return "1521"
+	}()
+
 	// Manage SingleInstanceDatabase Deletion
 	result, err = r.manageSingleInstanceDatabaseDeletion(req, ctx, singleInstanceDatabase)
 	if result.Requeue {
@@ -639,7 +650,16 @@ func (r *SingleInstanceDatabaseReconciler) instantiatePodSpec(m *dbapi.SingleIns
 						},
 					},
 				},
-				Ports: []corev1.ContainerPort{{ContainerPort: 1521}, {ContainerPort: 5500}},
+				Ports: []corev1.ContainerPort{
+					{ContainerPort: func() int32 {
+						if m.Spec.EnableTCPS {
+							return int32(m.Spec.TcpsPort)
+						}
+						return int32(1521)
+					}(),
+					},
+					{ContainerPort: 5500},
+				},
 
 				ReadinessProbe: &corev1.Probe{
 					ProbeHandler: corev1.ProbeHandler{
@@ -687,7 +707,7 @@ func (r *SingleInstanceDatabaseReconciler) instantiatePodSpec(m *dbapi.SingleIns
 							},
 							{
 								Name:  "SVC_PORT",
-								Value: "1521",
+								Value: svc_port,
 							},
 							{
 								Name:  "ORACLE_CHARACTERSET",
@@ -697,6 +717,14 @@ func (r *SingleInstanceDatabaseReconciler) instantiatePodSpec(m *dbapi.SingleIns
 								Name:  "ORACLE_EDITION",
 								Value: m.Spec.Edition,
 							},
+							{
+								Name:  "ENABLE_TCPS",
+								Value: strconv.FormatBool(m.Spec.EnableTCPS),
+							},
+							{
+								Name:  "TCPS_PORT",
+								Value: strconv.Itoa(m.Spec.TcpsPort),
+							},
 						}
 					}
 					if m.Spec.CloneFrom == "" {
@@ -708,7 +736,7 @@ func (r *SingleInstanceDatabaseReconciler) instantiatePodSpec(m *dbapi.SingleIns
 							},
 							{
 								Name:  "SVC_PORT",
-								Value: "1521",
+								Value: svc_port,
 							},
 							{
 								Name: "CREATE_PDB",
@@ -766,6 +794,14 @@ func (r *SingleInstanceDatabaseReconciler) instantiatePodSpec(m *dbapi.SingleIns
 								Name:  "SKIP_DATAPATCH",
 								Value: "true",
 							},
+							{
+								Name:  "ENABLE_TCPS",
+								Value: strconv.FormatBool(m.Spec.EnableTCPS),
+							},
+							{
+								Name:  "TCPS_PORT",
+								Value: strconv.Itoa(m.Spec.TcpsPort),
+							},
 						}
 					}
 					// For clone DB use case
@@ -776,7 +812,7 @@ func (r *SingleInstanceDatabaseReconciler) instantiatePodSpec(m *dbapi.SingleIns
 						},
 						{
 							Name:  "SVC_PORT",
-							Value: "1521",
+							Value: svc_port,
 						},
 						{
 							Name:  "ORACLE_SID",
@@ -790,7 +826,7 @@ func (r *SingleInstanceDatabaseReconciler) instantiatePodSpec(m *dbapi.SingleIns
 							Name: "PRIMARY_DB_CONN_STR",
 							Value: func() string {
 								if dbcommons.IsSourceDatabaseOnCluster(m.Spec.CloneFrom) {
-									return n.Name + ":1521/" + n.Spec.Sid
+									return n.Name + ":" + svc_port + "/" + n.Spec.Sid
 								}
 								return m.Spec.CloneFrom
 							}(),