fix: oathkeeper probe endpoints

ory · Dec 11, 2024 · cd55eef · cd55eef
1 parent b8c46ce
commit cd55eef
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 30 deletions.
diff --git a/helm/charts/oathkeeper/README.md b/helm/charts/oathkeeper/README.md
@@ -46,7 +46,6 @@ A Helm chart for deploying ORY Oathkeeper in Kubernetes
 | deployment.extraVolumes | list | `[]` | Extra volumes you can attach to the pod. |
 | deployment.labels | object | `{}` |  |
 | deployment.lifecycle | object | `{}` |  |
-| deployment.livenessProbe | object | `{"failureThreshold":5,"initialDelaySeconds":5,"periodSeconds":10}` | Configure the livenessProbe parameters |
 | deployment.nodeSelector | object | `{}` | Node labels for pod assignment. |
 | deployment.podMetadata | object | `{"annotations":{},"labels":{}}` | Specify pod metadata, this metadata is added directly to the pod, and not higher objects |
 | deployment.podMetadata.annotations | object | `{}` | Extra pod level annotations |

diff --git a/helm/charts/oathkeeper/templates/deployment-controller.yaml b/helm/charts/oathkeeper/templates/deployment-controller.yaml
@@ -146,24 +146,16 @@ spec:
               containerPort: {{ .Values.oathkeeper.config.serve.prometheus.port }}
           lifecycle:
             {{- toYaml .Values.deployment.lifecycle | nindent 12 }}
+          {{- if .Values.deployment.customLivenessProbe }}
           livenessProbe:
-            {{- if .Values.deployment.customLivenessProbe }}
-              {{- toYaml .Values.deployment.customLivenessProbe | nindent 12 }}
-            {{- else }}
-            httpGet:
-              path: /health/alive
-              port: http-api
-              httpHeaders:
-                - name: Host
-                  value: '127.0.0.1'
-            {{- toYaml .Values.deployment.livenessProbe | nindent 12 }}
-            {{- end }}
+            {{- toYaml .Values.deployment.customLivenessProbe | nindent 12 }}
+          {{- end }}
           readinessProbe:
             {{- if .Values.deployment.customReadinessProbe }}
               {{- toYaml .Values.deployment.customReadinessProbe | nindent 12 }}
             {{- else }}
             httpGet:
-              path: /health/ready
+              path: /health/alive
               port: http-api
               httpHeaders:
                 - name: Host

diff --git a/helm/charts/oathkeeper/templates/deployment-sidecar.yaml b/helm/charts/oathkeeper/templates/deployment-sidecar.yaml
@@ -124,24 +124,16 @@ spec:
             - name: http-metrics
               protocol: TCP
               containerPort: {{ .Values.oathkeeper.config.serve.prometheus.port }}
+          {{- if .Values.deployment.customLivenessProbe }}
           livenessProbe:
-            {{- if .Values.deployment.customLivenessProbe }}
-              {{- toYaml .Values.deployment.customLivenessProbe | nindent 12 }}
-            {{- else }}
-            httpGet:
-              path: /health/alive
-              port: http-api
-              httpHeaders:
-                - name: Host
-                  value: '127.0.0.1'
-            {{- toYaml .Values.deployment.livenessProbe | nindent 12 }}
-            {{- end }}
+            {{- toYaml .Values.deployment.customLivenessProbe | nindent 12 }}
+          {{- end }}
           readinessProbe:
             {{- if .Values.deployment.customReadinessProbe }}
               {{- toYaml .Values.deployment.customReadinessProbe | nindent 12 }}
             {{- else }}
             httpGet:
-              path: /health/ready
+              path: /health/alive
               port: http-api
               httpHeaders:
                 - name: Host

diff --git a/helm/charts/oathkeeper/values.yaml b/helm/charts/oathkeeper/values.yaml
@@ -250,11 +250,6 @@ deployment:
   #  memory: 128Mi
 
   lifecycle: {}
-  # -- Configure the livenessProbe parameters
-  livenessProbe:
-    initialDelaySeconds: 5
-    periodSeconds: 10
-    failureThreshold: 5
   # -- Configure the readinessProbe parameters
   readinessProbe:
     initialDelaySeconds: 5