diff --git a/charts/kubezero-istio/README.md.gotmpl b/charts/kubezero-istio/README.md.gotmpl index 7789d1b..cd85c69 100644 --- a/charts/kubezero-istio/README.md.gotmpl +++ b/charts/kubezero-istio/README.md.gotmpl @@ -11,6 +11,7 @@ Installs Istio Operator and KubeZero Istio profile {{ template "chart.requirementsSection" . }} ## KubeZero default configuration +- mapped istio-operator to run on the controller nodes only ## Resources diff --git a/charts/kubezero-istio/charts/istio-operator/templates/deployment.yaml b/charts/kubezero-istio/charts/istio-operator/templates/deployment.yaml index 5ef7848..8350dd5 100644 --- a/charts/kubezero-istio/charts/istio-operator/templates/deployment.yaml +++ b/charts/kubezero-istio/charts/istio-operator/templates/deployment.yaml @@ -14,6 +14,12 @@ spec: name: istio-operator spec: serviceAccountName: istio-operator + nodeSelector: + kubernetes.io/os: linux + node-role.kubernetes.io/master: "" + tolerations: + - key: node-role.kubernetes.io/master + effect: NoSchedule containers: - name: istio-operator image: {{.Values.hub}}/operator:{{.Values.tag}} diff --git a/charts/kubezero-istio/istio-operator.patch b/charts/kubezero-istio/istio-operator.patch new file mode 100644 index 0000000..7043f50 --- /dev/null +++ b/charts/kubezero-istio/istio-operator.patch @@ -0,0 +1,17 @@ +diff --git a/charts/kubezero-istio/charts/istio-operator/templates/deployment.yaml b/charts/kubezero-istio/charts/istio-operator/templates/deployment.yaml +index 5ef7848..8350dd5 100644 +--- a/charts/kubezero-istio/charts/istio-operator/templates/deployment.yaml ++++ b/charts/kubezero-istio/charts/istio-operator/templates/deployment.yaml +@@ -14,6 +14,12 @@ spec: + name: istio-operator + spec: + serviceAccountName: istio-operator ++ nodeSelector: ++ kubernetes.io/os: linux ++ node-role.kubernetes.io/master: "" ++ tolerations: ++ - key: node-role.kubernetes.io/master ++ effect: NoSchedule + containers: + - name: istio-operator + image: {{.Values.hub}}/operator:{{.Values.tag}} diff --git a/charts/kubezero/Chart.yaml b/charts/kubezero/Chart.yaml index 95654ee..8d58cae 100644 --- a/charts/kubezero/Chart.yaml +++ b/charts/kubezero/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: kubezero description: KubeZero ArgoCD Application - Root App of Apps chart of KubeZero type: application -version: 0.3.5 +version: 0.3.6 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 e1e416b..4e33d22 100644 --- a/charts/kubezero/README.md +++ b/charts/kubezero/README.md @@ -2,7 +2,7 @@ kubezero ======== KubeZero ArgoCD Application - Root App of Apps chart of KubeZero -Current chart version is `0.3.5` +Current chart version is `0.3.6` Source code can be found [here](https://kubezero.com) diff --git a/charts/kubezero/templates/local-volume-provisioner.yaml b/charts/kubezero/templates/local-volume-provisioner.yaml index 804e9f1..0db5f77 100644 --- a/charts/kubezero/templates/local-volume-provisioner.yaml +++ b/charts/kubezero/templates/local-volume-provisioner.yaml @@ -1,5 +1,5 @@ {{- if index .Values "local-volume-provisioner" "enabled" }} -{{ template "kubezero-app.app" dict "root" . "name" "local-volume-provisioner" "type" "kustomize" }} +{{ template "kubezero-app.app" dict "root" . "name" "local-volume-provisioner" "type" "helm" }} syncPolicy: automated: prune: true