Browse Source

build(helm): delete loaded_plugins loaded_modules and acl

zhanghongtong 4 years ago
parent
commit
b2b8386685

+ 0 - 1
deploy/charts/emqx/README.md

@@ -76,4 +76,3 @@ The following table lists the configurable parameters of the emqx chart and thei
 | `ingress.mgmt.tls` | Ingress tls for EMQX Mgmt API |	[] |
 | `ingress.mgmt.annotations` | Ingress annotations for EMQX Mgmt API |	{} |
 | `emqxConfig` | Emqx configuration item, see the [documentation](https://hub.docker.com/r/emqx/emqx) | |
-| `emqxAclConfig` | Emqx acl configuration item, see the [documentation](https://docs.emqx.io/broker/latest/en/advanced/acl-file.html) | |

+ 0 - 27
deploy/charts/emqx/templates/StatefulSet.yaml

@@ -53,24 +53,6 @@ spec:
       {{- end }}
     spec:
       volumes:
-      - name: emqx-loaded-plugins
-        configMap:
-          name: {{ include "emqx.fullname" . }}-loaded-plugins
-          items:
-          - key: loaded_plugins
-            path: loaded_plugins
-      - name: emqx-loaded-modules
-        configMap:
-          name: {{ include "emqx.fullname" . }}-loaded-modules
-          items:
-          - key: loaded_modules
-            path: loaded_modules
-      - name: emqx-acl
-        configMap:
-          name: {{ include "emqx.fullname" . }}-acl
-          items:
-          - key: acl.conf
-            path: acl.conf
       {{- if not .Values.persistence.enabled }}
       - name: emqx-data
         emptyDir: {}
@@ -145,15 +127,6 @@ spec:
           volumeMounts:
           - name: emqx-data
             mountPath: "/opt/emqx/data/mnesia"
-          - name: emqx-acl
-            mountPath: "/opt/emqx/etc/acl.conf"
-            subPath: "acl.conf"
-          - name: emqx-loaded-plugins
-            mountPath: "/opt/emqx/data/loaded_plugins"
-            subPath: "loaded_plugins"
-          - name: emqx-loaded-modules
-            mountPath: "/opt/emqx/data/loaded_modules"
-            subPath: "loaded_modules"
           {{ if .Values.emqxLicneseSecretName  }}
           - name: emqx-license
             mountPath: "/opt/emqx/etc/emqx.lic"

+ 0 - 45
deploy/charts/emqx/templates/configmap.yaml

@@ -12,48 +12,3 @@ data:
   {{- range $index, $value := .Values.emqxConfig}}
     {{$index}}: "{{ $value }}" 
   {{- end}}
-
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "emqx.fullname" . }}-acl
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app.kubernetes.io/name: {{ include "emqx.name" . }}
-    helm.sh/chart: {{ include "emqx.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-data:
-  "acl.conf": |
-    {{ .Values.emqxAclConfig }}
-
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "emqx.fullname" . }}-loaded-plugins
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app.kubernetes.io/name: {{ include "emqx.name" . }}
-    helm.sh/chart: {{ include "emqx.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-data:
-  "loaded_plugins": |
-    {{ .Values.emqxLoadedPlugins }}
-
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "emqx.fullname" . }}-loaded-modules
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app.kubernetes.io/name: {{ include "emqx.name" . }}
-    helm.sh/chart: {{ include "emqx.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-data:
-  "loaded_modules": |
-    {{ .Values.emqxLoadedModules }}

+ 0 - 39
deploy/charts/emqx/values.yaml

@@ -54,45 +54,6 @@ emqxConfig:
   ## if EMQX_CLUSTER__K8S__ADDRESS_TYPE eq dns
   # EMQX_CLUSTER__K8S__SUFFIX: "pod.cluster.local"
 
-## --------------------------------------------------------------------
-##  [ACL](https://docs.emqx.io/broker/latest/en/advanced/acl-file.html)
-
-##  -type(who() :: all | binary() |
-##                 {ipaddr, esockd_access:cidr()} |
-##                 {client, binary()} |
-##                 {user, binary()}).
-
-##  -type(access() :: subscribe | publish | pubsub).
-
-##  -type(topic() :: binary()).
-
-##  -type(rule() :: {allow, all} |
-##                  {allow, who(), access(), list(topic())} |
-##                  {deny, all} |
-##                  {deny, who(), access(), list(topic())}).
-## --------------------------------------------------------------------
-emqxAclConfig: >
-  {allow, {user, "dashboard"}, subscribe, ["$SYS/#"]}.
-  {allow, {ipaddr, "127.0.0.1"}, pubsub, ["$SYS/#", "#"]}.
-  {deny, all, subscribe, ["$SYS/#", {eq, "#"}]}.
-  {allow, all}.
-
-emqxLoadedPlugins: >
-  {emqx_management, true}.
-  {emqx_recon, true}.
-  {emqx_retainer, true}.
-  {emqx_dashboard, true}.
-  {emqx_telemetry, true}.
-  {emqx_rule_engine, true}.
-  {emqx_bridge_mqtt, false}.
-
-emqxLoadedModules: >
-  {emqx_mod_presence, true}.
-  {emqx_mod_delayed, false}.
-  {emqx_mod_rewrite, false}.
-  {emqx_mod_subscription, false}.
-  {emqx_mod_topic_metrics, false}.
-
 ## EMQX Enterprise Edition requires manual creation of a Secret containing the licensed content. Write the name of Secret to the value of "emqxLicneseSecretName"
 ## Example:
 ##   kubectl create secret generic emqx-license-secret-name --from-file=/path/to/emqx.lic