diff --git a/minion/OpenShift_README.md b/minion/OpenShift_README.md index 6babc3b..c66535b 100644 --- a/minion/OpenShift_README.md +++ b/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. diff --git a/minion/README.md b/minion/README.md index 285a37b..7f1f3c7 100644 --- a/minion/README.md +++ b/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` | | diff --git a/minion/templates/minion.clusterrole.yaml b/minion/templates/minion.clusterrole.yaml index 4e8e1f4..350a5da 100644 --- a/minion/templates/minion.clusterrole.yaml +++ b/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 }} diff --git a/minion/templates/minion.clusterrolebinding.yaml b/minion/templates/minion.clusterrolebinding.yaml index 57b7bfa..c14762c 100644 --- a/minion/templates/minion.clusterrolebinding.yaml +++ b/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 }} diff --git a/minion/templates/namespace.yaml b/minion/templates/namespace.yaml deleted file mode 100644 index ea42b1a..0000000 --- a/minion/templates/namespace.yaml +++ /dev/null @@ -1,7 +0,0 @@ -{{- if and .Values.createNamespace (not (eq .Release.Name "default")) }} ---- -apiVersion: v1 -kind: Namespace -metadata: - name: {{ .Release.Namespace }} -{{- end }} \ No newline at end of file diff --git a/minion/values.schema.json b/minion/values.schema.json index d26ffe7..6752b55 100644 --- a/minion/values.schema.json +++ b/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", diff --git a/minion/values.yaml b/minion/values.yaml index 63b3e98..9cf6fb8 100644 --- a/minion/values.yaml +++ b/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