Merge pull request #32 from appuio/schedule-console-on-master

Schedule all console components on master nodes

class/defaults.yml

@@ -1,6 +1,8 @@
 parameters:
   openshift4_console:
     namespace: openshift-console
+    namespace_annotations:
+      openshift.io/node-selector: node-role.kubernetes.io/master=
     openshift_version: '4.8'
     route:
       console: {}

component/main.jsonnet

@@ -198,7 +198,7 @@ local openshiftConfigNsAnnotationPatch =
 {
   '00_namespace': kube.Namespace(params.namespace) {
     metadata+: {
-      annotations:: {},
+      annotations: std.prune(params.namespace_annotations),
       [if std.member(inv.applications, 'networkpolicy') then 'labels']+: {
         [inv.parameters.networkpolicy.labels.noDefaults]: 'true',
         [inv.parameters.networkpolicy.labels.purgeDefaults]: 'true',

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

@@ -2,6 +2,32 @@
 
 The parent key for all of the following parameters is `openshift4_console`.
 
+== `namespace`
+
+[horizontal]
+type:: string
+default:: `openshift-console`
+
+The namespace where the console is deployed.
+
+[IMPORTANT]
+It's not recommended to change this parameter.
+Changing the parameter might break the components function.
+
+== `namespace_annotations`
+
+type:: dictionary
+default::
++
+[source,yaml]
+----
+openshift.io/node-selector: node-role.kubernetes.io/master=
+----
+
+Annotations to add to the managed namespace.
+Annotations can be removed by setting the value to `null`.
+
+
 == `openshift_version`
 
 [horizontal]

tests/golden/custom-links/openshift4-console/openshift4-console/00_namespace.yaml

@@ -1,6 +1,8 @@
 apiVersion: v1
 kind: Namespace
 metadata:
+  annotations:
+    openshift.io/node-selector: node-role.kubernetes.io/master=
   labels:
     name: openshift-console
   name: openshift-console

tests/golden/custom-route-4.7/openshift4-console/openshift4-console/00_namespace.yaml

@@ -1,6 +1,8 @@
 apiVersion: v1
 kind: Namespace
 metadata:
+  annotations:
+    openshift.io/node-selector: node-role.kubernetes.io/master=
   labels:
     name: openshift-console
   name: openshift-console

tests/golden/custom-route-legacy-4.7/openshift4-console/openshift4-console/00_namespace.yaml

@@ -1,6 +1,8 @@
 apiVersion: v1
 kind: Namespace
 metadata:
+  annotations:
+    openshift.io/node-selector: node-role.kubernetes.io/master=
   labels:
     name: openshift-console
   name: openshift-console

tests/golden/custom-route-legacy/openshift4-console/openshift4-console/00_namespace.yaml

@@ -1,6 +1,8 @@
 apiVersion: v1
 kind: Namespace
 metadata:
+  annotations:
+    openshift.io/node-selector: node-role.kubernetes.io/master=
   labels:
     name: openshift-console
   name: openshift-console

tests/golden/custom-route-managed-tls/openshift4-console/openshift4-console/00_namespace.yaml

@@ -1,6 +1,8 @@
 apiVersion: v1
 kind: Namespace
 metadata:
+  annotations:
+    openshift.io/node-selector: node-role.kubernetes.io/master=
   labels:
     name: openshift-console
   name: openshift-console

tests/golden/custom-route/openshift4-console/openshift4-console/00_namespace.yaml

@@ -1,6 +1,8 @@
 apiVersion: v1
 kind: Namespace
 metadata:
+  annotations:
+    openshift.io/node-selector: node-role.kubernetes.io/master=
   labels:
     name: openshift-console
   name: openshift-console

tests/golden/defaults/openshift4-console/openshift4-console/00_namespace.yaml

@@ -1,6 +1,8 @@
 apiVersion: v1
 kind: Namespace
 metadata:
+  annotations:
+    openshift.io/node-selector: node-role.kubernetes.io/master=
   labels:
     name: openshift-console
   name: openshift-console