Merge branch 'mmalvezz' into 'master'

fix 34510825 + check of cert/key/ca input param

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

Author: mmalvezz

apis/database/v1alpha1/cdb_types.go

@@ -52,7 +52,6 @@ type CDBSpec struct {
 	// 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"`

apis/database/v1alpha1/cdb_webhook.go

@@ -92,11 +92,16 @@ 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 reflect.ValueOf(r.Spec.CDBTlsKey).IsZero()  {
+                allErrs = append(allErrs,
+                        field.Required(field.NewPath("spec").Child("cdbTlsKey"), "Please specify CDB Tls key(secret)"))
+        }
+
+        if reflect.ValueOf(r.Spec.CDBTlsCrt).IsZero()  {
+                allErrs = append(allErrs,
+                        field.Required(field.NewPath("spec").Child("cdbTlsCrt"), "Please specify CDB Tls Certificate(secret)"))
+        }
 
 	if r.Spec.SCANName == "" {
 		allErrs = append(allErrs,

apis/database/v1alpha1/pdb_webhook.go

@@ -147,6 +147,21 @@ func (r *PDB) validateAction(allErrs *field.ErrorList) {
 
 	pdblog.Info("Valdiating PDB Resource Action : " + action)
 
+        if reflect.ValueOf(r.Spec.PDBTlsKey).IsZero() {
+                        *allErrs = append(*allErrs,
+                        field.Required(field.NewPath("spec").Child("pdbTlsKey"), "Please specify PDB Tls Key(secret)"))
+                }
+
+        if reflect.ValueOf(r.Spec.PDBTlsCrt).IsZero() {
+                        *allErrs = append(*allErrs,
+                        field.Required(field.NewPath("spec").Child("pdbTlsCrt"), "Please specify PDB Tls Certificate(secret)"))
+                }
+
+        if reflect.ValueOf(r.Spec.PDBTlsCat).IsZero() {
+                        *allErrs = append(*allErrs,
+                        field.Required(field.NewPath("spec").Child("pdbTlsCat"), "Please specify PDB Tls Certificate Authority(secret)"))
+                }
+     
 	switch action {
 	case "CREATE":
 		if reflect.ValueOf(r.Spec.AdminName).IsZero() {

controllers/database/cdb_controller.go

@@ -286,7 +286,7 @@ func (r *CDBReconciler) validateORDSPods(ctx context.Context, req ctrl.Request,
 			if strings.Contains(out, "HTTP/1.1 200 OK") || strings.Contains(strings.ToUpper(err.Error()), "HTTP/1.1 200 OK") ||
 				strings.Contains(out, "HTTP/2") || strings.Contains(strings.ToUpper(err.Error()), " HTTP/2") {
 				readyPods++
-			} else if strings.Contains(out, "HTTP/1.1 404 Not Found") || strings.Contains(strings.ToUpper(err.Error()), "HTTP/1.1 404 NOT FOUND") {
+			} else if strings.Contains(out, "HTTP/1.1 404 Not Found") || strings.Contains(strings.ToUpper(err.Error()), "HTTP/1.1 404 NOT FOUND") || strings.Contains(strings.ToUpper(err.Error()), "HTTP/2 404") || strings.Contains(strings.ToUpper(err.Error()), "Failed to connect to localhost") {
 				// Check if DB connection parameters are correct
 				getORDSInstallStatus := " grep -q 'Failed to' /tmp/ords_install.log; echo $?;"
 				out, _ := dbcommons.ExecCommand(r, r.Config, pod.Name, pod.Namespace, "", ctx, req, false, "bash", "-c", getORDSInstallStatus)
@@ -449,10 +449,6 @@ func (r *CDBReconciler) createPodSpec(cdb *dbapi.CDB) corev1.PodSpec {
 						Name:  "ORACLE_HOST",
 						Value: cdb.Spec.DBServer,
 					},
-					{
-						Name:  "TESTVAR",
-						Value: cdb.Spec.TestVariable,
-					},
 					{
 						Name:  "TLSCRT",
 						Value: cdb.Spec.CDBTlsCrt.Secret.Key,