diff --git a/charts/rollup/Chart.yaml b/charts/rollup/Chart.yaml index a789b25..c19fbb2 100644 --- a/charts/rollup/Chart.yaml +++ b/charts/rollup/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.7.7 +version: 0.8.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/rollup/templates/ingress.yaml b/charts/rollup/templates/ingress.yaml index 79e9503..484ea14 100644 --- a/charts/rollup/templates/ingress.yaml +++ b/charts/rollup/templates/ingress.yaml @@ -6,7 +6,7 @@ {{- range $service, $ingress := .Values.ingress.services }} {{- $servicePort := $ingress.service.port -}} {{- $serviceName := $ingress.service.name -}} -{{- $ingressPath := $ingress.path -}} +{{- $ingressPath := tpl $ingress.path $ -}} {{- $ingressPathType := $ingress.pathType -}} {{- $extraPaths := $ingress.extraPaths }} --- @@ -21,6 +21,10 @@ metadata: {{- end }} annotations: kubernetes.io/ingress.class: {{ $.Values.ingress.className }} + {{- if $ingress.rewriteTarget }} + nginx.ingress.kubernetes.io/use-regex: "true" + nginx.ingress.kubernetes.io/rewrite-target: /$2 + {{- end }} {{- if $ingressApiIsStable }} {{- range $key, $value := $ingress.annotations }} {{ $key }}: {{ tpl $value $ | quote }} diff --git a/charts/rollup/values.yaml b/charts/rollup/values.yaml index 45be5e2..7790100 100644 --- a/charts/rollup/values.yaml +++ b/charts/rollup/values.yaml @@ -131,9 +131,10 @@ ingress: services: rpc: hosts: - - executor.{{ .Values.config.rollup.name }}.{{ .Values.ingress.hostname }} - path: / - pathType: Prefix + - rollups.{{ .Values.ingress.hostname }} + path: /{{ .Values.config.rollup.name }}/rpc(/|$)(.*) + pathType: ImplementationSpecific + rewriteTarget: true service: name: "{{ .Values.config.rollup.name }}-evm-service" port: @@ -148,9 +149,10 @@ ingress: # - chart-example.local ws: hosts: - - ws-executor.{{ .Values.config.rollup.name }}.{{ .Values.ingress.hostname }} - path: / - pathType: Prefix + - rollups.{{ .Values.ingress.hostname }} + path: /{{ .Values.config.rollup.name }}/ws(/|$)(.*) + pathType: ImplementationSpecific + rewriteTarget: true service: name: "{{ .Values.config.rollup.name }}-evm-service" port: