diff --git a/helm/charts/hydra/README.md b/helm/charts/hydra/README.md index 6f66de759..a39fa12de 100644 --- a/helm/charts/hydra/README.md +++ b/helm/charts/hydra/README.md @@ -72,7 +72,6 @@ A Helm chart for deploying ORY Hydra in Kubernetes | deployment.initContainerSecurityContext | object | `{}` | | | deployment.labels | object | `{}` | Set custom deployment level labels | | deployment.lifecycle | object | `{}` | | -| deployment.livenessProbe | object | `{"failureThreshold":5,"initialDelaySeconds":5,"periodSeconds":10}` | Default probe timers | | 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 | @@ -99,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":60,"periodSeconds":1,"successThreshold":1,"timeoutSeconds":1}` | Default probe timers | +| deployment.startupProbe | object | `{"failureThreshold":5,"initialDelaySeconds":0,"periodSeconds":1,"successThreshold":1,"timeoutSeconds":1}` | Default probe timers | | deployment.strategy.rollingUpdate.maxSurge | string | `"25%"` | | | deployment.strategy.rollingUpdate.maxUnavailable | string | `"25%"` | | | deployment.strategy.type | string | `"RollingUpdate"` | | diff --git a/helm/charts/hydra/templates/deployment.yaml b/helm/charts/hydra/templates/deployment.yaml index c67aee8c2..fa266bd43 100644 --- a/helm/charts/hydra/templates/deployment.yaml +++ b/helm/charts/hydra/templates/deployment.yaml @@ -93,24 +93,16 @@ spec: - name: http-admin containerPort: {{ .Values.hydra.config.serve.admin.port }} protocol: TCP + {{- if .Values.deployment.customLivenessProbe }} livenessProbe: - {{- if .Values.deployment.customLivenessProbe }} - {{- toYaml .Values.deployment.customLivenessProbe | nindent 12 }} - {{- else }} - httpGet: - path: /health/alive - port: {{ .Values.hydra.config.serve.admin.port }} - 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 }} + {{- if .Values.deployment.customReadinessProbe }} {{- toYaml .Values.deployment.customReadinessProbe | nindent 12 }} {{- else }} httpGet: - path: /health/ready + path: /health/alive port: {{ .Values.hydra.config.serve.admin.port }} httpHeaders: - name: Host diff --git a/helm/charts/hydra/values.yaml b/helm/charts/hydra/values.yaml index 49159482e..9600c16b7 100644 --- a/helm/charts/hydra/values.yaml +++ b/helm/charts/hydra/values.yaml @@ -336,21 +336,17 @@ deployment: behavior: {} # -- Default probe timers - livenessProbe: - initialDelaySeconds: 5 - periodSeconds: 10 - failureThreshold: 5 - # -- Default probe timers readinessProbe: initialDelaySeconds: 5 periodSeconds: 10 failureThreshold: 5 # -- Default probe timers startupProbe: - failureThreshold: 60 + failureThreshold: 5 successThreshold: 1 periodSeconds: 1 timeoutSeconds: 1 + initialDelaySeconds: 0 automountServiceAccountToken: false diff --git a/helm/charts/keto/README.md b/helm/charts/keto/README.md index d50b14b82..c8672b276 100644 --- a/helm/charts/keto/README.md +++ b/helm/charts/keto/README.md @@ -47,9 +47,6 @@ Access Control Policies as a Server | deployment.extraVolumeMounts | list | `[]` | Array of extra VolumeMounts to be added to the deployment. K8s format expected - name: my-volume mountPath: /etc/secrets/my-secret readOnly: true | | deployment.extraVolumes | list | `[]` | Array of extra Volumes to be added to the deployment. K8s format expected - name: my-volume secret: secretName: my-secret | | deployment.lifecycle | object | `{}` | | -| deployment.livenessProbe.failureThreshold | int | `5` | | -| deployment.livenessProbe.initialDelaySeconds | int | `5` | | -| deployment.livenessProbe.periodSeconds | int | `10` | | | deployment.minReadySeconds | int | `0` | | | deployment.nodeSelector | object | `{}` | | | deployment.podAnnotations | object | `{}` | | @@ -61,7 +58,8 @@ Access Control Policies as a Server | deployment.readinessProbe.periodSeconds | int | `10` | | | deployment.resources | object | `{}` | | | deployment.revisionHistoryLimit | int | `5` | Number of revisions kept in history | -| deployment.startupProbe.failureThreshold | int | `60` | | +| deployment.startupProbe.failureThreshold | int | `5` | | +| deployment.startupProbe.initialDelaySeconds | int | `0` | | | deployment.startupProbe.periodSeconds | int | `1` | | | deployment.startupProbe.successThreshold | int | `1` | | | deployment.startupProbe.timeoutSeconds | int | `1` | | diff --git a/helm/charts/keto/templates/deployment.yaml b/helm/charts/keto/templates/deployment.yaml index 1ca009436..c29586a76 100644 --- a/helm/charts/keto/templates/deployment.yaml +++ b/helm/charts/keto/templates/deployment.yaml @@ -147,24 +147,16 @@ spec: {{- end }} 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: {{ .Values.keto.config.serve.write.port }} - httpHeaders: - - name: Host - value: '127.0.0.1' - {{- toYaml $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: {{ .Values.keto.config.serve.write.port }} httpHeaders: - name: Host diff --git a/helm/charts/keto/values.yaml b/helm/charts/keto/values.yaml index f52cb1a75..8933bdedd 100644 --- a/helm/charts/keto/values.yaml +++ b/helm/charts/keto/values.yaml @@ -294,21 +294,17 @@ deployment: lifecycle: {} ## -- Default probe timers - livenessProbe: - initialDelaySeconds: 5 - periodSeconds: 10 - failureThreshold: 5 - ## -- Default probe timers readinessProbe: initialDelaySeconds: 5 periodSeconds: 10 failureThreshold: 5 ## -- Default probe timers startupProbe: - failureThreshold: 60 + failureThreshold: 5 successThreshold: 1 periodSeconds: 1 timeoutSeconds: 1 + initialDelaySeconds: 0 ## -- Configure a custom livenessProbe. This overwrites the default object customLivenessProbe: {} ## -- Configure a custom readinessProbe. This overwrites the default object diff --git a/helm/charts/kratos/README.md b/helm/charts/kratos/README.md index 65a946243..f3e0f02ef 100644 --- a/helm/charts/kratos/README.md +++ b/helm/charts/kratos/README.md @@ -57,7 +57,6 @@ A ORY Kratos Helm chart for Kubernetes | deployment.extraVolumes | list | `[]` | If you want to mount external volume For example, mount a secret containing Certificate root CA to verify database TLS connection. | | 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 | @@ -76,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":60,"periodSeconds":1,"successThreshold":1,"timeoutSeconds":1}` | Configure the startupProbe parameters | +| deployment.startupProbe | object | `{"failureThreshold":5,"initialDelaySeconds":0,"periodSeconds":1,"successThreshold":1,"timeoutSeconds":1}` | Configure the startupProbe parameters | | deployment.terminationGracePeriodSeconds | int | `60` | | | deployment.tolerations | list | `[]` | Configure node tolerations. | | deployment.topologySpreadConstraints | list | `[]` | Configure pod topologySpreadConstraints. | diff --git a/helm/charts/kratos/templates/deployment-kratos.yaml b/helm/charts/kratos/templates/deployment-kratos.yaml index b5e929a88..be8b3b6e0 100644 --- a/helm/charts/kratos/templates/deployment-kratos.yaml +++ b/helm/charts/kratos/templates/deployment-kratos.yaml @@ -210,24 +210,16 @@ spec: protocol: TCP lifecycle: {{- toYaml .Values.deployment.lifecycle | nindent 12 }} - livenessProbe: {{- if .Values.deployment.customLivenessProbe }} + livenessProbe: {{- toYaml .Values.deployment.customLivenessProbe | nindent 12 }} - {{- else }} - httpGet: - path: /admin/health/alive - port: {{ .Values.kratos.config.serve.admin.port }} - httpHeaders: - - name: Host - value: '127.0.0.1' - {{- toYaml .Values.deployment.livenessProbe | nindent 12 }} {{- end }} readinessProbe: {{- if .Values.deployment.customReadinessProbe }} {{- toYaml .Values.deployment.customReadinessProbe | nindent 12 }} {{- else }} httpGet: - path: /admin/health/ready + path: /admin/health/alive port: {{ .Values.kratos.config.serve.admin.port }} httpHeaders: - name: Host diff --git a/helm/charts/kratos/values.yaml b/helm/charts/kratos/values.yaml index 2ef50221d..8e076398f 100644 --- a/helm/charts/kratos/values.yaml +++ b/helm/charts/kratos/values.yaml @@ -211,11 +211,6 @@ kratos: ## -- Configuration options for the k8s deployment deployment: lifecycle: {} - # -- Configure the livenessProbe parameters - livenessProbe: - initialDelaySeconds: 5 - periodSeconds: 10 - failureThreshold: 5 # -- Configure the readinessProbe parameters readinessProbe: initialDelaySeconds: 5 @@ -223,10 +218,11 @@ deployment: failureThreshold: 5 # -- Configure the startupProbe parameters startupProbe: - failureThreshold: 60 + failureThreshold: 5 successThreshold: 1 periodSeconds: 1 timeoutSeconds: 1 + initialDelaySeconds: 0 # -- Configure a custom livenessProbe. This overwrites the default object customLivenessProbe: {}