Merge pull request #29 from sorry-cypress/add-path-support-to-directo…

…r-and-s3 Add path support to director and s3
sorry-cypress · Feb 1, 2021 · 85ab035 · 85ab035
2 parents 04e2b06 + 03fe561
commit 85ab035
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 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.25
+version: 0.1.26
 appVersion: 0.6.1
 home: https://sorry-cypress.dev/
 sources:

diff --git a/charts/sorry-cypress/README.md b/charts/sorry-cypress/README.md
@@ -117,6 +117,7 @@ https://sorry-cypress.dev/director/configuration
 | `director.ingress.labels`                         | Ingress labels                                                                                                                                                               | `{}`                             |
 | `director.ingress.annotations`                    | Ingress annotations                                                                                                                                                          | `{}`                             |
 | `director.ingress.hosts[0].host`                  | Hostname to the service installation                                                                                                                                         | `director.chart-example.local`   |
+| `director.ingress.hosts[0].path`                  | Root path to the service installation                                                                                                                                        | `/`                              |
 | `director.ingress.tls`                            | Ingress secrets for TLS certificates                                                                                                                                         | `[]`                             |
 
 ### Mongo service
@@ -155,4 +156,5 @@ If the screenshots driver is set to `"../screenshots/s3.driver"`, you must confi
 | `s3.ingress.labels`        | Ingress labels                                                                                                    | `{}`                         |
 | `s3.ingress.annotations`   | Ingress annotations                                                                                               | `{}`                         |
 | `s3.ingress.hosts[0].host` | Hostname to the service installation                                                                              | `static.chart-example.local` |
+| `s3.ingress.hosts[0].path` | Root path to the service installation                                                                             | `/`                          |
 | `s3.ingress.tls`           | Ingress secrets for TLS certificates                                                                              | `[]`                         |
diff --git a/charts/sorry-cypress/templates/ingress-director.yml b/charts/sorry-cypress/templates/ingress-director.yml
@@ -38,15 +38,16 @@ spec:
       http:
         paths:
           {{- if $v1Networking }}
-          - path: /
+          - path: {{ .path | default "/" }}
             pathType: Prefix
             backend:
               service:
                 name: {{ $fullName }}-director
                 port:
                   number: {{ $servicePort }}
           {{- else }}
-          - backend:
+          - path: {{ .path | default "/" }}
+            backend:
               serviceName: {{ $fullName }}-director
               servicePort: {{ $servicePort }}
           {{- end }}

diff --git a/charts/sorry-cypress/templates/ingress-s3.tpl b/charts/sorry-cypress/templates/ingress-s3.tpl
@@ -16,10 +16,10 @@ metadata:
     {{- with .Values.s3.ingress.labels }}
     {{- toYaml . | nindent 4 }}
     {{- end}}
+  {{- with .Values.s3.ingress.annotations }}
   annotations:
-    {{- with .Values.s3.ingress.annotations }}
     {{- toYaml . | nindent 4 }}
-    {{- end }}
+  {{- end }}
 spec:
   {{- if .Values.s3.ingress.tls }}
   tls:
@@ -37,15 +37,16 @@ spec:
       http:
         paths:
           {{- if $v1Networking }}
-          - path: /
+          - path: {{ .path | default "/" }}
             pathType: Prefix
             backend:
               service:
                 name: {{ $fullName }}-s3
                 port:
                   number: 80
           {{- else }}
-          - backend:
+          - path: {{ .path | default "/" }}
+            backend:
               serviceName: {{ $fullName }}-s3
               servicePort: 80
           {{- end }}

diff --git a/charts/sorry-cypress/values.yaml b/charts/sorry-cypress/values.yaml
@@ -146,7 +146,7 @@ director:
       # kubernetes.io/tls-acme: "true"
     hosts:
       - host: director.chart-example.local
-        paths: /
+        path: /
     tls: []
     #  - secretName: chart-example-tls
     #    hosts:
@@ -213,7 +213,7 @@ s3:
       # nginx.ingress.kubernetes.io/cors-allow-methods: "POST, GET, PUT, DELETE, HEAD"
     hosts:
       - host: static.chart-example.local
-        paths: /
+        path: /
     tls: []
     #  - secretName: chart-example-tls
     #    hosts: