From 425c3051f5b3b537c5247c00ebdd69bcd714b2e7 Mon Sep 17 00:00:00 2001 From: Marcus Noble Date: Mon, 19 Jul 2021 10:59:15 +0100 Subject: [PATCH 1/2] fix(chart): added missing livenessProbe --- config/helm/aws-node-termination-handler/Chart.yaml | 2 +- .../templates/daemonset.linux.yaml | 4 ++++ .../templates/daemonset.windows.yaml | 4 ++++ .../aws-node-termination-handler/templates/deployment.yaml | 4 ++++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/config/helm/aws-node-termination-handler/Chart.yaml b/config/helm/aws-node-termination-handler/Chart.yaml index 00aa1f2b..949f2c1a 100644 --- a/config/helm/aws-node-termination-handler/Chart.yaml +++ b/config/helm/aws-node-termination-handler/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: aws-node-termination-handler description: A Helm chart for the AWS Node Termination Handler -version: 0.15.1 +version: 0.15.2 appVersion: 1.13.1 home: https://github.com/aws/eks-charts icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png diff --git a/config/helm/aws-node-termination-handler/templates/daemonset.linux.yaml b/config/helm/aws-node-termination-handler/templates/daemonset.linux.yaml index 4576aeba..62c5e004 100644 --- a/config/helm/aws-node-termination-handler/templates/daemonset.linux.yaml +++ b/config/helm/aws-node-termination-handler/templates/daemonset.linux.yaml @@ -197,6 +197,10 @@ spec: name: liveness-probe protocol: TCP {{- end }} + {{- if .Values.enableProbesServer }} + livenessProbe: + {{- toYaml .Values.probes | nindent 12 }} + {{- end }} nodeSelector: {{ include "aws-node-termination-handler.nodeSelectorTermsOs" . }}: linux {{- with .Values.nodeSelector }} diff --git a/config/helm/aws-node-termination-handler/templates/daemonset.windows.yaml b/config/helm/aws-node-termination-handler/templates/daemonset.windows.yaml index 2e82c946..60aa13b5 100644 --- a/config/helm/aws-node-termination-handler/templates/daemonset.windows.yaml +++ b/config/helm/aws-node-termination-handler/templates/daemonset.windows.yaml @@ -167,6 +167,10 @@ spec: name: liveness-probe protocol: TCP {{- end }} + {{- if .Values.enableProbesServer }} + livenessProbe: + {{- toYaml .Values.probes | nindent 12 }} + {{- end }} nodeSelector: {{ include "aws-node-termination-handler.nodeSelectorTermsOs" . }}: windows {{- with .Values.nodeSelector }} diff --git a/config/helm/aws-node-termination-handler/templates/deployment.yaml b/config/helm/aws-node-termination-handler/templates/deployment.yaml index 9a666a7f..70bdd95b 100644 --- a/config/helm/aws-node-termination-handler/templates/deployment.yaml +++ b/config/helm/aws-node-termination-handler/templates/deployment.yaml @@ -169,6 +169,10 @@ spec: name: liveness-probe protocol: TCP {{- end }} + {{- if .Values.enableProbesServer }} + livenessProbe: + {{- toYaml .Values.probes | nindent 12 }} + {{- end }} nodeSelector: {{ include "aws-node-termination-handler.nodeSelectorTermsOs" . }}: linux {{- with .Values.nodeSelector }} From 71edbf06260118405edf77361d6c9e9cfe7368c4 Mon Sep 17 00:00:00 2001 From: Marcus Noble Date: Thu, 22 Jul 2021 05:57:59 +0100 Subject: [PATCH 2/2] fix: remove version bump --- config/helm/aws-node-termination-handler/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/helm/aws-node-termination-handler/Chart.yaml b/config/helm/aws-node-termination-handler/Chart.yaml index 949f2c1a..00aa1f2b 100644 --- a/config/helm/aws-node-termination-handler/Chart.yaml +++ b/config/helm/aws-node-termination-handler/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: aws-node-termination-handler description: A Helm chart for the AWS Node Termination Handler -version: 0.15.2 +version: 0.15.1 appVersion: 1.13.1 home: https://github.com/aws/eks-charts icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png