Skip to content
This repository has been archived by the owner on Jul 29, 2024. It is now read-only.

path based option #148

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/rollup/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion charts/rollup/templates/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
---
Expand All @@ -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 }}
Expand Down
14 changes: 8 additions & 6 deletions charts/rollup/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down