From ca7204500eaa0ecfbe8c1de0e05700535b77b375 Mon Sep 17 00:00:00 2001 From: John Gardiner Myers Date: Thu, 22 Dec 2022 11:27:27 -0800 Subject: [PATCH] Remove unnecessary configuration in Queue Processor mode (#745) * Remove unnecessary configuration in Queue P rocessor mode * Address review comments --- config/helm/aws-node-termination-handler/README.md | 8 ++++---- .../templates/deployment.yaml | 8 -------- config/helm/aws-node-termination-handler/values.yaml | 10 +++++----- 3 files changed, 9 insertions(+), 17 deletions(-) diff --git a/config/helm/aws-node-termination-handler/README.md b/config/helm/aws-node-termination-handler/README.md index e4809a7a..3e2e74e0 100644 --- a/config/helm/aws-node-termination-handler/README.md +++ b/config/helm/aws-node-termination-handler/README.md @@ -152,10 +152,10 @@ The configuration in this table applies to AWS Node Termination Handler in IMDS | `windowsTolerations` | Override `daemonsetTolerations` for the Linux DaemonSet. | `[]` | | `enableProbesServer` | If `true`, start an http server exposing `/healthz` endpoint for probes. | `false` | | `metadataTries` | The number of times to try requesting metadata. | `3` | -| `enableSpotInterruptionDraining` | If `true`, drain nodes when the spot interruption termination notice is received. | `true` | -| `enableScheduledEventDraining` | If `true`, drain nodes before the maintenance window starts for an EC2 instance scheduled event. | `true` | -| `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` | -| `enableRebalanceDraining` | If `true`, drain nodes when the rebalance recommendation notice is received. | `false` | +| `enableSpotInterruptionDraining` | If `true`, drain nodes when the spot interruption termination notice is received. Only used in IMDS mode. | `true` | +| `enableScheduledEventDraining` | If `true`, drain nodes before the maintenance window starts for an EC2 instance scheduled event. Only used in IMDS mode. | `true` | +| `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` | +| `enableRebalanceDraining` | If `true`, drain nodes when the rebalance recommendation notice is received. Only used in IMDS mode. | `false` | ### Testing Configuration diff --git a/config/helm/aws-node-termination-handler/templates/deployment.yaml b/config/helm/aws-node-termination-handler/templates/deployment.yaml index eeecafb7..3024e42f 100644 --- a/config/helm/aws-node-termination-handler/templates/deployment.yaml +++ b/config/helm/aws-node-termination-handler/templates/deployment.yaml @@ -146,14 +146,6 @@ spec: - name: WEBHOOK_TEMPLATE value: {{ .Values.webhookTemplate | quote }} {{- end }} - - name: ENABLE_SPOT_INTERRUPTION_DRAINING - value: {{ .Values.enableSpotInterruptionDraining | quote }} - - name: ENABLE_SCHEDULED_EVENT_DRAINING - value: {{ .Values.enableScheduledEventDraining | quote }} - - name: ENABLE_REBALANCE_MONITORING - value: {{ .Values.enableRebalanceMonitoring | quote }} - - name: ENABLE_REBALANCE_DRAINING - value: {{ .Values.enableRebalanceDraining | quote }} - name: ENABLE_SQS_TERMINATION_DRAINING value: "true" {{- with .Values.awsRegion }} diff --git a/config/helm/aws-node-termination-handler/values.yaml b/config/helm/aws-node-termination-handler/values.yaml index 62a94c1e..4ec9e1dd 100644 --- a/config/helm/aws-node-termination-handler/values.yaml +++ b/config/helm/aws-node-termination-handler/values.yaml @@ -259,22 +259,22 @@ daemonsetTolerations: linuxTolerations: [] windowsTolerations: [] -# If the probes server is running for the Daemonset +# If the probes server is running. enableProbesServer: false # Total number of times to try making the metadata request before failing. metadataTries: 3 -# enableSpotInterruptionDraining If false, do not drain nodes when the spot interruption termination notice is received +# enableSpotInterruptionDraining If false, do not drain nodes when the spot interruption termination notice is received. Only used in IMDS mode. enableSpotInterruptionDraining: true -# enableScheduledEventDraining If false, do not drain nodes before the maintenance window starts for an EC2 instance scheduled event +# enableScheduledEventDraining If false, do not drain nodes before the maintenance window starts for an EC2 instance scheduled event. Only used in IMDS mode. enableScheduledEventDraining: true -# enableRebalanceMonitoring If true, cordon nodes when the rebalance recommendation notice is received +# enableRebalanceMonitoring If true, cordon nodes when the rebalance recommendation notice is received. Only used in IMDS mode. enableRebalanceMonitoring: false -# enableRebalanceDraining If true, drain nodes when the rebalance recommendation notice is received +# enableRebalanceDraining If true, drain nodes when the rebalance recommendation notice is received. Only used in IMDS mode. enableRebalanceDraining: false # ---------------------------------------------------------------------------------------------------------------------