diff --git a/deploy/charts/emqx/README.md b/deploy/charts/emqx/README.md index 54d267415..935624769 100644 --- a/deploy/charts/emqx/README.md +++ b/deploy/charts/emqx/README.md @@ -70,18 +70,21 @@ Parameter | Description | Default Value `ingress.dashboard.enabled` | Enable ingress for EMQX Dashboard | false `ingress.dashboard.ingressClassName` | Set the ingress class for EMQX Dashboard `ingress.dashboard.path` | Ingress path for EMQX Dashboard | `/` +`ingress.dashboard.pathType` | Ingress pathType for EMQX Dashboard | `ImplementationSpecific` `ingress.dashboard.hosts` | Ingress hosts for EMQX Mgmt API | dashboard.emqx.local `ingress.dashboard.tls` | Ingress tls for EMQX Mgmt API | `[]` `ingress.dashboard.annotations` | Ingress annotations for EMQX Mgmt API | `{}` `ingress.mgmt.enabled` | Enable ingress for EMQX Mgmt API | `false` `ingress.mqtt.ingressClassName` | Set the ingress class for EMQX Mgmt API | `nil` `ingress.mgmt.path` | Ingress path for EMQX Mgmt API | `/` +`ingress.mgmt.pathType` | Ingress pathType for EMQX Mgmt API | `ImplementationSpecific` `ingress.mgmt.hosts` | Ingress hosts for EMQX Mgmt API | `api.emqx.local` `ingress.mgmt.tls` | Ingress tls for EMQX Mgmt API | `[]` `ingress.mgmt.annotations` | Ingress annotations for EMQX Mgmt API | `{}` `ingress.wss.enabled` | Enable ingress for EMQX Mgmt API | `false` `ingress.wss.ingressClassName` | Set the ingress class for EMQX Mgmt API | `nil` `ingress.wss.path` | Ingress path for EMQX WSS | `/` +`ingress.wss.pathType` | Ingress pathType for EMQX WSS | `ImplementationSpecific` `ingress.wss.hosts` | Ingress hosts for EMQX WSS | `wss.emqx.local` `ingress.wss.tls` | Ingress tls for EMQX WSS | `[]` `ingress.wss.annotations` | Ingress annotations for EMQX WSS | `{}` @@ -122,6 +125,7 @@ ingress: nginx.ingress.kubernetes.io/use-proxy-protocol: "false" nginx.ingress.kubernetes.io/proxy-protocol-header-timeout: "5s" path: /mqtt + pathType: ImplementationSpecific hosts: - myhost.example.com tls: diff --git a/deploy/charts/emqx/templates/ingress.dashboard.yaml b/deploy/charts/emqx/templates/ingress.dashboard.yaml index 9ea06cdc4..5a8bbd4a9 100644 --- a/deploy/charts/emqx/templates/ingress.dashboard.yaml +++ b/deploy/charts/emqx/templates/ingress.dashboard.yaml @@ -34,7 +34,7 @@ spec: paths: - path: / {{- if (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} - pathType: ImplementationSpecific + pathType: {{ .Values.ingress.dashboard.pathType | default "ImplementationSpecific" }} {{- end }} backend: {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} diff --git a/deploy/charts/emqx/templates/ingress.mgmt.yaml b/deploy/charts/emqx/templates/ingress.mgmt.yaml index c9abe79a9..6c3811f77 100644 --- a/deploy/charts/emqx/templates/ingress.mgmt.yaml +++ b/deploy/charts/emqx/templates/ingress.mgmt.yaml @@ -34,7 +34,7 @@ spec: paths: - path: {{ $.Values.ingress.mgmt.path | default "/" }} {{- if (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} - pathType: ImplementationSpecific + pathType: {{ .Values.ingress.mgmt.pathType | default "ImplementationSpecific" }} {{- end }} backend: {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} diff --git a/deploy/charts/emqx/templates/ingress.wss.yaml b/deploy/charts/emqx/templates/ingress.wss.yaml index 7c7b395a5..ec74889bc 100644 --- a/deploy/charts/emqx/templates/ingress.wss.yaml +++ b/deploy/charts/emqx/templates/ingress.wss.yaml @@ -34,7 +34,7 @@ spec: paths: - path: {{ $.Values.ingress.wss.path | default "/mqtt" }} {{- if (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} - pathType: ImplementationSpecific + pathType: {{ .Values.ingress.wss.pathType | default "ImplementationSpecific" }} {{- end }} backend: {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} diff --git a/deploy/charts/emqx/values.yaml b/deploy/charts/emqx/values.yaml index d78f19a8e..0f273671c 100644 --- a/deploy/charts/emqx/values.yaml +++ b/deploy/charts/emqx/values.yaml @@ -195,6 +195,7 @@ ingress: # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" path: / + pathType: ImplementationSpecific hosts: - dashboard.emqx.local tls: [] @@ -206,6 +207,7 @@ ingress: # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" path: / + pathType: ImplementationSpecific hosts: - api.emqx.local tls: [] @@ -228,6 +230,7 @@ ingress: # nginx.ingress.kubernetes.io/use-proxy-protocol: "false" # nginx.ingress.kubernetes.io/proxy-protocol-header-timeout: "5s" path: /mqtt + pathType: ImplementationSpecific # path: /wss(\/.*)? hosts: - wss.emqx.local