Fix local-path-provisioner, map istio-operator to control plane

This commit is contained in:
Stefan Reimer 2020-07-14 17:30:43 +01:00
parent 74ce5cc45c
commit 5661a5d7c3
6 changed files with 27 additions and 3 deletions

View File

@ -11,6 +11,7 @@ Installs Istio Operator and KubeZero Istio profile
{{ template "chart.requirementsSection" . }} {{ template "chart.requirementsSection" . }}
## KubeZero default configuration ## KubeZero default configuration
- mapped istio-operator to run on the controller nodes only
## Resources ## Resources

View File

@ -14,6 +14,12 @@ spec:
name: istio-operator name: istio-operator
spec: spec:
serviceAccountName: istio-operator serviceAccountName: istio-operator
nodeSelector:
kubernetes.io/os: linux
node-role.kubernetes.io/master: ""
tolerations:
- key: node-role.kubernetes.io/master
effect: NoSchedule
containers: containers:
- name: istio-operator - name: istio-operator
image: {{.Values.hub}}/operator:{{.Values.tag}} image: {{.Values.hub}}/operator:{{.Values.tag}}

View File

@ -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}}

View File

@ -2,7 +2,7 @@ apiVersion: v2
name: kubezero name: kubezero
description: KubeZero ArgoCD Application - Root App of Apps chart of KubeZero description: KubeZero ArgoCD Application - Root App of Apps chart of KubeZero
type: application type: application
version: 0.3.5 version: 0.3.6
home: https://kubezero.com home: https://kubezero.com
icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
keywords: keywords:

View File

@ -2,7 +2,7 @@ kubezero
======== ========
KubeZero ArgoCD Application - Root App of Apps chart of 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) Source code can be found [here](https://kubezero.com)

View File

@ -1,5 +1,5 @@
{{- if index .Values "local-volume-provisioner" "enabled" }} {{- 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: syncPolicy:
automated: automated:
prune: true prune: true