Merge pull request #142 from tchughesiv/ocpVersions0.1.4

cherry-pick: deploy different console plugin images based on ocp version

Author: tchughesiv

controllers/dbaasplatform_controller.go

@@ -29,6 +29,7 @@ import (
 	"github.com/RHEcosystemAppEng/dbaas-operator/controllers/reconcilers/console_plugin"
 	providers_installation "github.com/RHEcosystemAppEng/dbaas-operator/controllers/reconcilers/providers_installation"
 	"github.com/RHEcosystemAppEng/dbaas-operator/controllers/reconcilers/quickstart_installation"
+	"golang.org/x/mod/semver"
 
 	"github.com/go-logr/logr"
 
@@ -72,6 +73,7 @@ type DBaaSPlatformReconciler struct {
 	Log                 logr.Logger
 	installComplete     bool
 	operatorNameVersion string
+	OcpVersion          string
 }
 
 //+kubebuilder:rbac:groups=dbaas.redhat.com,resources=*,verbs=get;list;watch;create;update;patch;delete
@@ -239,6 +241,9 @@ func (r *DBaaSPlatformReconciler) getReconcilerForPlatform(platformConfig dbaasv
 	case dbaasv1alpha1.TypeProvider:
 		return providers_installation.NewReconciler(r.Client, r.Scheme, r.Log, platformConfig)
 	case dbaasv1alpha1.TypeConsolePlugin:
+		if r.OcpVersion != "" && semver.Compare(r.OcpVersion, "v4.9") <= 0 {
+			platformConfig.Image += reconcilers.CONSOLE_PLUGIN_49_TAG
+		}
 		return console_plugin.NewReconciler(r.Client, r.Scheme, r.Log, platformConfig)
 	case dbaasv1alpha1.TypeQuickStart:
 		return quickstart_installation.NewReconciler(r.Client, r.Scheme, r.Log)

controllers/reconcilers/constants.go

@@ -10,6 +10,7 @@ const (
 	INSTALL_NAMESPACE              = "openshift-operators"
 	CATALOG_NAMESPACE              = "openshift-marketplace"
 	DBAAS_OPERATOR_VERSION_KEY_ENV = "DBAAS_OPERATOR_VERSION"
+	CONSOLE_PLUGIN_49_TAG          = "-4.9"
 
 	// CRUNCHY_BRIDGE
 	CRUNCHY_BRIDGE_CATALOG_IMG = "registry.developers.crunchydata.com/crunchydata/crunchy-bridge-operator-catalog:v0.0.2"

go.mod

@@ -3,16 +3,18 @@ module github.com/RHEcosystemAppEng/dbaas-operator
 go 1.16
 
 require (
+	github.com/RHsyseng/operator-utils v1.4.9
 	github.com/go-logr/logr v0.4.0
 	github.com/onsi/ginkgo v1.16.4
-	github.com/onsi/gomega v1.13.0
+	github.com/onsi/gomega v1.15.0
 	github.com/openshift/api v0.0.0-20210910062324-a41d3573a3ba
-	github.com/openshift/client-go v0.0.0-20200320143156-e7fa42a1261e
+	github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142
 	github.com/operator-framework/api v0.10.5
-	go.uber.org/zap v1.17.0
-	k8s.io/api v0.21.1
-	k8s.io/apimachinery v0.21.1
-	k8s.io/client-go v0.21.1
-	k8s.io/utils v0.0.0-20210709001253-0e1f9d693477
-	sigs.k8s.io/controller-runtime v0.9.0
+	go.uber.org/zap v1.19.0
+	golang.org/x/mod v0.5.1
+	k8s.io/api v0.22.1
+	k8s.io/apimachinery v0.22.1
+	k8s.io/client-go v0.22.1
+	k8s.io/utils v0.0.0-20210802155522-efc7438f0176
+	sigs.k8s.io/controller-runtime v0.10.0
 )