NETOBSERV-1737 consolePlugin fails to get deployed on 4.17 cluster (#718

) * openshift api vendor * update console plugin api * restore envtest openshift manifests
netobserv · Jul 24, 2024 · bbcc16d · bbcc16d
1 parent 41ae323
commit bbcc16d
Show file tree

Hide file tree

Showing 205 changed files with 52,194 additions and 7,491 deletions.
diff --git a/controllers/consoleplugin/consoleplugin_objects.go b/controllers/consoleplugin/consoleplugin_objects.go
@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"time"
 
-	osv1alpha1 "github.com/openshift/api/console/v1alpha1"
+	osv1 "github.com/openshift/api/console/v1"
 	monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
 	"gopkg.in/yaml.v2"
 	appsv1 "k8s.io/api/apps/v1"
@@ -70,29 +70,37 @@ func newBuilder(info *reconcilers.Instance, desired *flowslatest.FlowCollectorSp
 	}
 }
 
-func (b *builder) consolePlugin() *osv1alpha1.ConsolePlugin {
-	return &osv1alpha1.ConsolePlugin{
+func (b *builder) consolePlugin() *osv1.ConsolePlugin {
+	return &osv1.ConsolePlugin{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: constants.PluginName,
 		},
-		Spec: osv1alpha1.ConsolePluginSpec{
+		Spec: osv1.ConsolePluginSpec{
 			DisplayName: displayName,
-			Service: osv1alpha1.ConsolePluginService{
-				Name:      constants.PluginName,
-				Namespace: b.info.Namespace,
-				Port:      *b.advanced.Port,
-				BasePath:  "/",
-			},
-			Proxy: []osv1alpha1.ConsolePluginProxy{{
-				Type:      osv1alpha1.ProxyTypeService,
-				Alias:     proxyAlias,
-				Authorize: true,
-				Service: osv1alpha1.ConsolePluginProxyServiceConfig{
+			Backend: osv1.ConsolePluginBackend{
+				Type: osv1.Service,
+				Service: &osv1.ConsolePluginService{
 					Name:      constants.PluginName,
 					Namespace: b.info.Namespace,
 					Port:      *b.advanced.Port,
+					BasePath:  "/"},
+			},
+			Proxy: []osv1.ConsolePluginProxy{
+				{
+					Endpoint: osv1.ConsolePluginProxyEndpoint{
+						Type: osv1.ProxyTypeService,
+						Service: &osv1.ConsolePluginProxyServiceConfig{
+							Name:      constants.PluginName,
+							Namespace: b.info.Namespace,
+							Port:      *b.advanced.Port}},
+					Alias:         proxyAlias,
+					Authorization: osv1.UserToken,
+					CACertificate: "",
 				},
-			}},
+			},
+			I18n: osv1.ConsolePluginI18n{
+				LoadType: osv1.Lazy,
+			},
 		},
 	}
 }

diff --git a/controllers/consoleplugin/consoleplugin_reconciler.go b/controllers/consoleplugin/consoleplugin_reconciler.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"reflect"
 
-	osv1alpha1 "github.com/openshift/api/console/v1alpha1"
+	osv1 "github.com/openshift/api/console/v1"
 	operatorsv1 "github.com/openshift/api/operator/v1"
 	monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
 	appsv1 "k8s.io/api/apps/v1"
@@ -157,7 +157,7 @@ func (r *CPReconciler) reconcilePermissions(ctx context.Context, builder *builde
 
 func (r *CPReconciler) reconcilePlugin(ctx context.Context, builder *builder, desired *flowslatest.FlowCollectorSpec) error {
 	// Console plugin is cluster-scope (it's not deployed in our namespace) however it must still be updated if our namespace changes
-	oldPlg := osv1alpha1.ConsolePlugin{}
+	oldPlg := osv1.ConsolePlugin{}
 	pluginExists := true
 	err := r.Get(ctx, types.NamespacedName{Name: constants.PluginName}, &oldPlg)
 	if err != nil {
@@ -248,7 +248,7 @@ func (r *CPReconciler) reconcileHPA(ctx context.Context, builder *builder, desir
 	)
 }
 
-func pluginNeedsUpdate(plg *osv1alpha1.ConsolePlugin, desired *pluginSpec) bool {
+func pluginNeedsUpdate(plg *osv1.ConsolePlugin, desired *pluginSpec) bool {
 	advancedConfig := helper.GetAdvancedPluginConfig(desired.Advanced)
-	return plg.Spec.Service.Port != *advancedConfig.Port
+	return plg.Spec.Backend.Service.Port != *advancedConfig.Port
 }
diff --git a/controllers/flowcollector_controller.go b/controllers/flowcollector_controller.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	osv1alpha1 "github.com/openshift/api/console/v1alpha1"
+	osv1 "github.com/openshift/api/console/v1"
 	securityv1 "github.com/openshift/api/security/v1"
 	appsv1 "k8s.io/api/apps/v1"
 	ascv2 "k8s.io/api/autoscaling/v2"
@@ -60,7 +60,7 @@ func Start(ctx context.Context, mgr *manager.Manager) error {
 		builder.Owns(&securityv1.SecurityContextConstraints{})
 	}
 	if mgr.HasConsolePlugin() {
-		builder.Owns(&osv1alpha1.ConsolePlugin{})
+		builder.Owns(&osv1.ConsolePlugin{})
 	} else {
 		log.Info("Console not detected: the console plugin is not available")
 	}

diff --git a/controllers/flowcollector_controller_console_test.go b/controllers/flowcollector_controller_console_test.go
@@ -3,6 +3,7 @@ package controllers
 import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+	configv1 "github.com/openshift/api/config/v1"
 	operatorsv1 "github.com/openshift/api/operator/v1"
 	monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
 	appsv1 "k8s.io/api/apps/v1"
@@ -59,6 +60,14 @@ func flowCollectorConsolePluginSpecs() {
 				Spec: operatorsv1.ConsoleSpec{
 					OperatorSpec: operatorsv1.OperatorSpec{
 						ManagementState: operatorsv1.Unmanaged,
+						LogLevel:        operatorsv1.Normal,
+					},
+					Providers: operatorsv1.ConsoleProviders{},
+					Route: operatorsv1.ConsoleConfigRoute{
+						Hostname: "",
+						Secret: configv1.SecretNameReference{
+							Name: "",
+						},
 					},
 				},
 			}

diff --git a/go.mod b/go.mod
@@ -9,7 +9,7 @@ require (
 	github.com/netobserv/flowlogs-pipeline v1.6.1-crc0
 	github.com/onsi/ginkgo/v2 v2.19.0
 	github.com/onsi/gomega v1.33.1
-	github.com/openshift/api v0.0.0-20220112145620-704957ce4980
+	github.com/openshift/api v0.0.0-20240722135205-ae4f370f361f
 	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.73.2
 	github.com/prometheus/common v0.48.0
 	github.com/stretchr/testify v1.9.0