From 24ebdf360f57abb2d370001a127fadf72fbad577 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Thu, 6 Aug 2020 18:43:59 +0100 Subject: [PATCH] Various deps updates, Istio to 1.6.7 --- charts/kubezero-argo-cd/Chart.yaml | 2 +- charts/kubezero-istio/Chart.yaml | 6 +++--- charts/kubezero-istio/README.md | 6 +++--- charts/kubezero-istio/templates/ingress-certificate.yaml | 2 ++ charts/kubezero-istio/templates/ingress-gateway.yaml | 4 ++++ charts/kubezero-istio/templates/istio-private-ingress.yaml | 2 ++ charts/kubezero-istio/templates/istio.yaml | 2 ++ charts/kubezero-istio/templates/namespace.yaml | 1 + charts/kubezero-istio/update.sh | 2 +- charts/kubezero-istio/values.yaml | 2 +- charts/kubezero-lib/templates/_helpers.tpl | 6 +++++- charts/kubezero-metrics/Chart.yaml | 2 +- 12 files changed, 26 insertions(+), 11 deletions(-) diff --git a/charts/kubezero-argo-cd/Chart.yaml b/charts/kubezero-argo-cd/Chart.yaml index bbebec82..4ff15ca3 100644 --- a/charts/kubezero-argo-cd/Chart.yaml +++ b/charts/kubezero-argo-cd/Chart.yaml @@ -13,7 +13,7 @@ maintainers: dependencies: dependencies: - name: kubezero-lib - version: ">= 0.1.1" + version: ">= 0.1.3" repository: https://zero-down-time.github.io/kubezero/ - name: argo-cd version: 2.6.0 diff --git a/charts/kubezero-istio/Chart.yaml b/charts/kubezero-istio/Chart.yaml index df7d0d87..f9966132 100644 --- a/charts/kubezero-istio/Chart.yaml +++ b/charts/kubezero-istio/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: kubezero-istio description: KubeZero Umbrella Chart for Istio type: application -version: 0.2.0 -appVersion: 1.6.5 +version: 0.2.1 +appVersion: 1.6.7 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png keywords: @@ -13,7 +13,7 @@ maintainers: - name: Quarky9 dependencies: - name: kubezero-lib - version: ">= 0.1.1" + version: ">= 0.1.3" repository: https://zero-down-time.github.io/kubezero/ - name: istio-operator version: ">= 1.6" diff --git a/charts/kubezero-istio/README.md b/charts/kubezero-istio/README.md index 28ddf222..6b7ba4e7 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.2.0` +Current chart version is `0.2.1` 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 | |------------|------|---------| | | 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 - 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.type | string | `"NodePort"` | | | 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.replicaCount | int | `1` | | diff --git a/charts/kubezero-istio/templates/ingress-certificate.yaml b/charts/kubezero-istio/templates/ingress-certificate.yaml index 12a512da..eab9e8c8 100644 --- a/charts/kubezero-istio/templates/ingress-certificate.yaml +++ b/charts/kubezero-istio/templates/ingress-certificate.yaml @@ -4,6 +4,8 @@ kind: Certificate metadata: name: public-ingress-cert namespace: istio-system + labels: +{{ include "kubezero-lib.labels" . | indent 4 }} spec: secretName: public-ingress-cert issuerRef: diff --git a/charts/kubezero-istio/templates/ingress-gateway.yaml b/charts/kubezero-istio/templates/ingress-gateway.yaml index 907d107c..9d90242a 100644 --- a/charts/kubezero-istio/templates/ingress-gateway.yaml +++ b/charts/kubezero-istio/templates/ingress-gateway.yaml @@ -3,6 +3,8 @@ kind: Gateway metadata: name: ingressgateway namespace: istio-system + labels: +{{ include "kubezero-lib.labels" . | indent 4 }} spec: selector: istio: ingressgateway @@ -33,6 +35,8 @@ kind: Gateway metadata: name: private-ingressgateway namespace: istio-system + labels: +{{ include "kubezero-lib.labels" . | indent 4 }} spec: selector: istio: private-ingressgateway diff --git a/charts/kubezero-istio/templates/istio-private-ingress.yaml b/charts/kubezero-istio/templates/istio-private-ingress.yaml index a6e0dfc2..c9465427 100644 --- a/charts/kubezero-istio/templates/istio-private-ingress.yaml +++ b/charts/kubezero-istio/templates/istio-private-ingress.yaml @@ -4,6 +4,8 @@ kind: IstioOperator metadata: name: kubezero-istio-private-ingress namespace: istio-system + labels: +{{ include "kubezero-lib.labels" . | indent 4 }} spec: profile: empty components: diff --git a/charts/kubezero-istio/templates/istio.yaml b/charts/kubezero-istio/templates/istio.yaml index 8fcc2eda..bea5e87d 100644 --- a/charts/kubezero-istio/templates/istio.yaml +++ b/charts/kubezero-istio/templates/istio.yaml @@ -3,6 +3,8 @@ kind: IstioOperator metadata: name: kubezero-istio namespace: istio-system + labels: +{{ include "kubezero-lib.labels" . | indent 4 }} spec: profile: empty addonComponents: diff --git a/charts/kubezero-istio/templates/namespace.yaml b/charts/kubezero-istio/templates/namespace.yaml index 58bebec1..92cf7fef 100644 --- a/charts/kubezero-istio/templates/namespace.yaml +++ b/charts/kubezero-istio/templates/namespace.yaml @@ -4,3 +4,4 @@ metadata: name: istio-system labels: istio-injection: disabled +{{ include "kubezero-lib.labels" . | indent 4 }} diff --git a/charts/kubezero-istio/update.sh b/charts/kubezero-istio/update.sh index daa565d8..199a6780 100755 --- a/charts/kubezero-istio/update.sh +++ b/charts/kubezero-istio/update.sh @@ -1,7 +1,7 @@ #!/bin/bash set -ex -ISTIO_VERSION=1.6.5 +ISTIO_VERSION=1.6.7 NAME="istio-$ISTIO_VERSION" URL="https://github.com/istio/istio/releases/download/${ISTIO_VERSION}/istio-${ISTIO_VERSION}-linux-amd64.tar.gz" diff --git a/charts/kubezero-istio/values.yaml b/charts/kubezero-istio/values.yaml index ca353d7b..68d5a425 100644 --- a/charts/kubezero-istio/values.yaml +++ b/charts/kubezero-istio/values.yaml @@ -12,4 +12,4 @@ ingress: istio-operator: hub: docker.io/istio - tag: 1.6.5 + tag: 1.6.7 diff --git a/charts/kubezero-lib/templates/_helpers.tpl b/charts/kubezero-lib/templates/_helpers.tpl index b6d75b6d..f0de5480 100644 --- a/charts/kubezero-lib/templates/_helpers.tpl +++ b/charts/kubezero-lib/templates/_helpers.tpl @@ -2,7 +2,7 @@ Common set of 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/managed-by: {{ .Release.Service }} app.kubernetes.io/part-of: kubezero @@ -27,3 +27,7 @@ Common naming functions {{- end -}} {{- end -}} {{- end -}} + +{{- define "kubezero-lib.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} +{{- end -}} diff --git a/charts/kubezero-metrics/Chart.yaml b/charts/kubezero-metrics/Chart.yaml index 69fe1ae3..70384a51 100644 --- a/charts/kubezero-metrics/Chart.yaml +++ b/charts/kubezero-metrics/Chart.yaml @@ -13,7 +13,7 @@ maintainers: - name: Quarky9 dependencies: - name: kubezero-lib - version: ">= 0.1.1" + version: ">= 0.1.3" repository: https://zero-down-time.github.io/kubezero/ - name: prometheus-operator version: 9.3.0