From 16cb90730e9fb5195af61a62cf40a9778f582210 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Wed, 22 Jul 2020 20:25:18 +0100 Subject: [PATCH] Another round of Istio fixes --- charts/kubezero-cert-manager/README.md | 2 +- charts/kubezero-istio/Chart.yaml | 2 +- charts/kubezero-istio/README.md | 6 +++++- charts/kubezero-istio/templates/ingress-certificate.yaml | 2 ++ charts/kubezero-istio/values.yaml | 4 ++-- charts/kubezero/README.md | 2 +- deploy/templates/values.yaml | 2 ++ 7 files changed, 14 insertions(+), 6 deletions(-) diff --git a/charts/kubezero-cert-manager/README.md b/charts/kubezero-cert-manager/README.md index 15f0d8dd..e341dfd6 100644 --- a/charts/kubezero-cert-manager/README.md +++ b/charts/kubezero-cert-manager/README.md @@ -2,7 +2,7 @@ kubezero-cert-manager ===================== KubeZero Umbrella Chart for cert-manager -Current chart version is `0.3.4` +Current chart version is `0.3.5` Source code can be found [here](https://kubezero.com) diff --git a/charts/kubezero-istio/Chart.yaml b/charts/kubezero-istio/Chart.yaml index 7134987b..7109ce7c 100644 --- a/charts/kubezero-istio/Chart.yaml +++ b/charts/kubezero-istio/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: kubezero-istio description: KubeZero Umbrella Chart for Istio type: application -version: 0.1.3 +version: 0.1.4 appVersion: 1.6.5 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png diff --git a/charts/kubezero-istio/README.md b/charts/kubezero-istio/README.md index 167df1e3..84a7104c 100644 --- a/charts/kubezero-istio/README.md +++ b/charts/kubezero-istio/README.md @@ -5,7 +5,7 @@ KubeZero Umbrella Chart for Istio Installs Istio Operator and KubeZero Istio profile -Current chart version is `0.1.3` +Current chart version is `0.1.4` Source code can be found [here](https://kubezero.com) @@ -23,8 +23,12 @@ Source code can be found [here](https://kubezero.com) | Key | Type | Default | Description | |-----|------|---------|-------------| +| ingress.autoscaleEnabled | bool | `false` | | +| ingress.replicaCount | int | `2` | | | istio-operator.hub | string | `"docker.io/istio"` | | | istio-operator.tag | string | `"1.6.5"` | | +| istiod.autoscaleEnabled | bool | `false` | | +| istiod.replicaCount | int | `1` | | ## Resources diff --git a/charts/kubezero-istio/templates/ingress-certificate.yaml b/charts/kubezero-istio/templates/ingress-certificate.yaml index 301af2a4..12a512da 100644 --- a/charts/kubezero-istio/templates/ingress-certificate.yaml +++ b/charts/kubezero-istio/templates/ingress-certificate.yaml @@ -1,3 +1,4 @@ +{{- if .Values.ingress.dnsNames }} apiVersion: cert-manager.io/v1alpha2 kind: Certificate metadata: @@ -10,3 +11,4 @@ spec: kind: ClusterIssuer dnsNames: {{ toYaml .Values.ingress.dnsNames | indent 4 }} +{{- end }} diff --git a/charts/kubezero-istio/values.yaml b/charts/kubezero-istio/values.yaml index e03f50d9..45a3ce56 100644 --- a/charts/kubezero-istio/values.yaml +++ b/charts/kubezero-istio/values.yaml @@ -5,8 +5,8 @@ istiod: ingress: autoscaleEnabled: false replicaCount: 2 - dnsNames: - - "*.example.com" + #dnsNames: + #- "*.example.com" istio-operator: hub: docker.io/istio diff --git a/charts/kubezero/README.md b/charts/kubezero/README.md index d9d42ec7..e45ec9b3 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.8` +Current chart version is `0.3.9` Source code can be found [here](https://kubezero.com) diff --git a/deploy/templates/values.yaml b/deploy/templates/values.yaml index ab70479a..a3f6796f 100644 --- a/deploy/templates/values.yaml +++ b/deploy/templates/values.yaml @@ -65,6 +65,8 @@ kubezero: istio: enabled: {{ .Values.istio.enabled }} values: + istiod: + replicaCount: {{ ternary 2 1 .Values.HighAvailableControlplane }} ingress: dnsNames: {{- with .Values.istio.ingress.dnsNames }}