Skip to content

Commit ad187b5

Browse files
committed
feat: add customizable health probe configuration for helm chart
By adding `healthProbe.useCustomProbeConfig` flag to enable custom `grpc-health-probe` timeouts and `initialDelaySeconds` for both `liveness` and `readiness` probes while maintaining backward compatibility. Add healthProbe.useCustomProbeConfig flag to enable custom grpc-health-probe timeouts and initialDelaySeconds for liveness and readiness probes while maintaining backward compatibility.
1 parent 85eff56 commit ad187b5

File tree

3 files changed

+40
-0
lines changed

3 files changed

+40
-0
lines changed

charts/aws-vpc-cni/README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,13 @@ The following table lists the configurable parameters for this chart and their d
103103
| `serviceAccount.annotations` | Specifies the annotations for ServiceAccount | `{}` |
104104
| `livenessProbe` | Livenness probe settings for daemonset | (see `values.yaml`) |
105105
| `readinessProbe` | Readiness probe settings for daemonset | (see `values.yaml`) |
106+
| `healthProbe.useCustomProbeConfig` | Enable customizable probe configuration (connect-timeout, rpc-timeout, initialDelaySeconds) | `false` |
107+
| `healthProbe.livenessProbe.connectTimeout` | Connect timeout for liveness probe grpc calls | `5s` |
108+
| `healthProbe.livenessProbe.rpcTimeout` | RPC timeout for liveness probe grpc calls | `5s` |
109+
| `healthProbe.livenessProbe.initialDelaySeconds` | Initial delay for liveness probe | `60` |
110+
| `healthProbe.readinessProbe.connectTimeout` | Connect timeout for readiness probe grpc calls | `5s` |
111+
| `healthProbe.readinessProbe.rpcTimeout` | RPC timeout for readiness probe grpc calls | `5s` |
112+
| `healthProbe.readinessProbe.initialDelaySeconds` | Initial delay for readiness probe | `1` |
106113
| `tolerations` | Optional deployment tolerations | `[{"operator": "Exists"}]` |
107114
| `updateStrategy` | Optional update strategy | `type: RollingUpdate` |
108115

charts/aws-vpc-cni/templates/daemonset.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,30 @@ spec:
7474
- containerPort: 61678
7575
name: metrics
7676
livenessProbe:
77+
{{- if .Values.healthProbe.useCustomProbeConfig }}
78+
exec:
79+
command:
80+
- /app/grpc-health-probe
81+
- '-addr=:50051'
82+
- '-connect-timeout={{ .Values.healthProbe.livenessProbe.connectTimeout }}'
83+
- '-rpc-timeout={{ .Values.healthProbe.livenessProbe.rpcTimeout }}'
84+
initialDelaySeconds: {{ .Values.healthProbe.livenessProbe.initialDelaySeconds }}
85+
{{- else }}
7786
{{ toYaml .Values.livenessProbe | indent 12 }}
87+
{{- end }}
7888
timeoutSeconds: {{ .Values.livenessProbeTimeoutSeconds }}
7989
readinessProbe:
90+
{{- if .Values.healthProbe.useCustomProbeConfig }}
91+
exec:
92+
command:
93+
- /app/grpc-health-probe
94+
- '-addr=:50051'
95+
- '-connect-timeout={{ .Values.healthProbe.readinessProbe.connectTimeout }}'
96+
- '-rpc-timeout={{ .Values.healthProbe.readinessProbe.rpcTimeout }}'
97+
initialDelaySeconds: {{ .Values.healthProbe.readinessProbe.initialDelaySeconds }}
98+
{{- else }}
8099
{{ toYaml .Values.readinessProbe | indent 12 }}
100+
{{- end }}
81101
timeoutSeconds: {{ .Values.readinessProbeTimeoutSeconds }}
82102
env:
83103
{{- range $key, $value := .Values.env }}

charts/aws-vpc-cni/values.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,19 @@ serviceAccount:
164164
annotations: {}
165165
# To set annotations - serviceAccount.annotations."eks\.amazonaws\.com/role-arn"=arn:aws:iam::<AWS_ACCOUNT_ID>:<IAM_ROLE_NAME>
166166

167+
# Health probe timeout settings
168+
healthProbe:
169+
# Set "useCustomProbeConfig" to true to use customizable probe configuration
170+
useCustomProbeConfig: false
171+
livenessProbe:
172+
connectTimeout: "5s"
173+
rpcTimeout: "5s"
174+
initialDelaySeconds: 60
175+
readinessProbe:
176+
connectTimeout: "5s"
177+
rpcTimeout: "5s"
178+
initialDelaySeconds: 1
179+
167180
livenessProbe:
168181
exec:
169182
command:

0 commit comments

Comments
 (0)