Merge pull request #28 from sorry-cypress/allow-ingress-path-customiz…

…ation Allow ingress path customization
sorry-cypress · Jan 29, 2021 · cbd5141 · cbd5141
2 parents eddbac2 + 7637947
commit cbd5141
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/charts/sorry-cypress/Chart.yaml b/charts/sorry-cypress/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: sorry-cypress
 description: A Helm chart for Sorry Cypress
 type: application
-version: 0.1.23
+version: 0.1.24
 appVersion: 0.6.1
 home: https://sorry-cypress.dev/
 sources:

diff --git a/charts/sorry-cypress/README.md b/charts/sorry-cypress/README.md
@@ -70,6 +70,7 @@ https://sorry-cypress.dev/api#configuration
 | `api.ingress.labels`        | Ingress labels                        | `{}`                        |
 | `api.ingress.annotations`   | Ingress annotations                   | `{}`                        |
 | `api.ingress.hosts[0].host` | Hostname to the service installation  | `api.chart-example.local`   |
+| `api.ingress.hosts[0].path` | Root path to the service installation | `/`                         |
 | `api.ingress.tls`           | Ingress secrets for TLS certificates  | `[]`                        |
 
 ### Dashboard service
@@ -92,6 +93,7 @@ https://sorry-cypress.dev/dashboard#configuration
 | `dashboard.ingress.labels`                                | Ingress labels                                                                                             | `{}`                              |
 | `dashboard.ingress.annotations`                           | Ingress annotations                                                                                        | `{}`                              |
 | `dashboard.ingress.hosts[0].host`                         | Hostname to the service installation                                                                       | `dashboard.chart-example.local`   |
+| `dashboard.ingress.hosts[0].path`                         | Root path to the service installation                                                                      | `/`                               |
 | `dashboard.ingress.tls`                                   | Ingress secrets for TLS certificates                                                                       | `[]`                              |
 
 ### Director service

diff --git a/charts/sorry-cypress/templates/ingress-api.yml b/charts/sorry-cypress/templates/ingress-api.yml
@@ -38,15 +38,16 @@ spec:
       http:
         paths:
           {{- if $v1Networking }}
-          - path: /
+          - path: {{ .path | default "/" }}
             pathType: Prefix
             backend:
               service:
                 name: {{ $fullName }}-api
                 port:
                   number: {{ $servicePort }}
           {{- else }}
-          - backend:
+            - path: {{ .path | default "/" }}
+              backend:
               serviceName: {{ $fullName }}-api
               servicePort: {{ $servicePort }}
           {{- end }}

diff --git a/charts/sorry-cypress/templates/ingress-dashboard.yml b/charts/sorry-cypress/templates/ingress-dashboard.yml
@@ -38,15 +38,16 @@ spec:
       http:
         paths:
           {{- if $v1Networking }}
-          - path: /
+          - path: {{ .path | default "/" }}
             pathType: Prefix
             backend:
               service:
                 name: {{ $fullName }}-dashboard
                 port:
                   number: {{ $servicePort }}
           {{- else }}
-          - backend:
+          - path: {{ .path | default "/" }}
+            backend:
               serviceName: {{ $fullName }}-dashboard
               servicePort: {{ $servicePort }}
           {{- end }}

diff --git a/charts/sorry-cypress/values.yaml b/charts/sorry-cypress/values.yaml
@@ -37,6 +37,7 @@ api:
       # kubernetes.io/tls-acme: "true"
     hosts:
       - host: api.chart-example.local
+        path: /
     tls: []
     #  - secretName: chart-example-tls
     #    hosts:
@@ -84,7 +85,7 @@ dashboard:
       # kubernetes.io/tls-acme: "true"
     hosts:
       - host: dashboard.chart-example.local
-        paths: /
+        path: /
     tls: []
     #  - secretName: chart-example-tls
     #    hosts: