Skip to content

Commit 9f2b20b

Browse files
johngmyersjohngmyers
committed
Remove unnecessary configuration in Queue Processor mode
1 parent c3e411b commit 9f2b20b

File tree

3 files changed

+10
-22
lines changed

3 files changed

+10
-22
lines changed

‎config/helm/aws-node-termination-handler/README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -150,12 +150,12 @@ The configuration in this table applies to AWS Node Termination Handler in IMDS
150150
| `daemonsetTolerations` | Tolerations for DaemonSet pod assignment. For backwards compatibility the `tolerations` has priority over this but shouldn't be used. | `[]` |
151151
| `linuxTolerations` | Override `daemonsetTolerations` for the Linux DaemonSet. | `[]` |
152152
| `windowsTolerations` | Override `daemonsetTolerations` for the Linux DaemonSet. | `[]` |
153-
| `enableProbesServer` | If `true`, start an http server exposing `/healthz` endpoint for probes. | `false` |
153+
| `enableProbesServer` | If `true`, start an http server exposing `/healthz` endpoint for probes. Only used in IMDS mode. | `false` |
154154
| `metadataTries` | The number of times to try requesting metadata. | `3` |
155-
| `enableSpotInterruptionDraining` | If `true`, drain nodes when the spot interruption termination notice is received. | `true` |
156-
| `enableScheduledEventDraining` | If `true`, drain nodes before the maintenance window starts for an EC2 instance scheduled event. | `true` |
157-
| `enableRebalanceMonitoring` | If `true`, cordon nodes when the rebalance recommendation notice is received. If you'd like to drain the node in addition to cordoning, then also set `enableRebalanceDraining`. | `false` |
158-
| `enableRebalanceDraining` | If `true`, drain nodes when the rebalance recommendation notice is received. | `false` |
155+
| `enableSpotInterruptionDraining` | If `true`, drain nodes when the spot interruption termination notice is received. Only used in IMDS mode. | `true` |
156+
| `enableScheduledEventDraining` | If `true`, drain nodes before the maintenance window starts for an EC2 instance scheduled event. Only used in IMDS mode. | `true` |
157+
| `enableRebalanceMonitoring` | If `true`, cordon nodes when the rebalance recommendation notice is received. If you'd like to drain the node in addition to cordoning, then also set `enableRebalanceDraining`. Only used in IMDS mode. | `false` |
158+
| `enableRebalanceDraining` | If `true`, drain nodes when the rebalance recommendation notice is received. Only used in IMDS mode. | `false` |
159159

160160
### Testing Configuration
161161

‎config/helm/aws-node-termination-handler/templates/deployment.yaml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,6 @@ spec:
6464
valueFrom:
6565
fieldRef:
6666
fieldPath: metadata.name
67-
- name: NAMESPACE
68-
valueFrom:
69-
fieldRef:
70-
fieldPath: metadata.namespace
7167
- name: ENABLE_PROBES_SERVER
7268
value: "true"
7369
- name: PROBES_SERVER_PORT
@@ -146,14 +142,6 @@ spec:
146142
- name: WEBHOOK_TEMPLATE
147143
value: {{ .Values.webhookTemplate | quote }}
148144
{{- end }}
149-
- name: ENABLE_SPOT_INTERRUPTION_DRAINING
150-
value: {{ .Values.enableSpotInterruptionDraining | quote }}
151-
- name: ENABLE_SCHEDULED_EVENT_DRAINING
152-
value: {{ .Values.enableScheduledEventDraining | quote }}
153-
- name: ENABLE_REBALANCE_MONITORING
154-
value: {{ .Values.enableRebalanceMonitoring | quote }}
155-
- name: ENABLE_REBALANCE_DRAINING
156-
value: {{ .Values.enableRebalanceDraining | quote }}
157145
- name: ENABLE_SQS_TERMINATION_DRAINING
158146
value: "true"
159147
{{- with .Values.awsRegion }}

‎config/helm/aws-node-termination-handler/values.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -259,22 +259,22 @@ daemonsetTolerations:
259259
linuxTolerations: []
260260
windowsTolerations: []
261261

262-
# If the probes server is running for the Daemonset
262+
# If the probes server is running for the Daemonset. Only used in IMDS mode.
263263
enableProbesServer: false
264264

265265
# Total number of times to try making the metadata request before failing.
266266
metadataTries: 3
267267

268-
# enableSpotInterruptionDraining If false, do not drain nodes when the spot interruption termination notice is received
268+
# enableSpotInterruptionDraining If false, do not drain nodes when the spot interruption termination notice is received. Only used in IMDS mode.
269269
enableSpotInterruptionDraining: true
270270

271-
# enableScheduledEventDraining If false, do not drain nodes before the maintenance window starts for an EC2 instance scheduled event
271+
# enableScheduledEventDraining If false, do not drain nodes before the maintenance window starts for an EC2 instance scheduled event. Only used in IMDS mode.
272272
enableScheduledEventDraining: true
273273

274-
# enableRebalanceMonitoring If true, cordon nodes when the rebalance recommendation notice is received
274+
# enableRebalanceMonitoring If true, cordon nodes when the rebalance recommendation notice is received. Only used in IMDS mode.
275275
enableRebalanceMonitoring: false
276276

277-
# enableRebalanceDraining If true, drain nodes when the rebalance recommendation notice is received
277+
# enableRebalanceDraining If true, drain nodes when the rebalance recommendation notice is received. Only used in IMDS mode.
278278
enableRebalanceDraining: false
279279

280280
# ---------------------------------------------------------------------------------------------------------------------

0 commit comments

Comments
 (0)