ZeroDownTime/KubeZero
3
0
Fork 0
Code Issues 1 Pull Requests 25 Packages Projects Releases Wiki Activity

fix: fix istio-ingress, bump logging module

Browse Source
This commit is contained in:
Stefan Reimer 2021-08-27 12:22:36 +02:00
parent 32e12eaeb2
commit a3a75b5ae1
4 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/kubezero/Chart.yaml
View File

@ -2,7 +2,7 @@ apiVersion: v2
name: kubezero name: kubezero
description: KubeZero - Bootstrap and ArgoCD Root App of Apps chart description: KubeZero - Bootstrap and ArgoCD Root App of Apps chart
type: application type: application
version: 1.20.8-1 version: 1.20.8-3
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:

2
charts/kubezero/bootstrap.sh
View File

@ -16,7 +16,7 @@ echo $helm_version | grep -qe "^v3.[5-9]" || { echo "Helm version >= 3.5 require
API_VERSIONS="-a monitoring.coreos.com/v1" API_VERSIONS="-a monitoring.coreos.com/v1"
KUBE_VERSION="--kube-version $(kubectl version -o json | jq -r .serverVersion.gitVersion)" KUBE_VERSION="--kube-version $(kubectl version -o json | jq -r .serverVersion.gitVersion)"
[ -n "$KUBEZERO_VERSION" ] && KUBEZERO_VERSION="--version $KUBEZERO_VERSION" [ -n "$KUBEZERO_VERSION" ] && KUBEZERO_VERSION="--version $KUBEZERO_VERSION --devel"
TMPDIR=$(mktemp -d kubezero.XXX) TMPDIR=$(mktemp -d kubezero.XXX)
[ -z "$DEBUG" ] && trap 'rm -rf $TMPDIR' ERR EXIT [ -z "$DEBUG" ] && trap 'rm -rf $TMPDIR' ERR EXIT

5
charts/kubezero/templates/istio-ingress.yaml
View File

@ -1,5 +1,4 @@
{{- define "_ingress" }} {{- define "_ingress" }}
# reuse values for the two sub-charts Public and Private
enabled: {{ .enabled }} enabled: {{ .enabled }}
{{- with .gateway }} {{- with .gateway }}
gateways: gateways:
@ -17,9 +16,7 @@ certificates:
dnsNames: dnsNames:
{{- toYaml $cert.dnsNames | nindent 4 }} {{- toYaml $cert.dnsNames | nindent 4 }}
{{- end }} {{- end }}
{{- with .proxyProtocol }} proxyProtocol: {{ default true .proxyProtocol }}
proxyProtocol: {{ . }}
{{- end }}
{{- end }} {{- end }}

2
charts/kubezero/values.yaml
View File

@ -63,7 +63,7 @@ logging:
enabled: false enabled: false
crds: true crds: true
namespace: logging namespace: logging
targetRevision: 0.7.6 targetRevision: 0.7.7
argocd: argocd:
enabled: false enabled: false