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

ory · Nov 14, 2023 · 7fb19cd · 7fb19cd
1 parent e70d228
commit 7fb19cd
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/hacks/values/kratos-selfservice-ui-node.yaml b/hacks/values/kratos-selfservice-ui-node.yaml
@@ -14,6 +14,8 @@ deployment:
     - name: dummy
       mountPath: /opt/dummy/
 
+basePath: /auth
+
 test:
   busybox:
     repository: docker.io/library/busybox

diff --git a/helm/charts/kratos-selfservice-ui-node/README.md b/helm/charts/kratos-selfservice-ui-node/README.md
@@ -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 |

diff --git a/helm/charts/kratos-selfservice-ui-node/templates/deployment.yaml b/helm/charts/kratos-selfservice-ui-node/templates/deployment.yaml
@@ -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
@@ -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 }}

diff --git a/helm/charts/kratos-selfservice-ui-node/templates/tests/test-connection.yaml b/helm/charts/kratos-selfservice-ui-node/templates/tests/test-connection.yaml
@@ -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
diff --git a/helm/charts/kratos-selfservice-ui-node/values.yaml b/helm/charts/kratos-selfservice-ui-node/values.yaml
@@ -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"