diff --git a/charts/kubezero-istio/templates/istio-base.yaml b/charts/kubezero-istio/templates/istio-base.yaml new file mode 100644 index 00000000..5fd44732 --- /dev/null +++ b/charts/kubezero-istio/templates/istio-base.yaml @@ -0,0 +1,10 @@ +apiVersion: install.istio.io/v1alpha1 +kind: IstioOperator +metadata: + name: kubezero-istio-base + namespace: istio-system +spec: + profile: empty + components: + base: + enabled: true diff --git a/charts/kubezero-istio/templates/istio-private-ingress.yaml b/charts/kubezero-istio/templates/istio-private-ingress.yaml index 65226eb0..fbc50442 100644 --- a/charts/kubezero-istio/templates/istio-private-ingress.yaml +++ b/charts/kubezero-istio/templates/istio-private-ingress.yaml @@ -11,11 +11,8 @@ spec: enabled: true namespace: istio-system k8s: - env: - - name: ISTIO_META_HTTP10 - value: '"1"' - - name: ISTIO_META_ROUTER_MODE - value: standard + replicaCount: {{ .Values.ingress.replicaCount }} + {{- if .Values.ingress.autoscaleEnabled }} hpaSpec: maxReplicas: 5 metrics: @@ -28,6 +25,12 @@ spec: apiVersion: apps/v1 kind: Deployment name: istio-private-ingressgateway + {{- end }} + env: + - name: ISTIO_META_HTTP10 + value: '"1"' + - name: ISTIO_META_ROUTER_MODE + value: standard nodeSelector: node.kubernetes.io/ingress.private: "31080_31443_30671_30672_31224" resources: @@ -44,6 +47,7 @@ spec: values: gateways: istio-ingressgateway: + autoscaleEnabled: {{ .Values.ingress.autoscaleEnabled }} externalTrafficPolicy: Local labels: app: istio-private-ingressgateway diff --git a/charts/kubezero-istio/templates/istio.yaml b/charts/kubezero-istio/templates/istio.yaml index 904d2b19..b9da6234 100644 --- a/charts/kubezero-istio/templates/istio.yaml +++ b/charts/kubezero-istio/templates/istio.yaml @@ -9,8 +9,6 @@ spec: prometheus: enabled: false components: - base: - enabled: true citadel: enabled: false galley: @@ -18,11 +16,8 @@ spec: ingressGateways: - enabled: true k8s: - env: - - name: ISTIO_META_HTTP10 - value: '"1"' - - name: ISTIO_META_ROUTER_MODE - value: standard + replicaCount: {{ .Values.ingress.replicaCount }} + {{- if .Values.ingress.autoscaleEnabled }} hpaSpec: maxReplicas: 5 metrics: @@ -35,6 +30,12 @@ spec: apiVersion: apps/v1 kind: Deployment name: istio-ingressgateway + {{- end }} + env: + - name: ISTIO_META_HTTP10 + value: '"1"' + - name: ISTIO_META_ROUTER_MODE + value: standard nodeSelector: node.kubernetes.io/ingress.public: "30080_30443" resources: @@ -52,25 +53,26 @@ spec: pilot: enabled: true k8s: + replicaCount: {{ .Values.istiod.replicaCount }} nodeSelector: node-role.kubernetes.io/master: "" - replicaCount: 1 + tolerations: + - effect: NoSchedule + key: node-role.kubernetes.io/master resources: requests: cpu: 100m memory: 128Mi - tolerations: - - effect: NoSchedule - key: node-role.kubernetes.io/master policy: enabled: true k8s: - replicaCount: 1 + replicaCount: {{ .Values.istiod.replicaCount }} nodeSelector: node-role.kubernetes.io/master: "" tolerations: - effect: NoSchedule key: node-role.kubernetes.io/master + sidecarInjector: enabled: false telemetry: @@ -78,6 +80,7 @@ spec: values: gateways: istio-ingressgateway: + autoscaleEnabled: {{ .Values.ingress.autoscaleEnabled }} externalTrafficPolicy: Local labels: app: istio-ingressgateway @@ -128,3 +131,7 @@ spec: useMCP: false pilot: sidecar: false + autoscaleEnabled: false + mixer: + policy: + autoscaleEnabled: false diff --git a/charts/kubezero-istio/values.yaml b/charts/kubezero-istio/values.yaml index 8c087e67..e03f50d9 100644 --- a/charts/kubezero-istio/values.yaml +++ b/charts/kubezero-istio/values.yaml @@ -1,10 +1,10 @@ istiod: - autoscale: true - # replicaCount: 2 + autoscaleEnabled: false + replicaCount: 1 ingress: - autoscale: true - # replicaCount: 2 + autoscaleEnabled: false + replicaCount: 2 dnsNames: - "*.example.com"