diff --git a/chart/skywalking/README.md b/chart/skywalking/README.md index b83520c..2f4b245 100644 --- a/chart/skywalking/README.md +++ b/chart/skywalking/README.md @@ -60,8 +60,9 @@ The following table lists the configurable parameters of the Skywalking chart an | `oap.nodeSelector` | OAP labels for master pod assignment | `{}` | | `oap.tolerations` | OAP tolerations | `[]` | | `oap.resources` | OAP node resources requests & limits | `{} - cpu limit must be an integer` | -| `oap.livenessProbe` | Configuration fields for the [livenessProbe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/) | `tcpSocket.port: 12800`
`initialDelaySeconds: 15`
`periodSeconds: 20` -| `oap.readinessProbe` | Configuration fields for the [readinessProbe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/) | `tcpSocket.port: 12800`
`initialDelaySeconds: 15`
`periodSeconds: 20` +| `oap.startupProbe` | Configuration fields for the [startupProbe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) | `tcpSocket.port: 12800`
`failureThreshold: 9`
`periodSeconds: 10` +| `oap.livenessProbe` | Configuration fields for the [livenessProbe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) | `tcpSocket.port: 12800`
`initialDelaySeconds: 5`
`periodSeconds: 10` +| `oap.readinessProbe` | Configuration fields for the [readinessProbe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) | `tcpSocket.port: 12800`
`initialDelaySeconds: 5`
`periodSeconds: 10` | `oap.envoy.als.enabled` | Open envoy als | `false` | | `oap.env` | OAP environment variables | `[]` | | `oap.securityContext` | Allows you to set the [securityContext](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) for the pod | `fsGroup: 1000`
`runAsUser: 1000` | diff --git a/chart/skywalking/templates/oap-deployment.yaml b/chart/skywalking/templates/oap-deployment.yaml index 8dc05a9..13ce6d5 100644 --- a/chart/skywalking/templates/oap-deployment.yaml +++ b/chart/skywalking/templates/oap-deployment.yaml @@ -96,8 +96,17 @@ spec: {{ else }} tcpSocket: port: 12800 - initialDelaySeconds: 15 - periodSeconds: 20 + initialDelaySeconds: 5 + periodSeconds: 10 +{{ end }} + startupProbe: +{{- if .Values.oap.startupProbe}} +{{ toYaml .Values.oap.startupProbe | indent 10 }} +{{ else }} + tcpSocket: + port: 12800 + failureThreshold: 9 + periodSeconds: 10 {{ end }} readinessProbe: {{- if .Values.oap.readinessProbe}} @@ -105,8 +114,8 @@ spec: {{ else }} tcpSocket: port: 12800 - initialDelaySeconds: 15 - periodSeconds: 20 + initialDelaySeconds: 5 + periodSeconds: 10 {{ end }} ports: {{- range $key, $value := .Values.oap.ports }} diff --git a/chart/skywalking/values.yaml b/chart/skywalking/values.yaml index ee5d425..55d0b39 100644 --- a/chart/skywalking/values.yaml +++ b/chart/skywalking/values.yaml @@ -56,12 +56,18 @@ oap: livenessProbe: {} # tcpSocket: # port: 12800 - # initialDelaySeconds: 15 + # initialDelaySeconds: 5 # periodSeconds: 20 + startupProbe: {} + # tcpSocket: + # port: 12800 + # failureThreshold: 9 + # periodSeconds: 10 + # intial dealy in case of startup probe is 90 (9 * 10 = 90) seconds in this case. readinessProbe: {} # tcpSocket: # port: 12800 - # initialDelaySeconds: 15 + # initialDelaySeconds: 5 # periodSeconds: 20 # podAnnotations: # example: oap-foo