From c57ffc075cdf1cf3ffb2f12c042ba39e6d87af3e Mon Sep 17 00:00:00 2001 From: Steven Pall Date: Tue, 29 May 2018 12:12:43 -0400 Subject: [PATCH 1/3] [incubator/kube-spot-termination-notice-handler] Add Support for Tolerations - Add tolerations section to daemonset template - Add tolerations section to values file (with example configs) --- incubator/kube-spot-termination-notice-handler/Chart.yaml | 2 +- .../templates/daemonset.yaml | 6 ++++++ incubator/kube-spot-termination-notice-handler/values.yaml | 6 ++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/incubator/kube-spot-termination-notice-handler/Chart.yaml b/incubator/kube-spot-termination-notice-handler/Chart.yaml index 1f223ef9310b..218831394d65 100644 --- a/incubator/kube-spot-termination-notice-handler/Chart.yaml +++ b/incubator/kube-spot-termination-notice-handler/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: Watch and action AWS spot termination events name: kube-spot-termination-notice-handler -version: 0.2.1 +version: 0.2.2 appVersion: 1.8.1-1 home: https://github.com/egeland/kube-spot-termination-notice-handler source: diff --git a/incubator/kube-spot-termination-notice-handler/templates/daemonset.yaml b/incubator/kube-spot-termination-notice-handler/templates/daemonset.yaml index ada4246ff962..2925491c911d 100644 --- a/incubator/kube-spot-termination-notice-handler/templates/daemonset.yaml +++ b/incubator/kube-spot-termination-notice-handler/templates/daemonset.yaml @@ -46,3 +46,9 @@ spec: nodeSelector: {{ toYaml .Values.nodeSelector | indent 8 }} {{- end }} +{{- if .Values.tolerations }} + tolerations: + - {{- range $key, $value := .Values.tolerations }} +{{- end }} +{{ toYaml .Values.tolerations | indent 8 }} +{{- end }} diff --git a/incubator/kube-spot-termination-notice-handler/values.yaml b/incubator/kube-spot-termination-notice-handler/values.yaml index d73e54829c2e..3de537a8e1d0 100644 --- a/incubator/kube-spot-termination-notice-handler/values.yaml +++ b/incubator/kube-spot-termination-notice-handler/values.yaml @@ -40,3 +40,9 @@ serviceAccount: # The name of the service account to use. # If not set and create is true, a name is generated using the fullname template name: + +tolerations: {} + # key: "dedicated" + # operator: "Equal" + # value: "gpu" + # effect: "NoSchedule" From f0ce07b69c29f4e68f136e74040eac92660ee79b Mon Sep 17 00:00:00 2001 From: Steven Pall Date: Tue, 3 Jul 2018 12:32:26 -0400 Subject: [PATCH 2/3] Make requested changes --- incubator/kube-spot-termination-notice-handler/Chart.yaml | 2 +- .../templates/daemonset.yaml | 4 +--- incubator/kube-spot-termination-notice-handler/values.yaml | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/incubator/kube-spot-termination-notice-handler/Chart.yaml b/incubator/kube-spot-termination-notice-handler/Chart.yaml index 218831394d65..a9ab5a94abc4 100644 --- a/incubator/kube-spot-termination-notice-handler/Chart.yaml +++ b/incubator/kube-spot-termination-notice-handler/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: Watch and action AWS spot termination events name: kube-spot-termination-notice-handler -version: 0.2.2 +version: 0.3.0 appVersion: 1.8.1-1 home: https://github.com/egeland/kube-spot-termination-notice-handler source: diff --git a/incubator/kube-spot-termination-notice-handler/templates/daemonset.yaml b/incubator/kube-spot-termination-notice-handler/templates/daemonset.yaml index 2925491c911d..82399d81081e 100644 --- a/incubator/kube-spot-termination-notice-handler/templates/daemonset.yaml +++ b/incubator/kube-spot-termination-notice-handler/templates/daemonset.yaml @@ -48,7 +48,5 @@ spec: {{- end }} {{- if .Values.tolerations }} tolerations: - - {{- range $key, $value := .Values.tolerations }} -{{- end }} {{ toYaml .Values.tolerations | indent 8 }} -{{- end }} + {{- end }} diff --git a/incubator/kube-spot-termination-notice-handler/values.yaml b/incubator/kube-spot-termination-notice-handler/values.yaml index 3de537a8e1d0..0a9179111ebb 100644 --- a/incubator/kube-spot-termination-notice-handler/values.yaml +++ b/incubator/kube-spot-termination-notice-handler/values.yaml @@ -41,7 +41,7 @@ serviceAccount: # If not set and create is true, a name is generated using the fullname template name: -tolerations: {} +tolerations: [] # key: "dedicated" # operator: "Equal" # value: "gpu" From da3e79191c2ac7b39de113c0a5a4feb489ef0e01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reinhard=20N=C3=A4gele?= Date: Sun, 15 Jul 2018 17:38:01 +0200 Subject: [PATCH 3/3] Update Chart.yaml --- incubator/kube-spot-termination-notice-handler/Chart.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/incubator/kube-spot-termination-notice-handler/Chart.yaml b/incubator/kube-spot-termination-notice-handler/Chart.yaml index a9ab5a94abc4..4208057b9c42 100644 --- a/incubator/kube-spot-termination-notice-handler/Chart.yaml +++ b/incubator/kube-spot-termination-notice-handler/Chart.yaml @@ -7,7 +7,8 @@ home: https://github.com/egeland/kube-spot-termination-notice-handler source: - https://hub.docker.com/r/egeland/kube-spot-termination-notice-handler/ maintainers: - - name: FFX Blue Operations - email: blueops@fairfaxmedia.com.au - - name: Frode Egeland +# commented out due to unknown Github account +# - name: FFX Blue Operations +# email: blueops@fairfaxmedia.com.au + - name: egeland email: egeland@gmail.com