Merge pull request #1118 from tkan145/THREESCALE-12040

THREESCALE-12040 - Block the upgrade if Oracle DB is being used

Author: tkan145

controllers/apps/apimanager_controller.go

@@ -120,6 +120,18 @@ func (r *APIManagerReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		return ctrl.Result{}, nil
 	}
 
+	// TODO: remove once https://issues.redhat.com/browse/THREESCALE-12001 is fixed
+	ok, err := helper.IsOracleDB(r.Client(), instance, logger)
+	if err != nil {
+		return ctrl.Result{}, err
+	}
+	if ok {
+		// always run preflightChecks if oracle db is detected
+		// this will allow us to return the error and block the
+		// reconcilation loop
+		preflightsRequired = true
+	}
+
 	var preflightChecksError error
 	if preflightsRequired {
 		result, err, preflightChecksError = r.PreflightChecks(instance, logger)

pkg/helper/system_database_versions.go

@@ -51,14 +51,14 @@ func VerifySystemDatabase(k8sclient client.Client, reqConfigMap *v1.ConfigMap, a
 		}
 
 		databaseVersionVerified, err = verifyMySQLVersion(dbConfig, databaseRequirement)
-
 		if err != nil {
 			logger.Info("Failed to verify MySQL database version", "err", err)
 			return false, err
 		}
 	} else if strings.HasPrefix(dbConfig.URL, "oracle-enhanced://") {
-		logger.Info("Oracle system database discovered, bypassing version check")
-		return true, nil
+		// TODO: revert to old code once https://issues.redhat.com/browse/THREESCALE-12001 is fixed
+		logger.Info("Oracle system database discovered")
+		return false, fmt.Errorf("unsupported database, Oracle DB is not supported in this version of 3scale")
 	} else {
 		return false, fmt.Errorf("unsupported database")
 	}
@@ -71,3 +71,21 @@ func VerifySystemDatabase(k8sclient client.Client, reqConfigMap *v1.ConfigMap, a
 
 	return databaseVersionVerified, nil
 }
+
+// IsOracleDB check whether we have oracle DB
+// TODO: remove once https://issues.redhat.com/browse/THREESCALE-12001 is fixed
+func IsOracleDB(k8sclient client.Client, apimInstance *appsv1alpha1.APIManager, logger logr.Logger) (bool, error) {
+	connSecret, err := fetchSecret(k8sclient, systemDatabaseName, apimInstance.Namespace)
+	if err != nil {
+		logger.Info("System database secret not found")
+		return false, err
+	}
+
+	dbConfig := reconcileSystemDBSecret(*connSecret)
+
+	if strings.HasPrefix(dbConfig.URL, "oracle-enhanced://") {
+		logger.Info("Oracle system database discovered")
+		return true, nil
+	}
+	return false, nil
+}

test/unitcontrollers/apimanager_controller_test.go

@@ -2,6 +2,7 @@ package test
 
 import (
 	"context"
+	"fmt"
 	"os"
 	"testing"
 
@@ -16,6 +17,7 @@ import (
 	imagev1 "github.com/openshift/api/image/v1"
 	routev1 "github.com/openshift/api/route/v1"
 	monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
@@ -76,6 +78,23 @@ func TestAPIManagerControllerCreate(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	// Define the secret
+	systemappSecret := &corev1.Secret{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "system-database",
+			Namespace: namespace,
+		},
+		StringData: map[string]string{
+			"DB_USER":          "mysql",
+			"DB_PASSWORD":      "password",
+			"DB_ROOT_PASSWORD": "rootpassword",
+			"URL":              fmt.Sprintf("mysql2://root:rootpassword@system-mysql.%s.svc.cluster.local/dev", namespace),
+		},
+		Type: corev1.SecretTypeOpaque,
+	}
+
+	objs = append(objs, systemappSecret)
+
 	// Create a fake client to mock API calls.
 	cl := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(objs...).WithStatusSubresource(apimanager).Build()
 	clientAPIReader := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(objs...).WithStatusSubresource(apimanager).Build()
@@ -110,7 +129,6 @@ func TestAPIManagerControllerCreate(t *testing.T) {
 
 	if finalAPIManager.Annotations == nil {
 		t.Error("APIManager's does not have annotations")
-
 	}
 
 	if val, ok := finalAPIManager.Annotations[appsv1alpha1.OperatorVersionAnnotation]; !ok || val != version.Version {