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

Jump to bottom

Allow oap helm chart to edit liveness/readiness probe #104

Merged
merged 3 commits into from
Dec 5, 2022
Merged

Allow oap helm chart to edit liveness/readiness probe #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f271ef4
Update README.md
zshrine Dec 1, 2022
c2695e0
Make liveness /readiness probe for oap configurable. Discussion #10064
zshrine Dec 2, 2022
7d51994
Merge branch 'apache:master' into master
zshrine Dec 5, 2022
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: 2 additions & 0 deletions chart/skywalking/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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` |
Expand Down
8 changes: 8 additions & 0 deletions chart/skywalking/templates/oap-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
10 changes: 10 additions & 0 deletions chart/skywalking/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {}
Expand Down