Merge pull request #441 from iamniting/console

Bug 2297946:[release-4.16] console: use github.com/openshift/api/console/v1

console/console.go

@@ -19,7 +19,7 @@ package console
 import (
 	"strings"
 
-	consolev1alpha1 "github.com/openshift/api/console/v1alpha1"
+	consolev1 "github.com/openshift/api/console/v1"
 	appsv1 "k8s.io/api/apps/v1"
 	apiv1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -82,38 +82,48 @@ func GetService(port int, namespace string) *apiv1.Service {
 	}
 }
 
-func GetConsolePluginCR(consolePort int, serviceNamespace string) *consolev1alpha1.ConsolePlugin {
-	return &consolev1alpha1.ConsolePlugin{
+func GetConsolePluginCR(consolePort int, serviceNamespace string) *consolev1.ConsolePlugin {
+	return &consolev1.ConsolePlugin{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: "odf-console",
 		},
-		Spec: consolev1alpha1.ConsolePluginSpec{
+		Spec: consolev1.ConsolePluginSpec{
 			DisplayName: "ODF Plugin",
-			Service: consolev1alpha1.ConsolePluginService{
-				Name:      "odf-console-service",
-				Namespace: serviceNamespace,
-				Port:      int32(consolePort),
+			Backend: consolev1.ConsolePluginBackend{
+				Service: &consolev1.ConsolePluginService{
+					Name:      "odf-console-service",
+					Namespace: serviceNamespace,
+					Port:      int32(consolePort),
+				},
+				Type: consolev1.Service,
+			},
+			I18n: consolev1.ConsolePluginI18n{
+				LoadType: consolev1.Empty,
 			},
-			Proxy: []consolev1alpha1.ConsolePluginProxy{
+			Proxy: []consolev1.ConsolePluginProxy{
 				{
-					Type:  consolev1alpha1.ProxyTypeService,
 					Alias: "provider-proxy",
-					Service: consolev1alpha1.ConsolePluginProxyServiceConfig{
-						Name:      "ux-backend-proxy",
-						Namespace: serviceNamespace,
-						Port:      8888,
+					Endpoint: consolev1.ConsolePluginProxyEndpoint{
+						Type: consolev1.ProxyTypeService,
+						Service: &consolev1.ConsolePluginProxyServiceConfig{
+							Name:      "ux-backend-proxy",
+							Namespace: serviceNamespace,
+							Port:      8888,
+						},
 					},
-					Authorize: true,
+					Authorization: consolev1.UserToken,
 				},
 				{
-					Type:  consolev1alpha1.ProxyTypeService,
 					Alias: "rosa-prometheus",
-					Service: consolev1alpha1.ConsolePluginProxyServiceConfig{
-						Name:      "prometheus",
-						Namespace: serviceNamespace,
-						Port:      9339,
+					Endpoint: consolev1.ConsolePluginProxyEndpoint{
+						Type: consolev1.ProxyTypeService,
+						Service: &consolev1.ConsolePluginProxyServiceConfig{
+							Name:      "prometheus",
+							Namespace: serviceNamespace,
+							Port:      9339,
+						},
 					},
-					Authorize: false,
+					Authorization: consolev1.None,
 				},
 			},
 		},

controllers/clusterversion_controller.go

@@ -21,6 +21,7 @@ import (
 	"fmt"
 
 	configv1 "github.com/openshift/api/config/v1"
+	consolev1 "github.com/openshift/api/console/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
@@ -30,7 +31,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 
-	consolev1alpha1 "github.com/openshift/api/console/v1alpha1"
 	"github.com/red-hat-storage/odf-operator/console"
 	"github.com/red-hat-storage/odf-operator/pkg/util"
 )
@@ -126,31 +126,37 @@ func (r *ClusterVersionReconciler) ensureConsolePlugin(clusterVersion string) er
 	// Create/Update ODF console ConsolePlugin
 	odfConsolePlugin := console.GetConsolePluginCR(r.ConsolePort, OperatorNamespace)
 	_, err = controllerutil.CreateOrUpdate(context.TODO(), r.Client, odfConsolePlugin, func() error {
-		if currentBasePath := odfConsolePlugin.Spec.Service.BasePath; currentBasePath != basePath {
-			logger.Info(fmt.Sprintf("Set the BasePath for odf-console plugin as '%s'", basePath))
-			odfConsolePlugin.Spec.Service.BasePath = basePath
+		if odfConsolePlugin.Spec.Backend.Service != nil {
+			if currentBasePath := odfConsolePlugin.Spec.Backend.Service.BasePath; currentBasePath != basePath {
+				logger.Info(fmt.Sprintf("Set the BasePath for odf-console plugin as '%s'", basePath))
+				odfConsolePlugin.Spec.Backend.Service.BasePath = basePath
+			}
 		}
 		if odfConsolePlugin.Spec.Proxy == nil {
-			odfConsolePlugin.Spec.Proxy = []consolev1alpha1.ConsolePluginProxy{
+			odfConsolePlugin.Spec.Proxy = []consolev1.ConsolePluginProxy{
 				{
-					Type:  consolev1alpha1.ProxyTypeService,
 					Alias: "provider-proxy",
-					Service: consolev1alpha1.ConsolePluginProxyServiceConfig{
-						Name:      "ux-backend-proxy",
-						Namespace: OperatorNamespace,
-						Port:      8888,
+					Endpoint: consolev1.ConsolePluginProxyEndpoint{
+						Type: consolev1.ProxyTypeService,
+						Service: &consolev1.ConsolePluginProxyServiceConfig{
+							Name:      "ux-backend-proxy",
+							Namespace: OperatorNamespace,
+							Port:      8888,
+						},
 					},
-					Authorize: true,
+					Authorization: consolev1.UserToken,
 				},
 				{
-					Type:  consolev1alpha1.ProxyTypeService,
 					Alias: "rosa-prometheus",
-					Service: consolev1alpha1.ConsolePluginProxyServiceConfig{
-						Name:      "prometheus",
-						Namespace: OperatorNamespace,
-						Port:      9339,
+					Endpoint: consolev1.ConsolePluginProxyEndpoint{
+						Type: consolev1.ProxyTypeService,
+						Service: &consolev1.ConsolePluginProxyServiceConfig{
+							Name:      "prometheus",
+							Namespace: OperatorNamespace,
+							Port:      9339,
+						},
 					},
-					Authorize: false,
+					Authorization: consolev1.None,
 				},
 			}
 		}

main.go

@@ -45,7 +45,6 @@ import (
 	//+kubebuilder:scaffold:imports
 	configv1 "github.com/openshift/api/config/v1"
 	consolev1 "github.com/openshift/api/console/v1"
-	consolev1alpha1 "github.com/openshift/api/console/v1alpha1"
 	extv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	metrics "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 )
@@ -67,7 +66,6 @@ func init() {
 	//+kubebuilder:scaffold:scheme
 
 	utilruntime.Must(consolev1.AddToScheme(scheme))
-	utilruntime.Must(consolev1alpha1.AddToScheme(scheme))
 	utilruntime.Must(extv1.AddToScheme(scheme))
 	utilruntime.Must(configv1.AddToScheme(scheme))