diff --git a/.changesets/feat_helm_health_check_path.md b/.changesets/feat_helm_health_check_path.md new file mode 100644 index 0000000000..264ff0f43a --- /dev/null +++ b/.changesets/feat_helm_health_check_path.md @@ -0,0 +1,5 @@ +### Provide helm support for when router's health_check's default path is not being used([Issue #5652](https://github.com/apollographql/router/issues/5652)) + +When helm chart is defining the liveness and readiness check probes, if the router has been configured to use a non-default health_check path, use that rather than the default ( /health ) + +By [Jon Christiansen](https://github.com/theJC) in https://github.com/apollographql/router/pull/5653 \ No newline at end of file diff --git a/helm/chart/router/templates/deployment.yaml b/helm/chart/router/templates/deployment.yaml index e21fff823e..d6af1a19b4 100644 --- a/helm/chart/router/templates/deployment.yaml +++ b/helm/chart/router/templates/deployment.yaml @@ -114,12 +114,12 @@ spec: {{- toYaml .Values.lifecycle | nindent 12 }} livenessProbe: httpGet: - path: "/health?live" + path: {{ (.Values.router.configuration.health_check.path | default "/health") }}{{"?live"}} port: {{ splitList ":" ((index .Values.router.configuration "health_check").listen | default ":8088") | last }} initialDelaySeconds: {{ ((.Values.probes).liveness).initialDelaySeconds | default 0 }} readinessProbe: httpGet: - path: "/health?ready" + path: {{ (.Values.router.configuration.health_check.path | default "/health") }}{{"?ready"}} port: {{ (splitList ":" ((index .Values.router.configuration "health_check").listen | default ":8088")) | last }} initialDelaySeconds: {{ ((.Values.probes).readiness).initialDelaySeconds | default 0 }} resources: