Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: to correctly configure BASE_PATH for selfservice-ui chart #652

Merged
merged 3 commits into from
Nov 14, 2023
Merged

fix: to correctly configure BASE_PATH for selfservice-ui chart #652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b8a948a
fix(kratos-selfservice-ui): to correctly configure BASE_PATH
emmenko Nov 9, 2023
6bc0481
ci(hacks): test basePath
emmenko Nov 14, 2023
fd2f888
fix: test
emmenko Nov 14, 2023
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: 2 additions & 0 deletions hacks/values/kratos-selfservice-ui-node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ deployment:
- name: dummy
mountPath: /opt/dummy/

basePath: /auth

test:
busybox:
repository: docker.io/library/busybox
Expand Down
2 changes: 1 addition & 1 deletion helm/charts/kratos-selfservice-ui-node/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ A Helm chart for ORY Kratos's example ui for Kubernetes
| Key | Type | Default | Description |
|-----|------|---------|-------------|
| affinity | object | `{}` | |
| baseUrl | string | `""` | The baseUrl |
| basePath | string | `""` | The basePath |
| deployment | object | `{"annotations":{},"automountServiceAccountToken":false,"dnsConfig":{},"extraEnv":[],"extraVolumeMounts":[],"extraVolumes":[],"labels":{},"nodeSelector":{},"resources":{},"tolerations":[],"topologySpreadConstraints":[]}` | Deployment configuration |
| deployment.dnsConfig | object | `{}` | Configure pod dnsConfig. |
| deployment.extraEnv | list | `[]` | Array of extra envs to be passed to the deployment. Kubernetes format is expected - name: FOO value: BAR |
Expand Down
8 changes: 4 additions & 4 deletions helm/charts/kratos-selfservice-ui-node/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ spec:
value: {{ .Values.kratosBrowserUrl | quote }}
- name: PROJECT_NAME
value: {{ .Values.projectName | quote }}
- name: BASE_URL
value: {{ .Values.baseUrl | quote }}
- name: BASE_PATH
value: {{ .Values.basePath | quote }}
- name: JWKS_URL
value: {{ .Values.jwksUrl | quote }}
- name: KRATOS_ADMIN_URL
Expand All @@ -74,11 +74,11 @@ spec:
protocol: TCP
livenessProbe:
httpGet:
path: /health/alive
path: {{ .Values.basePath }}/health/alive
port: http
readinessProbe:
httpGet:
path: /health/ready
path: {{ .Values.basePath }}/health/ready
port: http
resources:
{{- toYaml .Values.deployment.resources | nindent 12 }}
Expand Down
2 changes: 1 addition & 1 deletion helm/charts/kratos-selfservice-ui-node/templates/tests/test-connection.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ spec:
- name: wget
image: "{{ .Values.test.busybox.repository }}:{{ .Values.test.busybox.tag }}"
command: ['wget']
args: ['{{ include "kratos-selfservice-ui-node.fullname" . }}:{{ .Values.service.port }}/health/ready']
args: ['{{ include "kratos-selfservice-ui-node.fullname" . }}:{{ .Values.service.port }}{{ .Values.basePath }}/health/ready']
restartPolicy: Never
4 changes: 2 additions & 2 deletions helm/charts/kratos-selfservice-ui-node/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@ kratosPublicUrl: "http://kratos-public"
# -- Set this to ORY Kratos's public URL accessible from the outside world.
kratosBrowserUrl: "http://kratos-browserui"

# -- The baseUrl
baseUrl: ""
# -- The basePath
basePath: ""

# -- The jwksUrl
jwksUrl: "http://oathkeeper-api"
Expand Down
Loading