fix: fix istio-ingress, bump logging module

charts/kubezero/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: kubezero
 description: KubeZero - Bootstrap and ArgoCD Root App of Apps chart
 type: application
-version: 1.20.8-1
+version: 1.20.8-3
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:

charts/kubezero/bootstrap.sh

@@ -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"
 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)
 [ -z "$DEBUG" ] && trap 'rm -rf $TMPDIR' ERR EXIT

charts/kubezero/templates/istio-ingress.yaml

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

charts/kubezero/values.yaml

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