Skip to content

Commit

Permalink
Remove nginx specific ingress annotations
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisburr committed Oct 6, 2023
1 parent 4d04f42 commit 56efbdb
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 16 deletions.
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,13 +97,14 @@ TODO
| dex.service.ports.http.nodePort | int | `32002` | |
| dex.service.ports.http.port | int | `8000` | |
| dex.service.type | string | `"NodePort"` | |
| diracx.ingress.annotations."nginx.ingress.kubernetes.io/rewrite-target" | string | `"/$2"` | |
| diracx.ingress.annotations."nginx.ingress.kubernetes.io/use-regex" | string | `"true"` | |
| diracx.ingress.className | string | `"nginx"` | |
| diracx.ingress.enabled | bool | `true` | |
| diracx.ingress.hosts[0].paths[0].backend.service.port.number | int | `8000` | |
| diracx.ingress.hosts[0].paths[0].path | string | `"/api(/|$)(.*)"` | |
| diracx.ingress.hosts[0].paths[0].pathType | string | `"ImplementationSpecific"` | |
| diracx.ingress.hosts[0].paths[0].path | string | `"/api/"` | |
| diracx.ingress.hosts[0].paths[0].pathType | string | `"Prefix"` | |
| diracx.ingress.hosts[0].paths[1].backend.service.port.number | int | `8000` | |
| diracx.ingress.hosts[0].paths[1].path | string | `"/.well-known/"` | |
| diracx.ingress.hosts[0].paths[1].pathType | string | `"Prefix"` | |
| diracx.ingress.tls | list | `[]` | |
| diracx.manageOSIndices | bool | `true` | |
| diracx.mysqlDatabases[0] | string | `"AuthDB"` | |
Expand Down
20 changes: 8 additions & 12 deletions diracx/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -108,21 +108,17 @@ diracx:
ingress:
enabled: true
className: "nginx"
annotations:
# kubernetes.io/ingress.class: nginx
# kubernetes.io/tls-acme: "true"
# Needed if you want to use a base path different from /
# #Use rewrite rules https://kubernetes.github.io/ingress-nginx/examples/rewrite/
nginx.ingress.kubernetes.io/use-regex: "true"
nginx.ingress.kubernetes.io/rewrite-target: /$2
tls: []
# - secretName: chart-example-tls
# hosts:
# - chart-example.local
hosts:
- paths:
- path: /api(/|$)(.*)
pathType: ImplementationSpecific
- path: /api/
pathType: Prefix
backend:
service:
port:
number: 8000
- path: /.well-known/
pathType: Prefix
backend:
service:
port:
Expand Down

0 comments on commit 56efbdb

Please sign in to comment.