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: make default probe timers less aggressive #720

Merged
merged 2 commits into from
Dec 11, 2024
Merged

fix: make default probe timers less aggressive #720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8c46ce
fix: make default probe timers less aggressive
Demonsthere Dec 11, 2024
cd55eef
fix: oathkeeper probe endpoints
Demonsthere Dec 11, 2024
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: 1 addition & 1 deletion helm/charts/hydra/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ A Helm chart for deploying ORY Hydra in Kubernetes
| deployment.serviceAccount.annotations | object | `{}` | Annotations to add to the service account |
| deployment.serviceAccount.create | bool | `true` | Specifies whether a service account should be created |
| deployment.serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the fullname template |
| deployment.startupProbe | object | `{"failureThreshold":5,"initialDelaySeconds":0,"periodSeconds":1,"successThreshold":1,"timeoutSeconds":1}` | Default probe timers |
| deployment.startupProbe | object | `{"failureThreshold":5,"initialDelaySeconds":1,"periodSeconds":1,"successThreshold":1,"timeoutSeconds":2}` | Default probe timers |
| deployment.strategy.rollingUpdate.maxSurge | string | `"25%"` | |
| deployment.strategy.rollingUpdate.maxUnavailable | string | `"25%"` | |
| deployment.strategy.type | string | `"RollingUpdate"` | |
Expand Down
4 changes: 2 additions & 2 deletions helm/charts/hydra/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,8 +345,8 @@ deployment:
failureThreshold: 5
successThreshold: 1
periodSeconds: 1
timeoutSeconds: 1
initialDelaySeconds: 0
timeoutSeconds: 2
initialDelaySeconds: 1

automountServiceAccountToken: false

Expand Down
4 changes: 2 additions & 2 deletions helm/charts/keto/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@ Access Control Policies as a Server
| deployment.resources | object | `{}` | |
| deployment.revisionHistoryLimit | int | `5` | Number of revisions kept in history |
| deployment.startupProbe.failureThreshold | int | `5` | |
| deployment.startupProbe.initialDelaySeconds | int | `0` | |
| deployment.startupProbe.initialDelaySeconds | int | `1` | |
| deployment.startupProbe.periodSeconds | int | `1` | |
| deployment.startupProbe.successThreshold | int | `1` | |
| deployment.startupProbe.timeoutSeconds | int | `1` | |
| deployment.startupProbe.timeoutSeconds | int | `2` | |
| deployment.strategy.rollingUpdate.maxSurge | string | `"25%"` | |
| deployment.strategy.rollingUpdate.maxUnavailable | string | `"25%"` | |
| deployment.strategy.type | string | `"RollingUpdate"` | |
Expand Down
4 changes: 2 additions & 2 deletions helm/charts/keto/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,8 +309,8 @@ deployment:
failureThreshold: 5
successThreshold: 1
periodSeconds: 1
timeoutSeconds: 1
initialDelaySeconds: 0
timeoutSeconds: 2
initialDelaySeconds: 1
## -- Configure a custom livenessProbe. This overwrites the default object
customLivenessProbe: {}
## -- Configure a custom readinessProbe. This overwrites the default object
Expand Down
2 changes: 1 addition & 1 deletion helm/charts/kratos/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ A ORY Kratos Helm chart for Kubernetes
| deployment.serviceAccount.annotations | object | `{}` | Annotations to add to the service account |
| deployment.serviceAccount.create | bool | `true` | Specifies whether a service account should be created |
| deployment.serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the fullname template |
| deployment.startupProbe | object | `{"failureThreshold":5,"initialDelaySeconds":0,"periodSeconds":1,"successThreshold":1,"timeoutSeconds":1}` | Configure the startupProbe parameters |
| deployment.startupProbe | object | `{"failureThreshold":5,"initialDelaySeconds":1,"periodSeconds":1,"successThreshold":1,"timeoutSeconds":2}` | Configure the startupProbe parameters |
| deployment.terminationGracePeriodSeconds | int | `60` | |
| deployment.tolerations | list | `[]` | Configure node tolerations. |
| deployment.topologySpreadConstraints | list | `[]` | Configure pod topologySpreadConstraints. |
Expand Down
4 changes: 2 additions & 2 deletions helm/charts/kratos/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,8 +221,8 @@ deployment:
failureThreshold: 5
successThreshold: 1
periodSeconds: 1
timeoutSeconds: 1
initialDelaySeconds: 0
timeoutSeconds: 2
initialDelaySeconds: 1

# -- Configure a custom livenessProbe. This overwrites the default object
customLivenessProbe: {}
Expand Down
3 changes: 1 addition & 2 deletions helm/charts/oathkeeper/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand All @@ -57,7 +56,7 @@ A Helm chart for deploying ORY Oathkeeper in Kubernetes
| deployment.serviceAccount.annotations | object | `{}` | Annotations to add to the service account |
| deployment.serviceAccount.create | bool | `true` | Specifies whether a service account should be created |
| deployment.serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the fullname template |
| deployment.startupProbe | object | `{"failureThreshold":60,"periodSeconds":1,"successThreshold":1,"timeoutSeconds":1}` | Configure the startupProbe parameters |
| deployment.startupProbe | object | `{"failureThreshold":5,"initialDelaySeconds":1,"successThreshold":1,"timeoutSeconds":2}` | Configure the startupProbe parameters |
| deployment.strategy.rollingUpdate | object | `{}` | |
| deployment.strategy.type | string | `"RollingUpdate"` | |
| deployment.terminationGracePeriodSeconds | int | `60` | |
Expand Down
16 changes: 4 additions & 12 deletions helm/charts/oathkeeper/templates/deployment-controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 4 additions & 12 deletions helm/charts/oathkeeper/templates/deployment-sidecar.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 3 additions & 8 deletions helm/charts/oathkeeper/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,22 +250,17 @@ deployment:
# memory: 128Mi

lifecycle: {}
# -- Configure the livenessProbe parameters
livenessProbe:
initialDelaySeconds: 5
periodSeconds: 10
failureThreshold: 5
# -- Configure the readinessProbe parameters
readinessProbe:
initialDelaySeconds: 5
periodSeconds: 10
failureThreshold: 5
# -- Configure the startupProbe parameters
startupProbe:
failureThreshold: 60
failureThreshold: 5
successThreshold: 1
periodSeconds: 1
timeoutSeconds: 1
timeoutSeconds: 2
initialDelaySeconds: 1

# -- Configure a custom livenessProbe. This overwrites the default object
customLivenessProbe: {}
Expand Down
Loading