From 7b186950fa9239447ea1413a935e5cb575e9db55 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Tue, 10 May 2022 18:43:06 +0200
Subject: [PATCH] feat: Add awsNeuron to addons, integrate with KubeZero
 toplevel chart

---
 .../templates/device-plugins/aws-neuron-ds.yaml    | 10 ----------
 charts/kubezero/Chart.yaml                         |  2 +-
 charts/kubezero/README.md                          |  4 ++--
 charts/kubezero/templates/addons.yaml              | 14 ++++++++++++--
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/charts/kubezero-addons/templates/device-plugins/aws-neuron-ds.yaml b/charts/kubezero-addons/templates/device-plugins/aws-neuron-ds.yaml
index f966539..482b9cf 100644
--- a/charts/kubezero-addons/templates/device-plugins/aws-neuron-ds.yaml
+++ b/charts/kubezero-addons/templates/device-plugins/aws-neuron-ds.yaml
@@ -12,8 +12,6 @@ spec:
     type: RollingUpdate
   template:
     metadata:
-      annotations:
-        scheduler.alpha.kubernetes.io/critical-pod: ""
       labels:
         name: neuron-device-plugin-ds
     spec:
@@ -33,14 +31,6 @@ spec:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
-              - matchExpressions:
-                  - key: "beta.kubernetes.io/instance-type"
-                    operator: In
-                    values:
-                      - inf1.xlarge
-                      - inf1.2xlarge
-                      - inf1.6xlarge
-                      - inf1.4xlarge
               - matchExpressions:
                   - key: "node.kubernetes.io/instance-type"
                     operator: In
diff --git a/charts/kubezero/Chart.yaml b/charts/kubezero/Chart.yaml
index b1019c4..c4ac4e8 100644
--- a/charts/kubezero/Chart.yaml
+++ b/charts/kubezero/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: kubezero
 description: KubeZero - Root App of Apps chart
 type: application
-version: 1.22.8-7
+version: 1.22.8-8
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:
diff --git a/charts/kubezero/README.md b/charts/kubezero/README.md
index 1d40aeb..8488ed1 100644
--- a/charts/kubezero/README.md
+++ b/charts/kubezero/README.md
@@ -1,6 +1,6 @@
 # kubezero
 
-![Version: 1.22.8-6](https://img.shields.io/badge/Version-1.22.8--6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 1.22.8-8](https://img.shields.io/badge/Version-1.22.8--8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 KubeZero - Root App of Apps chart
 
@@ -65,7 +65,7 @@ Kubernetes: `>= 1.20.0`
 | storage.aws-ebs-csi-driver.enabled | bool | `false` |  |
 | storage.aws-efs-csi-driver.enabled | bool | `false` |  |
 | storage.enabled | bool | `false` |  |
-| storage.targetRevision | string | `"0.6.3"` |  |
+| storage.targetRevision | string | `"0.6.4"` |  |
 
 ----------------------------------------------
 Autogenerated from chart metadata using [helm-docs v1.9.1](https://github.com/norwoodj/helm-docs/releases/v1.9.1)
diff --git a/charts/kubezero/templates/addons.yaml b/charts/kubezero/templates/addons.yaml
index 5340f02..1b8c49c 100644
--- a/charts/kubezero/templates/addons.yaml
+++ b/charts/kubezero/templates/addons.yaml
@@ -5,6 +5,11 @@ clusterBackup:
   {{- toYaml . | nindent 2 }}
 {{- end }}
 
+{{- with .Values.addons.forseti }}
+forseti:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+
 {{- with index .Values "addons" "aws-node-termination-handler" }}
 aws-node-termination-handler:
   {{- toYaml . | nindent 2 }}
@@ -16,8 +21,13 @@ fuseDevicePlugin:
   {{- toYaml . | nindent 2 }}
 {{- end }}
 
-{{- with .Values.addons.k8sEcrLoginRenew }}
-k8sEcrLoginRenew:
+{{- with .Values.addons.awsNeuron }}
+awsNeuron:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+
+{{- with index .Values "addons" "external-dns" }}
+external-dns:
   {{- toYaml . | nindent 2 }}
 {{- end }}