Istio version bump, make http10 support optional, enable redis,mysql protocol support
This commit is contained in:
parent
4cb3bd01c5
commit
cd5b38bb6c
2
charts/kubezero-istio/.gitignore
vendored
Normal file
2
charts/kubezero-istio/.gitignore
vendored
Normal file
@ -0,0 +1,2 @@
|
||||
istioctl
|
||||
istio-*
|
@ -2,8 +2,8 @@ apiVersion: v2
|
||||
name: kubezero-istio
|
||||
description: KubeZero Umbrella Chart for Istio
|
||||
type: application
|
||||
version: 0.3.3
|
||||
appVersion: 1.7.1
|
||||
version: 0.3.4
|
||||
appVersion: 1.7.3
|
||||
home: https://kubezero.com
|
||||
icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
|
||||
keywords:
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -30,13 +30,13 @@ spec:
|
||||
name: istio-private-ingressgateway
|
||||
{{- end }}
|
||||
env:
|
||||
{{- if .Values.ingress.private.http10 }}
|
||||
- name: ISTIO_META_HTTP10
|
||||
value: '"1"'
|
||||
{{- end }}
|
||||
# https://github.com/istio/istio/issues/26524, not in 1.7 either
|
||||
#- name: TERMINATION_DRAIN_DURATION_SECONDS
|
||||
# value: "60"
|
||||
- name: ISTIO_META_HTTP10
|
||||
value: '"1"'
|
||||
- name: ISTIO_META_ROUTER_MODE
|
||||
value: standard
|
||||
#- name: ISTIO_META_IDLE_TIMEOUT
|
||||
# value: "3600s"
|
||||
{{- if eq .Values.ingress.type "NodePort" }}
|
||||
|
@ -27,13 +27,13 @@ spec:
|
||||
name: istio-ingressgateway
|
||||
{{- end }}
|
||||
env:
|
||||
{{- if .Values.ingress.http10 }}
|
||||
- name: ISTIO_META_HTTP10
|
||||
value: '"1"'
|
||||
{{- end }}
|
||||
# https://github.com/istio/istio/issues/26524, not in 1.7 !
|
||||
#- name: TERMINATION_DRAIN_DURATION_SECONDS
|
||||
# value: "60"
|
||||
- name: ISTIO_META_HTTP10
|
||||
value: '"1"'
|
||||
- name: ISTIO_META_ROUTER_MODE
|
||||
value: standard
|
||||
#- name: ISTIO_META_IDLE_TIMEOUT
|
||||
# value: "3600s"
|
||||
{{- if eq .Values.ingress.type "NodePort" }}
|
||||
@ -75,6 +75,13 @@ spec:
|
||||
requests:
|
||||
cpu: 100m
|
||||
memory: 128Mi
|
||||
env:
|
||||
- name: PILOT_ENABLE_MYSQL_FILTER
|
||||
value: "true"
|
||||
- name: PILOT_ENABLE_REDIS_FILTER
|
||||
value: "true"
|
||||
- name: PILOT_HTTP10
|
||||
value: "true"
|
||||
policy:
|
||||
enabled: true
|
||||
k8s:
|
||||
|
@ -1,21 +1,23 @@
|
||||
#!/bin/bash
|
||||
set -ex
|
||||
|
||||
ISTIO_VERSION=1.7.1
|
||||
export ISTIO_VERSION=1.7.3
|
||||
|
||||
NAME="istio-$ISTIO_VERSION"
|
||||
URL="https://github.com/istio/istio/releases/download/${ISTIO_VERSION}/istio-${ISTIO_VERSION}-linux-amd64.tar.gz"
|
||||
if [ ! -d istio-$ISTIO_VERSION ]; then
|
||||
NAME="istio-$ISTIO_VERSION"
|
||||
URL="https://github.com/istio/istio/releases/download/${ISTIO_VERSION}/istio-${ISTIO_VERSION}-linux-amd64.tar.gz"
|
||||
|
||||
curl -sL "$URL" | tar xz
|
||||
curl -sL "$URL" | tar xz
|
||||
fi
|
||||
|
||||
# Now lets extract what we need
|
||||
rm -rf charts/istio-operator
|
||||
cp -r istio-${ISTIO_VERSION}/manifests/charts/istio-operator charts
|
||||
|
||||
rm -rf istio-${ISTIO_VERSION}
|
||||
|
||||
# Apply our patch
|
||||
patch -i istio-operator.patch -p0
|
||||
|
||||
[ -x istioctl ] || { curl -sL https://github.com/istio/istio/releases/download/${ISTIO_VERSION}/istioctl-${ISTIO_VERSION}-linux-amd64.tar.gz | tar xz; chmod +x istioctl; }
|
||||
|
||||
# Extract base / CRDs from istioctl into plain manifest to workaround chicken egg problem with CRDs
|
||||
istioctl manifest generate --set profile=empty --set components.base.enabled=true > templates/istio-base.yaml
|
||||
./istioctl manifest generate --set profile=empty --set components.base.enabled=true > templates/istio-base.yaml
|
||||
|
@ -14,4 +14,4 @@ ingress:
|
||||
|
||||
istio-operator:
|
||||
hub: docker.io/istio
|
||||
tag: 1.7.1
|
||||
tag: 1.7.3
|
||||
|
Loading…
Reference in New Issue
Block a user