This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-kubernetes.git
The following commit(s) were added to refs/heads/master by this push:
new 396ad22 Allow oap helm chart to edit liveness/readiness probe (#104)
396ad22 is described below
commit 396ad223fec0c8de5d94f9e49a414a3956c1f98d
Author: zshrine <[email protected]>
AuthorDate: Mon Dec 5 11:08:37 2022 +0800
Allow oap helm chart to edit liveness/readiness probe (#104)
---
chart/skywalking/README.md | 2 ++
chart/skywalking/templates/oap-deployment.yaml | 8 ++++++++
chart/skywalking/values.yaml | 10 ++++++++++
3 files changed, 20 insertions(+)
diff --git a/chart/skywalking/README.md b/chart/skywalking/README.md
index beb55cd..3701fc6 100644
--- a/chart/skywalking/README.md
+++ b/chart/skywalking/README.md
@@ -58,6 +58,8 @@ 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` <br> `initialDelaySeconds: 15` <br> `periodSeconds:
20`
+| `oap.readinessProbe` | Configuration
fields for the
[readinessProbe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/)
| `tcpSocket.port: 12800` <br> `initialDelaySeconds: 15` <br> `periodSeconds:
20`
| `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`<br>`runAsUser: 1000` |
diff --git a/chart/skywalking/templates/oap-deployment.yaml
b/chart/skywalking/templates/oap-deployment.yaml
index 58b5a97..2b20091 100644
--- a/chart/skywalking/templates/oap-deployment.yaml
+++ b/chart/skywalking/templates/oap-deployment.yaml
@@ -91,15 +91,23 @@ spec:
image: {{ .Values.oap.image.repository }}:{{ required "oap.image.tag
is required" .Values.oap.image.tag }}
imagePullPolicy: {{ .Values.oap.image.pullPolicy }}
livenessProbe:
+{{- if .Values.oap.livenessProbe}}
+{{ toYaml .Values.oap.livenessProbe | indent 10 }}
+{{ else }}
tcpSocket:
port: 12800
initialDelaySeconds: 15
periodSeconds: 20
+{{ end }}
readinessProbe:
+{{- if .Values.oap.readinessProbe}}
+{{ toYaml .Values.oap.readinessProbe | indent 10 }}
+{{ else }}
tcpSocket:
port: 12800
initialDelaySeconds: 15
periodSeconds: 20
+{{ end }}
ports:
{{- range $key, $value := .Values.oap.ports }}
- containerPort: {{ $value }}
diff --git a/chart/skywalking/values.yaml b/chart/skywalking/values.yaml
index 13fb6ed..96d08a6 100644
--- a/chart/skywalking/values.yaml
+++ b/chart/skywalking/values.yaml
@@ -57,6 +57,16 @@ oap:
# requests:
# cpu: 8
# memory: 4Gi
+ livenessProbe: {}
+ # tcpSocket:
+ # port: 12800
+ # initialDelaySeconds: 15
+ # periodSeconds: 20
+ readinessProbe: {}
+ # tcpSocket:
+ # port: 12800
+ # initialDelaySeconds: 15
+ # periodSeconds: 20
# podAnnotations:
# example: oap-foo
securityContext: {}
