Fix readinessProbe and livenessProbe when authnUrl containes path

keratin · Apr 4, 2020 · 27027ac · 27027ac
1 parent 274106a
commit 27027ac
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/keratin-authn-server/Chart.yaml b/keratin-authn-server/Chart.yaml
@@ -5,7 +5,7 @@ home: https://keratin.tech
 icon: https://keratin.tech/pangolin-logo-dark.gif
 
 type: application
-version: 0.2.1
+version: 0.2.2
 appVersion: 1.8.0
 maintainers:
   - email: [email protected]

diff --git a/keratin-authn-server/templates/_helpers.tpl b/keratin-authn-server/templates/_helpers.tpl
@@ -69,6 +69,14 @@ Redis master connection string
 {{- printf "mysql://%s-%s:3306/0" .Release.Name  "-database" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
+{{- define "urlPath" -}}
+{{ mustRegexReplaceAll "https?://([^/]*)(/.*)?" . "${2}" | trimSuffix "/" }}
+{{- end -}}
+
+{{- define "urlHost" -}}
+{{ mustRegexReplaceAll "https?://([^/]*)(/.*)?" . "${1}" }}
+{{- end -}}
+
 {{- define "envs" -}}
             {{- if $.Values.envFromSecret }}
               {{- range $key, $value := $.Values.envFromSecret }}

diff --git a/keratin-authn-server/templates/deployment.yaml b/keratin-authn-server/templates/deployment.yaml
@@ -44,19 +44,18 @@ spec:
               protocol: TCP
           livenessProbe:
             httpGet:
-              path: /health
+              path: {{ include "urlPath" .Values.appSettings.authnUrl }}/health
               port: http
               httpHeaders:
                 - name: Host
-                  value:  {{ .Values.appSettings.authnUrl | quote }}
+                  value: {{ include "urlHost" .Values.appSettings.authnUrl }}
           readinessProbe:
             httpGet:
-              path: /health
+              path:  {{ include "urlPath" .Values.appSettings.authnUrl }}/health
               port: http
               httpHeaders:
                 - name: Host
-                  value:  {{ .Values.appSettings.authnUrl | quote }}
-
+                  value:  {{ include "urlHost" .Values.appSettings.authnUrl }}
           env:
             {{- include "envs" . }}