Skip to content

Commit 493aa0c

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #1801 from omerap12/issue_1730
helm: add configurable liveness&readiness probes for master topology-updater and worker
2 parents 4e4ccf8 + b2222e2 commit 493aa0c

File tree

5 files changed

+48
-52
lines changed

5 files changed

+48
-52
lines changed

‎deployment/helm/node-feature-discovery/templates/master.yaml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,9 @@ spec:
4646
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
4747
imagePullPolicy: {{ .Values.image.pullPolicy }}
4848
livenessProbe:
49-
grpc:
50-
port: 8082
51-
initialDelaySeconds: 10
52-
periodSeconds: 10
49+
{{- toYaml .Values.master.livenessProbe | nindent 12 }}
5350
readinessProbe:
54-
grpc:
55-
port: 8082
56-
initialDelaySeconds: 5
57-
periodSeconds: 10
58-
failureThreshold: 10
51+
{{- toYaml .Values.master.readinessProbe | nindent 12 }}
5952
ports:
6053
- containerPort: {{ .Values.master.port | default "8080" }}
6154
name: grpc

‎deployment/helm/node-feature-discovery/templates/topologyupdater.yaml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,9 @@ spec:
4343
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
4444
imagePullPolicy: "{{ .Values.image.pullPolicy }}"
4545
livenessProbe:
46-
grpc:
47-
port: 8082
48-
initialDelaySeconds: 10
49-
periodSeconds: 10
46+
{{- toYaml .Values.topologyUpdater.livenessProbe | nindent 10 }}
5047
readinessProbe:
51-
grpc:
52-
port: 8082
53-
initialDelaySeconds: 5
54-
periodSeconds: 10
55-
failureThreshold: 10
48+
{{- toYaml .Values.topologyUpdater.readinessProbe | nindent 10 }}
5649
env:
5750
- name: NODE_NAME
5851
valueFrom:

‎deployment/helm/node-feature-discovery/templates/worker.yaml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,9 @@ spec:
4545
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
4646
imagePullPolicy: {{ .Values.image.pullPolicy }}
4747
livenessProbe:
48-
grpc:
49-
port: 8082
50-
initialDelaySeconds: 10
51-
periodSeconds: 10
48+
{{- toYaml .Values.worker.livenessProbe | nindent 12 }}
5249
readinessProbe:
53-
grpc:
54-
port: 8082
55-
initialDelaySeconds: 5
56-
periodSeconds: 10
57-
failureThreshold: 10
50+
{{- toYaml .Values.worker.readinessProbe | nindent 12 }}
5851
env:
5952
- name: NODE_NAME
6053
valueFrom:

‎deployment/helm/node-feature-discovery/values.yaml

Lines changed: 34 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,19 @@ master:
140140
- key: "node-role.kubernetes.io/control-plane"
141141
operator: In
142142
values: [""]
143+
144+
livenessProbe:
145+
grpc:
146+
port: 8082
147+
initialDelaySeconds: 10
148+
# failureThreshold: 3
149+
# periodSeconds: 10
150+
readinessProbe:
151+
grpc:
152+
port: 8082
153+
initialDelaySeconds: 5
154+
failureThreshold: 10
155+
# periodSeconds: 10
143156

144157
worker:
145158
enable: true
@@ -401,19 +414,18 @@ worker:
401414
runAsNonRoot: true
402415
# runAsUser: 1000
403416

404-
# livenessProbe: {}
405-
## NOTE: Currently not configurable, defaults are provided for the sake of extra documentation.
406-
# grpc:
407-
# port: 8082
408-
# initialDelaySeconds: 10
417+
livenessProbe:
418+
grpc:
419+
port: 8082
420+
initialDelaySeconds: 10
421+
# failureThreshold: 3
409422
# periodSeconds: 10
410-
# readinessProbe: {}
411-
## NOTE: Currently not configurable, defaults are provided for the sake of extra documentation.
412-
# grpc:
413-
# port: 8082
414-
# initialDelaySeconds: 5
423+
readinessProbe:
424+
grpc:
425+
port: 8082
426+
initialDelaySeconds: 5
427+
failureThreshold: 10
415428
# periodSeconds: 10
416-
# failureThreshold: 10
417429

418430
serviceAccount:
419431
# Specifies whether a service account should be created.
@@ -492,20 +504,19 @@ topologyUpdater:
492504
drop: [ "ALL" ]
493505
readOnlyRootFilesystem: true
494506
runAsUser: 0
495-
496-
# livenessProbe: {}
497-
## NOTE: Currently not configurable, defaults are provided for the sake of extra documentation.
498-
# grpc:
499-
# port: 8082
500-
# initialDelaySeconds: 10
507+
508+
livenessProbe:
509+
grpc:
510+
port: 8082
511+
initialDelaySeconds: 10
512+
# failureThreshold: 3
501513
# periodSeconds: 10
502-
# readinessProbe: {}
503-
## NOTE: Currently not configurable, defaults are provided for the sake of extra documentation.
504-
# grpc:
505-
# port: 8082
506-
# initialDelaySeconds: 5
514+
readinessProbe:
515+
grpc:
516+
port: 8082
517+
initialDelaySeconds: 5
518+
failureThreshold: 10
507519
# periodSeconds: 10
508-
# failureThreshold: 10
509520

