OCPBUGS-60782: pluginOrder field should only contain available plugins

Author: jhadvig

pkg/console/subresource/configmap/configmap.go

@@ -84,7 +84,7 @@ func DefaultConfigMap(
 		TopologyMode(infrastructureConfig.Status.ControlPlaneTopology).
 		Monitoring(monitoringSharedConfig).
 		Plugins(getPluginsEndpointMap(availablePlugins)).
-		PluginsOrder(operatorConfig).
+		PluginsOrder(availablePlugins, operatorConfig).
 		I18nNamespaces(pluginsWithI18nNamespace(availablePlugins)).
 		ContentSecurityPolicies(aggregateCSPDirectives(availablePlugins)).
 		ContentSecurityPolicyEnabled(contentSecurityPolicyEnabled).

pkg/console/subresource/consoleserver/config_builder.go

@@ -243,8 +243,26 @@ func (b *ConsoleServerCLIConfigBuilder) Plugins(plugins map[string]string) *Cons
 	return b
 }
 
-func (b *ConsoleServerCLIConfigBuilder) PluginsOrder(consoleConfig *operatorv1.Console) *ConsoleServerCLIConfigBuilder {
-	b.pluginsOrder = consoleConfig.Spec.Plugins
+func (b *ConsoleServerCLIConfigBuilder) PluginsOrder(availablePlugins []*v1.ConsolePlugin, consoleConfig *operatorv1.Console) *ConsoleServerCLIConfigBuilder {
+	// Build a fast lookup set of available plugin names
+	availableSet := map[string]struct{}{}
+	for _, plugin := range availablePlugins {
+		if plugin == nil {
+			continue
+		}
+		availableSet[plugin.ObjectMeta.Name] = struct{}{}
+	}
+
+	// Preserve the order from consoleConfig.Spec.Plugins, but include only those
+	// plugins that are actually available on the cluster.
+	ordered := []string{}
+	for _, name := range consoleConfig.Spec.Plugins {
+		if _, ok := availableSet[name]; ok {
+			ordered = append(ordered, name)
+		}
+	}
+
+	b.pluginsOrder = ordered
 	return b
 }
 

pkg/console/subresource/consoleserver/config_builder_test.go

@@ -7,10 +7,12 @@ import (
 	"github.com/go-test/deep"
 	"github.com/google/go-cmp/cmp"
 	configv1 "github.com/openshift/api/config/v1"
+	consolev1 "github.com/openshift/api/console/v1"
 	v1 "github.com/openshift/api/operator/v1"
 	"github.com/openshift/console-operator/pkg/api"
 	authorizationv1 "k8s.io/api/authorization/v1"
 	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 // defaultTestCapabilities represents the default capabilities as defined in the operator manifest
@@ -907,6 +909,56 @@ func TestConsoleServerCLIConfigBuilder(t *testing.T) {
 				I18nNamespaces: []string{"plugin__plugin1"},
 			},
 		},
+		{
+			name: "Config builder should set plugins order from available plugins",
+			input: func() Config {
+				b := &ConsoleServerCLIConfigBuilder{}
+				b.Plugins(map[string]string{
+					"plugin1": "plugin1_url",
+					"plugin2": "plugin2_url",
+				}).
+					PluginsOrder([]*consolev1.ConsolePlugin{
+						{ObjectMeta: metav1.ObjectMeta{Name: "plugin1"}},
+						{ObjectMeta: metav1.ObjectMeta{Name: "plugin2"}},
+					}, &v1.Console{
+						Spec: v1.ConsoleSpec{
+							Plugins: []string{"plugin1", "plugin2", "plugin3"},
+						},
+					})
+				return b.Config()
+			},
+			output: Config{
+				Kind:       "ConsoleConfig",
+				APIVersion: "console.openshift.io/v1",
+				ServingInfo: ServingInfo{
+					BindAddress: "https://[::]:8443",
+					CertFile:    certFilePath,
+					KeyFile:     keyFilePath,
+				},
+				ClusterInfo: ClusterInfo{
+					ConsoleBasePath: "",
+				},
+				Auth: Auth{
+					ClientID:         api.OpenShiftConsoleName,
+					ClientSecretFile: clientSecretFilePath,
+				},
+				Session: Session{},
+				Customization: Customization{
+					Perspectives: []Perspective{
+						{
+							ID:         "dev",
+							Visibility: PerspectiveVisibility{State: PerspectiveDisabled},
+						},
+					},
+				},
+				Providers: Providers{},
+				Plugins: map[string]string{
+					"plugin1": "plugin1_url",
+					"plugin2": "plugin2_url",
+				},
+				PluginsOrder: []string{"plugin1", "plugin2"},
+			},
+		},
 		{
 			name: "Config builder should pass telemetry configuration",
 			input: func() Config {