Skip to content

Commit b51f401

Browse files
committed
Update default console plugins for OpenShift 4.17
OpenShift 4.17 configures the `networking-console-plugin` by default. We update the component to add that plugin to the default plugins for OpenShift >= 4.17. Additionally, to keep the code reasonable, we remove support for OpenShift < 4.14 and deploy the `monitoring-plugin` unconditionally. Note that we leave the `upgrade-notification` test case untouched as the remaining OpenShift < 4.17 case.
1 parent be14349 commit b51f401

File tree

10 files changed

+14
-4
lines changed

10 files changed

+14
-4
lines changed

component/main.jsonnet

+5-4
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,12 @@ local tlsSecret =
4747
local consolePlugins =
4848
// set default plugins dynamically based on OCP minor version and append
4949
// user-configured plugins to the default.
50-
local defaults =
51-
if std.parseInt(params.openshift_version.Minor) > 13 then
52-
[ 'monitoring-plugin' ]
50+
local defaults = [ 'monitoring-plugin' ] + (
51+
if std.parseInt(params.openshift_version.Minor) > 16 then
52+
[ 'networking-console-plugin' ]
5353
else
54-
[];
54+
[]
55+
);
5556
// render final plugins list by appending any user-provided plugins that
5657
// aren't part of the default plugins to the list of plugins. We use
5758
// `std.set()` on the user-provided plugins so that users don't have to

docs/modules/ROOT/pages/references/parameters.adoc

+1
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ Add plugins to the console.
8181

8282
The component will inject a dynamic set of plugins into the configuration based on the reported OpenShift version in parameter `openshift_version`.
8383
For OpenShift 4.14 and newer, the component always adds plugin `monitoring-plugin`.
84+
For OpenShift 4.17 and newer, the component always adds plugin `networking-console-plugin`.
8485
Additionally, the component will remove duplicated entries from the list of configured plugins.
8586

8687
NOTE: The order of entries in the field isn't guaranteed to be stable.

tests/golden/custom-links/openshift4-console/openshift4-console/10_console.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ spec:
99
managementState: Managed
1010
plugins:
1111
- monitoring-plugin
12+
- networking-console-plugin

tests/golden/custom-logo/openshift4-console/openshift4-console/10_console.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ spec:
1414
managementState: Managed
1515
plugins:
1616
- monitoring-plugin
17+
- networking-console-plugin

tests/golden/custom-plugins/openshift4-console/openshift4-console/10_console.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@ spec:
99
managementState: Managed
1010
plugins:
1111
- monitoring-plugin
12+
- networking-console-plugin
1213
- example-plugin
1314
- foo-bar

tests/golden/custom-route-legacy/openshift4-console/openshift4-console/10_console.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ spec:
99
managementState: Managed
1010
plugins:
1111
- monitoring-plugin
12+
- networking-console-plugin

tests/golden/custom-route-managed-tls/openshift4-console/openshift4-console/10_console.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ spec:
99
managementState: Managed
1010
plugins:
1111
- monitoring-plugin
12+
- networking-console-plugin

tests/golden/custom-route/openshift4-console/openshift4-console/10_console.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ spec:
99
managementState: Managed
1010
plugins:
1111
- monitoring-plugin
12+
- networking-console-plugin

tests/golden/defaults/openshift4-console/openshift4-console/10_console.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ spec:
99
managementState: Managed
1010
plugins:
1111
- monitoring-plugin
12+
- networking-console-plugin

tests/golden/notifications/openshift4-console/openshift4-console/10_console.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ spec:
99
managementState: Managed
1010
plugins:
1111
- monitoring-plugin
12+
- networking-console-plugin

0 commit comments

Comments
 (0)