510521
resources:
511522
limits:

‎docs/deployment/helm.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,8 @@ API's you need to install the prometheus operator in your cluster.
144144
| `master.config` | dict | | NFD master [configuration](../reference/master-configuration-reference) |
145145
| `master.args` | array | [] | Additional [command line arguments](../reference/master-commandline-reference.md) to pass to nfd-master |
146146
| `master.revisionHistoryLimit` | integer | | Specify how many old ReplicaSets for this Deployment you want to retain. [revisionHistoryLimit](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#revision-history-limit) |
147+
| `master.livenessProbe` | dict | {"grpc":{"port":8082},"initialDelaySeconds":10} | NFD master pod [liveness probe](https://kubernetes.io/docs/concepts/configuration/liveness-readiness-startup-probes/#liveness-probe) |
148+
| `master.readinessProbe` | dict | {"grpc":{"port":8082},"initialDelaySeconds":5,"failureThreshold": 10} | NFD master pod [readiness probe](https://kubernetes.io/docs/concepts/configuration/liveness-readiness-startup-probes/#readiness-probe)|
147149

148150
### Worker pod parameters
149151

@@ -168,7 +170,9 @@ API's you need to install the prometheus operator in your cluster.
168170
| `worker.annotations` | dict | {} | NFD worker pod [annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) |
169171
| `worker.daemonsetAnnotations` | dict | {} | NFD worker daemonset [annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) |
170172
| `worker.args` | array | [] | Additional [command line arguments](../reference/worker-commandline-reference.md) to pass to nfd-worker |
171-
| `worker.revisionHistoryLimit` | integer | | Specify how many old ControllerRevisions for this DaemonSet you want to retain. [revisionHistoryLimit](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/daemon-set-v1/#DaemonSetSpec) |
173+
| `worker.revisionHistoryLimit` | integer | | Specify how many old ControllerRevisions for this DaemonSet you want to retain. [revisionHistoryLimit](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/daemon-set-v1/ #DaemonSetSpec) |
174+
| `worker.livenessProbe` | dict | {"grpc":{"port":8082},"initialDelaySeconds":10} | NFD worker pod [liveness probe](https://kubernetes.io/docs/concepts/configuration/liveness-readiness-startup-probes/#liveness-probe) |
175+
| `worker.readinessProbe` | dict | {"grpc":{"port":8082},"initialDelaySeconds":5,"failureThreshold": 10} | NFD worker pod [readiness probe](https://kubernetes.io/docs/concepts/configuration/liveness-readiness-startup-probes/#readiness-probe)|
172176

173177
### Topology updater parameters
174178

@@ -199,7 +203,9 @@ API's you need to install the prometheus operator in your cluster.
199203
| `topologyUpdater.podSetFingerprint` | bool | true | Enables compute and report of pod fingerprint in NRT objects. |
200204
| `topologyUpdater.kubeletStateDir` | string | /var/lib/kubelet | Specifies kubelet state directory path for watching state and checkpoint files. Empty value disables kubelet state tracking. |
201205
| `topologyUpdater.args` | array | [] | Additional [command line arguments](../reference/topology-updater-commandline-reference.md) to pass to nfd-topology-updater |
202-
| `topologyUpdater.revisionHistoryLimit` | integer | | Specify how many old ControllerRevisions for this DaemonSet you want to retain. [revisionHistoryLimit](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/daemon-set-v1/#DaemonSetSpec) |
206+
| `topologyUpdater.revisionHistoryLimit` | integer | | Specify how many old ControllerRevisions for this DaemonSet you want to retain. [revisionHistoryLimit](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/daemon-set-v1/#DaemonSetSpec) |
207+
| `topologyUpdater.livenessProbe` | dict | {"grpc":{"port":8082},"initialDelaySeconds":10} | Topology updater pod [liveness probe](https://kubernetes.io/docs/concepts/configuration/liveness-readiness-startup-probes/#liveness-probe) |
208+
| `topologyUpdater.readinessProbe` | dict | {"grpc":{"port":8082},"initialDelaySeconds":5,"failureThreshold": 10} | Topology updater pod [readiness probe](https://kubernetes.io/docs/concepts/configuration/liveness-readiness-startup-probes/#readiness-probe)|
203209

204210
### Garbage collector parameters
205211

0 commit comments

Comments
 (0)