Various deps updates, Istio to 1.6.7

This commit is contained in:
Stefan Reimer 2020-08-06 18:43:59 +01:00
parent 2b75664215
commit 24ebdf360f
12 changed files with 26 additions and 11 deletions

View File

@ -13,7 +13,7 @@ maintainers:
dependencies: dependencies:
dependencies: dependencies:
- name: kubezero-lib - name: kubezero-lib
version: ">= 0.1.1" version: ">= 0.1.3"
repository: https://zero-down-time.github.io/kubezero/ repository: https://zero-down-time.github.io/kubezero/
- name: argo-cd - name: argo-cd
version: 2.6.0 version: 2.6.0

View File

@ -2,8 +2,8 @@ apiVersion: v2
name: kubezero-istio name: kubezero-istio
description: KubeZero Umbrella Chart for Istio description: KubeZero Umbrella Chart for Istio
type: application type: application
version: 0.2.0 version: 0.2.1
appVersion: 1.6.5 appVersion: 1.6.7
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:
@ -13,7 +13,7 @@ maintainers:
- name: Quarky9 - name: Quarky9
dependencies: dependencies:
- name: kubezero-lib - name: kubezero-lib
version: ">= 0.1.1" version: ">= 0.1.3"
repository: https://zero-down-time.github.io/kubezero/ repository: https://zero-down-time.github.io/kubezero/
- name: istio-operator - name: istio-operator
version: ">= 1.6" version: ">= 1.6"

View File

@ -5,7 +5,7 @@ KubeZero Umbrella Chart for Istio
Installs Istio Operator and KubeZero Istio profile Installs Istio Operator and KubeZero Istio profile
Current chart version is `0.2.0` Current chart version is `0.2.1`
Source code can be found [here](https://kubezero.com) Source code can be found [here](https://kubezero.com)
@ -14,7 +14,7 @@ Source code can be found [here](https://kubezero.com)
| Repository | Name | Version | | Repository | Name | Version |
|------------|------|---------| |------------|------|---------|
| | istio-operator | >= 1.6 | | | istio-operator | >= 1.6 |
| https://zero-down-time.github.io/kubezero/ | kubezero-lib | >= 0.1.1 | | https://zero-down-time.github.io/kubezero/ | kubezero-lib | >= 0.1.3 |
## KubeZero default configuration ## KubeZero default configuration
- mapped istio-operator to run on the controller nodes only - mapped istio-operator to run on the controller nodes only
@ -28,7 +28,7 @@ Source code can be found [here](https://kubezero.com)
| ingress.replicaCount | int | `2` | | | ingress.replicaCount | int | `2` | |
| ingress.type | string | `"NodePort"` | | | ingress.type | string | `"NodePort"` | |
| istio-operator.hub | string | `"docker.io/istio"` | | | istio-operator.hub | string | `"docker.io/istio"` | |
| istio-operator.tag | string | `"1.6.5"` | | | istio-operator.tag | string | `"1.6.7"` | |
| istiod.autoscaleEnabled | bool | `false` | | | istiod.autoscaleEnabled | bool | `false` | |
| istiod.replicaCount | int | `1` | | | istiod.replicaCount | int | `1` | |

View File

@ -4,6 +4,8 @@ kind: Certificate
metadata: metadata:
name: public-ingress-cert name: public-ingress-cert
namespace: istio-system namespace: istio-system
labels:
{{ include "kubezero-lib.labels" . | indent 4 }}
spec: spec:
secretName: public-ingress-cert secretName: public-ingress-cert
issuerRef: issuerRef:

View File

@ -3,6 +3,8 @@ kind: Gateway
metadata: metadata:
name: ingressgateway name: ingressgateway
namespace: istio-system namespace: istio-system
labels:
{{ include "kubezero-lib.labels" . | indent 4 }}
spec: spec:
selector: selector:
istio: ingressgateway istio: ingressgateway
@ -33,6 +35,8 @@ kind: Gateway
metadata: metadata:
name: private-ingressgateway name: private-ingressgateway
namespace: istio-system namespace: istio-system
labels:
{{ include "kubezero-lib.labels" . | indent 4 }}
spec: spec:
selector: selector:
istio: private-ingressgateway istio: private-ingressgateway

View File

@ -4,6 +4,8 @@ kind: IstioOperator
metadata: metadata:
name: kubezero-istio-private-ingress name: kubezero-istio-private-ingress
namespace: istio-system namespace: istio-system
labels:
{{ include "kubezero-lib.labels" . | indent 4 }}
spec: spec:
profile: empty profile: empty
components: components:

View File

@ -3,6 +3,8 @@ kind: IstioOperator
metadata: metadata:
name: kubezero-istio name: kubezero-istio
namespace: istio-system namespace: istio-system
labels:
{{ include "kubezero-lib.labels" . | indent 4 }}
spec: spec:
profile: empty profile: empty
addonComponents: addonComponents:

View File

@ -4,3 +4,4 @@ metadata:
name: istio-system name: istio-system
labels: labels:
istio-injection: disabled istio-injection: disabled
{{ include "kubezero-lib.labels" . | indent 4 }}

View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
set -ex set -ex
ISTIO_VERSION=1.6.5 ISTIO_VERSION=1.6.7
NAME="istio-$ISTIO_VERSION" NAME="istio-$ISTIO_VERSION"
URL="https://github.com/istio/istio/releases/download/${ISTIO_VERSION}/istio-${ISTIO_VERSION}-linux-amd64.tar.gz" URL="https://github.com/istio/istio/releases/download/${ISTIO_VERSION}/istio-${ISTIO_VERSION}-linux-amd64.tar.gz"

View File

@ -12,4 +12,4 @@ ingress:
istio-operator: istio-operator:
hub: docker.io/istio hub: docker.io/istio
tag: 1.6.5 tag: 1.6.7

View File

@ -2,7 +2,7 @@
Common set of labels Common set of labels
*/ -}} */ -}}
{{- define "kubezero-lib.labels" -}} {{- define "kubezero-lib.labels" -}}
helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} helm.sh/chart: {{ include "kubezero-lib.chart . }}
app.kubernetes.io/name: {{ include "kubezero-lib.name" . }} app.kubernetes.io/name: {{ include "kubezero-lib.name" . }}
app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/part-of: kubezero app.kubernetes.io/part-of: kubezero
@ -27,3 +27,7 @@ Common naming functions
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}
{{- define "kubezero-lib.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}}

View File

@ -13,7 +13,7 @@ maintainers:
- name: Quarky9 - name: Quarky9
dependencies: dependencies:
- name: kubezero-lib - name: kubezero-lib
version: ">= 0.1.1" version: ">= 0.1.3"
repository: https://zero-down-time.github.io/kubezero/ repository: https://zero-down-time.github.io/kubezero/
- name: prometheus-operator - name: prometheus-operator
version: 9.3.0 version: 9.3.0