Merge pull request #78 from appuio/feat/support-4.17

Update default console plugins for OpenShift 4.17

Author: simu

.cruft.json

@@ -7,7 +7,7 @@
       "name": "OpenShift4 Console",
       "slug": "openshift4-console",
       "parameter_key": "openshift4_console",
-      "test_cases": "defaults custom-plugins custom-route custom-route-legacy custom-route-managed-tls custom-links custom-logo ocp-4.14 notifications upgrade-notification",
+      "test_cases": "defaults custom-plugins custom-route custom-route-legacy custom-route-managed-tls custom-links custom-logo notifications upgrade-notification",
       "add_lib": "n",
       "add_pp": "n",
       "add_golden": "y",
@@ -24,7 +24,8 @@
       "github_owner": "appuio",
       "github_name": "component-openshift4-console",
       "github_url": "https://github.com/appuio/component-openshift4-console",
-      "_template": "https://github.com/projectsyn/commodore-component-template.git"
+      "_template": "https://github.com/projectsyn/commodore-component-template.git",
+      "_commit": "98d16f99766e6c6d97322dbe42e058f0e2bf73d0"
     }
   },
   "directory": null

.github/workflows/test.yaml

@@ -39,7 +39,6 @@ jobs:
           - custom-route-managed-tls
           - custom-links
           - custom-logo
-          - ocp-4.14
           - notifications
           - upgrade-notification
     defaults:
@@ -63,7 +62,6 @@ jobs:
           - custom-route-managed-tls
           - custom-links
           - custom-logo
-          - ocp-4.14
           - notifications
           - upgrade-notification
     defaults:

Makefile.vars.mk

@@ -57,4 +57,4 @@ KUBENT_IMAGE    ?= ghcr.io/doitintl/kube-no-trouble:latest
 KUBENT_DOCKER   ?= $(DOCKER_CMD) $(DOCKER_ARGS) $(root_volume) --entrypoint=/app/kubent $(KUBENT_IMAGE)
 
 instance ?= defaults
-test_instances = tests/defaults.yml tests/custom-plugins.yml tests/custom-route.yml tests/custom-route-legacy.yml tests/custom-route-managed-tls.yml tests/custom-links.yml tests/custom-logo.yml tests/ocp-4.14.yml tests/notifications.yml tests/upgrade-notification.yml
+test_instances = tests/defaults.yml tests/custom-plugins.yml tests/custom-route.yml tests/custom-route-legacy.yml tests/custom-route-managed-tls.yml tests/custom-links.yml tests/custom-logo.yml tests/notifications.yml tests/upgrade-notification.yml

class/defaults.yml

@@ -14,7 +14,7 @@ parameters:
       openshift.io/node-selector: ''
     openshift_version:
       Major: '4'
-      Minor: '13'
+      Minor: '17'
     route:
       console: {}
       downloads: {}

component/main.jsonnet

@@ -47,11 +47,12 @@ local tlsSecret =
 local consolePlugins =
   // set default plugins dynamically based on OCP minor version and append
   // user-configured plugins to the default.
-  local defaults =
-    if std.parseInt(params.openshift_version.Minor) > 13 then
-      [ 'monitoring-plugin' ]
+  local defaults = [ 'monitoring-plugin' ] + (
+    if std.parseInt(params.openshift_version.Minor) > 16 then
+      [ 'networking-console-plugin' ]
     else
-      [];
+      []
+  );
   // render final plugins list by appending any user-provided plugins that
   // aren't part of the default plugins to the list of plugins. We use
   // `std.set()` on the user-provided plugins so that users don't have to

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

@@ -35,7 +35,7 @@ default::
 [source,yaml]
 ----
 Major: '4'
-Minor: '13'
+Minor: '17'
 ----
 
 The OpenShift major and minor version.
@@ -81,6 +81,7 @@ Add plugins to the console.
 
 The component will inject a dynamic set of plugins into the configuration based on the reported OpenShift version in parameter `openshift_version`.
 For OpenShift 4.14 and newer, the component always adds plugin `monitoring-plugin`.
+For OpenShift 4.17 and newer, the component always adds plugin `networking-console-plugin`.
 Additionally, the component will remove duplicated entries from the list of configured plugins.
 
 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

@@ -7,4 +7,6 @@ metadata:
   name: cluster
 spec:
   managementState: Managed
-  plugins: []
+  plugins:
+    - monitoring-plugin
+    - networking-console-plugin

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

@@ -12,4 +12,6 @@ spec:
       name: console-logo
     customProductName: Company Cloud
   managementState: Managed
-  plugins: []
+  plugins:
+    - monitoring-plugin
+    - networking-console-plugin

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

@@ -8,5 +8,7 @@ metadata:
 spec:
   managementState: Managed
   plugins:
+    - monitoring-plugin
+    - networking-console-plugin
     - example-plugin
     - foo-bar

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

@@ -7,4 +7,6 @@ metadata:
   name: cluster
 spec:
   managementState: Managed
-  plugins: []
+  plugins:
+    - monitoring-plugin
+    - networking-console-plugin

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

@@ -7,4 +7,6 @@ metadata:
   name: cluster
 spec:
   managementState: Managed
-  plugins: []
+  plugins:
+    - monitoring-plugin
+    - networking-console-plugin

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

@@ -7,4 +7,6 @@ metadata:
   name: cluster
 spec:
   managementState: Managed
-  plugins: []
+  plugins:
+    - monitoring-plugin
+    - networking-console-plugin

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

@@ -7,4 +7,6 @@ metadata:
   name: cluster
 spec:
   managementState: Managed
-  plugins: []
+  plugins:
+    - monitoring-plugin
+    - networking-console-plugin

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

@@ -7,4 +7,6 @@ metadata:
   name: cluster
 spec:
   managementState: Managed
-  plugins: []
+  plugins:
+    - monitoring-plugin
+    - networking-console-plugin