diff --git a/charts/kubezero-calico/Chart.yaml b/charts/kubezero-calico/Chart.yaml index 0bbe747..625bbac 100644 --- a/charts/kubezero-calico/Chart.yaml +++ b/charts/kubezero-calico/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: kubezero-calico description: KubeZero Umbrella Chart for Calico type: application -version: 0.1.6 +version: 0.1.7 appVersion: 3.15 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png diff --git a/charts/kubezero-calico/README.md b/charts/kubezero-calico/README.md index 6fb7e1a..9d495c8 100644 --- a/charts/kubezero-calico/README.md +++ b/charts/kubezero-calico/README.md @@ -2,7 +2,7 @@ kubezero-calico =============== KubeZero Umbrella Chart for Calico -Current chart version is `0.1.6` +Current chart version is `0.1.7` Source code can be found [here](https://kubezero.com) diff --git a/charts/kubezero-istio/README.md b/charts/kubezero-istio/README.md index 65e94c4..167df1e 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.2` +Current chart version is `0.1.3` Source code can be found [here](https://kubezero.com) @@ -13,13 +13,18 @@ Source code can be found [here](https://kubezero.com) | Repository | Name | Version | |------------|------|---------| -| | istio-operator | = 1.6 | +| | istio-operator | >= 1.6 | | https://zero-down-time.github.io/kubezero/ | kubezero-lib | >= 0.1.1 | ## KubeZero default configuration - mapped istio-operator to run on the controller nodes only +## Chart Values +| Key | Type | Default | Description | +|-----|------|---------|-------------| +| istio-operator.hub | string | `"docker.io/istio"` | | +| istio-operator.tag | string | `"1.6.5"` | | ## Resources diff --git a/charts/kubezero/Chart.yaml b/charts/kubezero/Chart.yaml index 7cdf432..a8bacb7 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.7 +version: 0.3.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 ff3844e..d9d42ec 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.7` +Current chart version is `0.3.8` Source code can be found [here](https://kubezero.com) diff --git a/charts/kubezero/templates/istio.yaml b/charts/kubezero/templates/istio.yaml index cd5804a..16d2b94 100644 --- a/charts/kubezero/templates/istio.yaml +++ b/charts/kubezero/templates/istio.yaml @@ -3,4 +3,11 @@ syncPolicy: automated: prune: true + + ignoreDifferences: + - group: apiextensions.k8s.io + kind: CustomResourceDefinition + jsonPointers: + - /metadata/labels + - /spec/additionalPrinterColumns {{- end }} diff --git a/deploy/templates/values.yaml b/deploy/templates/values.yaml index ad7859c..5730224 100644 --- a/deploy/templates/values.yaml +++ b/deploy/templates/values.yaml @@ -65,7 +65,7 @@ kubezero: {{- end }} istio: - enabled: {{ .Values.istio.enabled }} + enabled: {{ index .Values "istio-operator" "enabled" }} {{- end }} diff --git a/deploy/values.yaml b/deploy/values.yaml index 705c141..ca4e5e1 100644 --- a/deploy/values.yaml +++ b/deploy/values.yaml @@ -23,6 +23,9 @@ kiam: istio: enabled: false +istio-operator: + enabled: false + prometheus: enabled: false