Merge pull request #980 from TheRealJon/OCPBUGS-43792

OCPBUGS-43792: Add plugins order to console config

Author: openshift-merge-bot[bot]

pkg/console/subresource/configmap/configmap.go

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

pkg/console/subresource/consoleserver/config_builder.go

@@ -60,6 +60,7 @@ type ConsoleServerCLIConfigBuilder struct {
 	customHostnameRedirectPort   int
 	inactivityTimeoutSeconds     int
 	pluginsList                  map[string]string
+	pluginsOrder                 []string
 	i18nNamespaceList            []string
 	proxyServices                []ProxyService
 	telemetry                    map[string]string
@@ -238,6 +239,11 @@ func (b *ConsoleServerCLIConfigBuilder) Plugins(plugins map[string]string) *Cons
 	return b
 }
 
+func (b *ConsoleServerCLIConfigBuilder) PluginsOrder(consoleConfig *operatorv1.Console) *ConsoleServerCLIConfigBuilder {
+	b.pluginsOrder = consoleConfig.Spec.Plugins
+	return b
+}
+
 func (b *ConsoleServerCLIConfigBuilder) ContentSecurityPolicies(cspList map[v1.DirectiveType][]string) *ConsoleServerCLIConfigBuilder {
 	b.contentSecurityPolicyList = cspList
 	return b
@@ -295,6 +301,7 @@ func (b *ConsoleServerCLIConfigBuilder) Config() Config {
 		Providers:                    b.providers(),
 		MonitoringInfo:               b.monitoringInfo(),
 		Plugins:                      b.plugins(),
+		PluginsOrder:                 b.getPluginsOrder(),
 		I18nNamespaces:               b.i18nNamespaces(),
 		Proxy:                        b.proxy(),
 		ContentSecurityPolicy:        b.contentSecurityPolicy(),
@@ -569,6 +576,10 @@ func (b *ConsoleServerCLIConfigBuilder) plugins() map[string]string {
 	return b.pluginsList
 }
 
+func (b *ConsoleServerCLIConfigBuilder) getPluginsOrder() []string {
+	return b.pluginsOrder
+}
+
 func (b *ConsoleServerCLIConfigBuilder) i18nNamespaces() []string {
 	return b.i18nNamespaceList
 }

pkg/console/subresource/consoleserver/types.go

@@ -28,6 +28,7 @@ type Config struct {
 	Providers                    `yaml:"providers"`
 	MonitoringInfo               `yaml:"monitoringInfo,omitempty"`
 	Plugins                      map[string]string             `yaml:"plugins,omitempty"`
+	PluginsOrder                 []string                      `yaml:"pluginsOrder,omitempty"`
 	I18nNamespaces               []string                      `yaml:"i18nNamespaces,omitempty"`
 	Proxy                        Proxy                         `yaml:"proxy,omitempty"`
 	ContentSecurityPolicy        map[v1.DirectiveType][]string `yaml:"contentSecurityPolicy,omitempty"`