Some tool tweaks

charts/kubezero-aws-node-termination-handler/Chart.yaml

@@ -1,15 +1,12 @@
 apiVersion: v2
 name: kubezero-aws-node-termination-handler
-description: Umbrella chart for all KubeZero AWS addons
+description: Umbrella chart for all aws-node-termination-handler
 type: application
-version: 0.1.1
+version: 0.1.2
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:
   - kubezero
-  - kiam
-  - aws-ebs-csi-driver
-  - aws-efs-csi-driver
   - aws-node-termination-handler
 maintainers:
   - name: Quarky9

charts/kubezero-aws-node-termination-handler/README.md

@@ -1,10 +1,8 @@
-# kubezero-local-volume-provisioner
+# kubezero-aws-node-termination-handler
 
-![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.4](https://img.shields.io/badge/AppVersion-2.3.4-informational?style=flat-square)
+![Version: 0.1.2](https://img.shields.io/badge/Version-0.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
-KubeZero Umbrella Chart for local-static-provisioner
+Umbrella chart for all aws-node-termination-handler
-
-Provides persistent volumes backed by local volumes, eg. additional SSDs or spindles.
 
 **Homepage:** <https://kubezero.com>
 
@@ -16,27 +14,35 @@ Provides persistent volumes backed by local volumes, eg. additional SSDs or spin
 
 ## Requirements
 
-Kubernetes: `>= 1.16.0`
+Kubernetes: `>= 1.18.0`
 
 | Repository | Name | Version |
 |------------|------|---------|
+| https://aws.github.io/eks-charts | aws-node-termination-handler | >= 0.14.1 |
 | https://zero-down-time.github.io/kubezero/ | kubezero-lib | >= 0.1.3 |
 
 ## Values
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| local-static-provisioner.classes[0].hostDir | string | `"/mnt/disks"` |  |
+| aws-node-termination-handler.deleteLocalData | bool | `true` |  |
-| local-static-provisioner.classes[0].name | string | `"local-sc-xfs"` |  |
+| aws-node-termination-handler.enablePrometheusServer | bool | `false` |  |
-| local-static-provisioner.common.namespace | string | `"kube-system"` |  |
+| aws-node-termination-handler.enableSqsTerminationDraining | bool | `true` |  |
-| local-static-provisioner.daemonset.nodeSelector."node.kubernetes.io/localVolume" | string | `"present"` |  |
+| aws-node-termination-handler.jsonLogging | bool | `true` |  |
-| local-static-provisioner.prometheus.operator.enabled | bool | `false` |  |
+| aws-node-termination-handler.nodeSelector."node-role.kubernetes.io/master" | string | `""` |  |
+| aws-node-termination-handler.podMonitor.create | bool | `false` |  |
+| aws-node-termination-handler.podMonitor.labels.release | string | `"metrics"` |  |
+| aws-node-termination-handler.taintNode | bool | `true` |  |
+| aws-node-termination-handler.tolerations[0].effect | string | `"NoSchedule"` |  |
+| aws-node-termination-handler.tolerations[0].key | string | `"node-role.kubernetes.io/master"` |  |
 
 ## KubeZero default configuration
 
-- add nodeSelector to only install on nodes actually having ephemeral local storage
+- enable SQS Mode
-- provide matching storage class to expose mounted disks under `/mnt/disks`
+- allow draining of localdata
+- enable prometheus
 
 ## Resources
 
-- https://github.com/kubernetes-sigs/sig-storage-local-static-provisioner
+- https://github.com/aws/aws-node-termination-handler
+- https://github.com/aws/eks-charts/tree/master/stable/aws-node-termination-handler

charts/kubezero/templates/aws-node-termination-handler.yaml

@@ -1,9 +1,7 @@
 {{- define "aws-node-termination-handler-values" }}
 
 aws-node-termination-handler:
-{{- with index .Values "aws-node-termination-handler" "queueURL" }}
+  queueURL: "{{ index .Values "aws-node-termination-handler" "queueURL" }}"
-  queueURL: "{{ . }}"
-{{- end }}
 {{ with index .Values "aws-node-termination-handler" "IamArn" }}
   podAnnotations:
     iam.amazonaws.com/role: "{{ . }}"

charts/kubezero/templates/logging.yaml

@@ -44,25 +44,29 @@ kibana:
   {{- end }}
 {{- end }}
 
-{{- if .Values.logging.fluentd }}
+{{- with .Values.logging.fluentd }}
 fluentd:
-  enabled: {{ .Values.logging.fluentd.enabled }}
+  enabled: {{ .enabled }}
-  replicaCount: {{ default 1 .Values.logging.fluentd.replicaCount }}
+  replicaCount: {{ default 1 .replicaCount }}
   metrics:
     serviceMonitor:
-      enabled: {{ .Values.metrics.enabled }}
+      enabled: {{ $.Values.metrics.enabled }}
-  url: {{ .Values.logging.fluentd.url }}
+  url: {{ .url }}
-  {{- if .Values.logging.fluentd.output }}
+  {{- if .output }}
   output:
-    host: {{ .Values.logging.fluentd.output.host }}
+    host: {{ .output.host }}
   {{- end }}
-  {{- if .Values.logging.fluentd.extraEnvVars }}
+  {{- with .affinity }}
+  affinity:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- if .extraEnvVars }}
   extraEnvVars:
-    {{- toYaml .Values.logging.fluentd.extraEnvVars | nindent 8 }}
+    {{- toYaml .extraEnvVars | nindent 8 }}
   {{- end }}
-  {{- if and .Values.logging.fluentd.istio .Values.istio.enabled }}
+  {{- if and .istio $.Values.istio.enabled }}
   istio:
-    {{- with .Values.logging.fluentd.istio }}
+    {{- with .istio }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
   {{- end }}