Apply recommendations

minion/OpenShift_README.md

@@ -23,7 +23,6 @@ This documentation provides basic information on how to install Minion on Red Ha
 6. Under Repository, select the newly created repository entry.
 7. Click on Minion.
 8.	Make sure that the project name matches the name you set in step 2.
-    * Skip this step if you are setting “CreateNamespace” option to true.
 9.	Make the required modifications (for example, set the PostgreSQL information).
 10.	Click Create.
 11.	Wait for the pods to come up. This may take a few minutes.

minion/README.md

@@ -16,7 +16,6 @@ This template can be used to bring up a minion and connect it to a OpenNMS core.
 | clusterRole | bool | `true` |  |
 | clusterRoleBinding | bool | `true` |  |
 | core.instanceID | string | `"monms"` |  |
-| createNamespace | bool | `false` |  |
 | imagePullSecrets | list | `[]` |  |
 | minion.configuration.ports.karaf.enabled | bool | `true` |  |
 | minion.configuration.ports.karaf.externalPort | int | `8201` |  |

minion/templates/minion.clusterrole.yaml

@@ -1,6 +1,5 @@
 {{ $name :=(printf "system:openshift:scc:%s" (.Values.securitycontext).securitycontextconstraints.name) }}
 {{- if and (eq (include "onOpenShift" .) "true") (.Values.clusterRole) }}
-{{- if not (lookup "rbac.authorization.k8s.io/v1" "ClusterRole" "" $name ) }}
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
@@ -15,4 +14,3 @@ rules:
     resourceNames:
       - {{ (.Values.securitycontext).securitycontextconstraints.name | quote }}
 {{- end }}
-{{- end }}

minion/templates/minion.clusterrolebinding.yaml

@@ -1,6 +1,5 @@
 {{ $name :=(printf "system:openshift:scc:%s" (.Values.securitycontext).securitycontextconstraints.name) }}
 {{- if and (eq (include "onOpenShift" .) "true") (.Values.clusterRoleBinding) }}
-{{- if not (lookup "rbac.authorization.k8s.io/v1" "ClusterRoleBinding" "" $name ) }}
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
@@ -14,4 +13,3 @@ roleRef:
   kind: ClusterRole
   name: {{ printf "system:openshift:scc:%s" (.Values.securitycontext).securitycontextconstraints.name | quote }} 
 {{- end }}
-{{- end }}

minion/values.schema.json

@@ -2,11 +2,6 @@
     "$schema": "http://json-schema.org/schema#",
     "type": "object",
     "properties": {
-        "createNamespace": {
-            "type": "boolean",
-            "title": "Create Namespace",
-            "default": false
-        },
         "imagePullSecrets": {
             "type": "array",
             "title": "Image Pull Secrets",

minion/values.yaml

@@ -1,5 +1,3 @@
-createNamespace: false  # Whether to create the namespace for this deployment
-
 # Red Hat OpenShift related settings for creating Cluster Role and Binding
 clusterRole: true
 clusterRoleBinding: true