feat: ou656 UIPlugin logging-view-plugin new stream for OCP 4.22 Patternfly v6 (#1046)

Author: zhuje

cmd/operator/main.go

@@ -45,7 +45,8 @@ var defaultImages = map[string]string{
 	"ui-distributed-tracing-pf5": "quay.io/openshift-observability-ui/distributed-tracing-console-plugin:v0.4.2",
 	"ui-distributed-tracing":     "quay.io/openshift-observability-ui/distributed-tracing-console-plugin:v1.0.2",
 	"ui-logging-pf4":             "quay.io/openshift-observability-ui/logging-view-plugin:v6.0.4",
-	"ui-logging":                 "quay.io/openshift-observability-ui/logging-view-plugin:v6.1.5",
+	"ui-logging-pf5":             "quay.io/openshift-observability-ui/logging-view-plugin:v6.1.5",
+	"ui-logging":                 "quay.io/openshift-observability-ui/logging-view-plugin:v6.2.0",
 	"korrel8r":                   "quay.io/korrel8r/korrel8r:0.9.1",
 	"health-analyzer":            "quay.io/openshiftanalytics/cluster-health-analyzer:v1.1.0",
 	"ui-monitoring-pf5":          "quay.io/openshift-observability-ui/monitoring-console-plugin:v0.4.4",

pkg/controllers/uiplugin/compatibility_matrix.go

@@ -118,6 +118,18 @@ var compatibilityMatrix = []CompatibilityEntry{
 	{
 		PluginType:        uiv1alpha1.TypeLogging,
 		MinClusterVersion: "v4.15",
+		MaxClusterVersion: "v4.22",
+		ImageKey:          "ui-logging-pf5",
+		SupportLevel:      GeneralAvailability,
+		Features: []string{
+			"dev-console",
+			"alerts",
+			"dev-alerts",
+		},
+	},
+	{
+		PluginType:        uiv1alpha1.TypeLogging,
+		MinClusterVersion: "v4.22",
 		MaxClusterVersion: "",
 		ImageKey:          "ui-logging",
 		SupportLevel:      GeneralAvailability,

pkg/controllers/uiplugin/compatibility_matrix_test.go

@@ -122,7 +122,7 @@ func TestLookupImageAndFeatures(t *testing.T) {
 		{
 			pluginType:     uiv1alpha1.TypeLogging,
 			clusterVersion: "v4.15",
-			expectedKey:    "ui-logging",
+			expectedKey:    "ui-logging-pf5",
 			expectedErr:    nil,
 			expectedFeatures: []string{
 				"dev-console",
@@ -134,7 +134,7 @@ func TestLookupImageAndFeatures(t *testing.T) {
 		{
 			pluginType:     uiv1alpha1.TypeLogging,
 			clusterVersion: "v4.15.0-0.nightly-2024-06-06-064349",
-			expectedKey:    "ui-logging",
+			expectedKey:    "ui-logging-pf5",
 			expectedErr:    nil,
 			expectedFeatures: []string{
 				"dev-console",
@@ -146,7 +146,7 @@ func TestLookupImageAndFeatures(t *testing.T) {
 		{
 			pluginType:     uiv1alpha1.TypeLogging,
 			clusterVersion: "4.15.46",
-			expectedKey:    "ui-logging",
+			expectedKey:    "ui-logging-pf5",
 			expectedErr:    nil,
 			expectedFeatures: []string{
 				"dev-console",
@@ -158,7 +158,7 @@ func TestLookupImageAndFeatures(t *testing.T) {
 		{
 			pluginType:     uiv1alpha1.TypeLogging,
 			clusterVersion: "v4.16.9",
-			expectedKey:    "ui-logging",
+			expectedKey:    "ui-logging-pf5",
 			expectedErr:    nil,
 			expectedFeatures: []string{
 				"dev-console",
@@ -174,6 +174,66 @@ func TestLookupImageAndFeatures(t *testing.T) {
 			expectedErr:    nil,
 			supportLevel:   GeneralAvailability,
 		},
+		{
+			pluginType:     uiv1alpha1.TypeLogging,
+			clusterVersion: "v4.21.1",
+			expectedKey:    "ui-logging-pf5",
+			expectedErr:    nil,
+			expectedFeatures: []string{
+				"dev-console",
+				"alerts",
+				"dev-alerts",
+			},
+			supportLevel: GeneralAvailability,
+		},
+		{
+			pluginType:     uiv1alpha1.TypeLogging,
+			clusterVersion: "v4.22",
+			expectedKey:    "ui-logging",
+			expectedErr:    nil,
+			expectedFeatures: []string{
+				"dev-console",
+				"alerts",
+				"dev-alerts",
+			},
+			supportLevel: GeneralAvailability,
+		},
+		{
+			pluginType:     uiv1alpha1.TypeLogging,
+			clusterVersion: "v4.22.1",
+			expectedKey:    "ui-logging",
+			expectedErr:    nil,
+			expectedFeatures: []string{
+				"dev-console",
+				"alerts",
+				"dev-alerts",
+			},
+			supportLevel: GeneralAvailability,
+		},
+		{
+			pluginType:     uiv1alpha1.TypeLogging,
+			clusterVersion: "v4.22.12",
+			expectedKey:    "ui-logging",
+			expectedErr:    nil,
+			expectedFeatures: []string{
+				"dev-console",
+				"alerts",
+				"dev-alerts",
+			},
+			supportLevel: GeneralAvailability,
+		},
+		{
+			pluginType:     uiv1alpha1.TypeLogging,
+			clusterVersion: "v4.22.0-0.nightly-2024-06-06-064349",
+			expectedKey:    "ui-logging",
+			expectedErr:    nil,
+			expectedFeatures: []string{
+				"dev-console",
+				"alerts",
+				"dev-alerts",
+			},
+			supportLevel: GeneralAvailability,
+		},
 		{
 			pluginType: uiv1alpha1.TypeTroubleshootingPanel,
 			// This plugin requires changes made in the monitoring-plugin for Openshift 4.16