Istio version bump, ingress terminationgraceperiod patch, aws-ebs version bump
This commit is contained in:
parent
89c21cb1fe
commit
c3f2c9d614
|
|
@ -2,7 +2,7 @@ apiVersion: v2
|
|||
name: kubezero-aws-ebs-csi-driver
|
||||
description: KubeZero Umbrella Chart for aws-ebs-csi-driver
|
||||
type: application
|
||||
version: 0.3.3
|
||||
version: 0.3.4
|
||||
appVersion: 0.8.0
|
||||
home: https://kubezero.com
|
||||
icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
|
||||
|
|
@ -18,7 +18,7 @@ maintainers:
|
|||
- name: Quarky9
|
||||
dependencies:
|
||||
- name: aws-ebs-csi-driver
|
||||
version: 0.7.0
|
||||
version: 0.7.1
|
||||
repository: https://kubernetes-sigs.github.io/aws-ebs-csi-driver
|
||||
- name: kubezero-lib
|
||||
version: ">= 0.1.3"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# kubezero-aws-ebs-csi-driver
|
||||
|
||||
  
|
||||
  
|
||||
|
||||
KubeZero Umbrella Chart for aws-ebs-csi-driver
|
||||
|
||||
|
|
@ -23,7 +23,7 @@ Kubernetes: `>= 1.16.0`
|
|||
|
||||
| Repository | Name | Version |
|
||||
|------------|------|---------|
|
||||
| https://kubernetes-sigs.github.io/aws-ebs-csi-driver | aws-ebs-csi-driver | 0.7.0 |
|
||||
| https://kubernetes-sigs.github.io/aws-ebs-csi-driver | aws-ebs-csi-driver | 0.7.1 |
|
||||
| https://zero-down-time.github.io/kubezero/ | kubezero-lib | >= 0.1.3 |
|
||||
|
||||
## IAM Role
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@ apiVersion: v2
|
|||
name: kubezero-istio-ingress
|
||||
description: KubeZero Umbrella Chart for Istio based Ingress
|
||||
type: application
|
||||
version: 0.1.0
|
||||
appVersion: 1.8.0
|
||||
version: 0.1.1
|
||||
appVersion: 1.8.1
|
||||
home: https://kubezero.com
|
||||
icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
|
||||
keywords:
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# kubezero-istio-ingress
|
||||
|
||||
  
|
||||
  
|
||||
|
||||
KubeZero Umbrella Chart for Istio based Ingress
|
||||
|
||||
|
|
@ -34,7 +34,7 @@ Kubernetes: `>= 1.16.0`
|
|||
| global.jwtPolicy | string | `"first-party-jwt"` | |
|
||||
| global.logAsJson | bool | `true` | |
|
||||
| global.priorityClassName | string | `"system-cluster-critical"` | |
|
||||
| global.tag | string | `"1.8.0"` | |
|
||||
| global.tag | string | `"1.8.1"` | |
|
||||
| istio-ingress.dnsNames | list | `[]` | |
|
||||
| istio-ingress.enabled | bool | `false` | |
|
||||
| istio-ingress.gateways.istio-ingressgateway.autoscaleEnabled | bool | `false` | |
|
||||
|
|
|
|||
|
|
@ -63,6 +63,7 @@ spec:
|
|||
{{- if .Values.global.priorityClassName }}
|
||||
priorityClassName: "{{ .Values.global.priorityClassName }}"
|
||||
{{- end }}
|
||||
terminationGracePeriodSeconds: 90
|
||||
{{- if .Values.global.proxy.enableCoreDump }}
|
||||
initContainers:
|
||||
- name: enable-core-dump
|
||||
|
|
|
|||
|
|
@ -63,6 +63,7 @@ spec:
|
|||
{{- if .Values.global.priorityClassName }}
|
||||
priorityClassName: "{{ .Values.global.priorityClassName }}"
|
||||
{{- end }}
|
||||
terminationGracePeriodSeconds: 90
|
||||
{{- if .Values.global.proxy.enableCoreDump }}
|
||||
initContainers:
|
||||
- name: enable-core-dump
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# Make sure these values match kuberzero-istio !!!
|
||||
global:
|
||||
hub: docker.io/istio
|
||||
tag: 1.8.0
|
||||
tag: 1.8.1
|
||||
|
||||
logAsJson: true
|
||||
jwtPolicy: first-party-jwt
|
||||
|
|
@ -53,7 +53,7 @@ istio-ingress:
|
|||
port: 443
|
||||
targetPort: 8443
|
||||
nodePort: 30443
|
||||
|
||||
|
||||
dnsNames: []
|
||||
# - '*.example.com'
|
||||
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@ apiVersion: v2
|
|||
name: kubezero-istio
|
||||
description: KubeZero Umbrella Chart for Istio
|
||||
type: application
|
||||
version: 0.4.0
|
||||
appVersion: 1.7.4
|
||||
version: 0.4.1
|
||||
appVersion: 1.8.1
|
||||
home: https://kubezero.com
|
||||
icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
|
||||
keywords:
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# kubezero-istio
|
||||
|
||||
  
|
||||
  
|
||||
|
||||
KubeZero Umbrella Chart for Istio
|
||||
|
||||
|
|
|
|||
|
|
@ -3735,9 +3735,7 @@ webhooks:
|
|||
- CREATE
|
||||
- UPDATE
|
||||
apiGroups:
|
||||
- config.istio.io
|
||||
- security.istio.io
|
||||
- authentication.istio.io
|
||||
- networking.istio.io
|
||||
apiVersions:
|
||||
- "*"
|
||||
|
|
|
|||
|
|
@ -24,9 +24,7 @@ webhooks:
|
|||
- CREATE
|
||||
- UPDATE
|
||||
apiGroups:
|
||||
- config.istio.io
|
||||
- security.istio.io
|
||||
- authentication.istio.io
|
||||
- networking.istio.io
|
||||
apiVersions:
|
||||
- "*"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,12 @@
|
|||
diff --git a/charts/kubezero-istio-ingress/charts/istio-ingress/templates/deployment.yaml b/charts/kubezero-istio-ingress/charts/istio-ingress/templates/deployment.yaml
|
||||
index b69da65..b5137a4 100644
|
||||
--- a/charts/kubezero-istio-ingress/charts/istio-ingress/templates/deployment.yaml
|
||||
+++ b/charts/kubezero-istio-ingress/charts/istio-ingress/templates/deployment.yaml
|
||||
@@ -63,6 +63,7 @@ spec:
|
||||
{{- if .Values.global.priorityClassName }}
|
||||
priorityClassName: "{{ .Values.global.priorityClassName }}"
|
||||
{{- end }}
|
||||
+ terminationGracePeriodSeconds: 90
|
||||
{{- if .Values.global.proxy.enableCoreDump }}
|
||||
initContainers:
|
||||
- name: enable-core-dump
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/bash
|
||||
set -ex
|
||||
|
||||
export ISTIO_VERSION=1.8.0
|
||||
export ISTIO_VERSION=1.8.1
|
||||
|
||||
if [ ! -d istio-$ISTIO_VERSION ]; then
|
||||
NAME="istio-$ISTIO_VERSION"
|
||||
|
|
@ -10,7 +10,7 @@ if [ ! -d istio-$ISTIO_VERSION ]; then
|
|||
curl -sL "$URL" | tar xz
|
||||
fi
|
||||
|
||||
# Extract control plane charts
|
||||
# Extract control plane charts
|
||||
rm -rf charts/base charts/istio-*
|
||||
cp -r istio-${ISTIO_VERSION}/manifests/charts/base charts/
|
||||
cp -r istio-${ISTIO_VERSION}/manifests/charts/istio-control/istio-discovery charts/
|
||||
|
|
@ -18,7 +18,7 @@ cp -r istio-${ISTIO_VERSION}/manifests/charts/istio-control/istio-discovery char
|
|||
# Patch for istiod to control plane
|
||||
patch -p3 -i istio-discovery.patch
|
||||
|
||||
# Minor tweaks
|
||||
# remove unused old telemetry filters
|
||||
rm -f charts/istio-discovery/templates/telemetryv2_1.[67].yaml
|
||||
|
||||
# Ingress charts
|
||||
|
|
@ -29,5 +29,9 @@ cp -r istio-${ISTIO_VERSION}/manifests/charts/gateways/istio-ingress ../kubezero
|
|||
# Rename private chart
|
||||
sed -i -e 's/name: istio-ingress/name: istio-private-ingress/' ../kubezero-istio-ingress/charts/istio-private-ingress/Chart.yaml
|
||||
|
||||
# Patch for ingress for extended termination grace period
|
||||
patch -i ingress-terminationgraceperiod.patch ../kubezero-istio-ingress/charts/istio-ingress/templates/deployment.yaml
|
||||
patch -i ingress-terminationgraceperiod.patch ../kubezero-istio-ingress/charts/istio-private-ingress/templates/deployment.yaml
|
||||
|
||||
# Get matching istioctl
|
||||
[ -x istioctl ] && [ "$(./istioctl version --remote=false)" == $ISTIO_VERSION ] || { curl -sL https://github.com/istio/istio/releases/download/${ISTIO_VERSION}/istioctl-${ISTIO_VERSION}-linux-amd64.tar.gz | tar xz; chmod +x istioctl; }
|
||||
|
|
|
|||
|
|
@ -134,6 +134,7 @@ kube-prometheus-stack:
|
|||
alertmanager:
|
||||
enabled: false
|
||||
alertmanagerSpec:
|
||||
# externalUrl:
|
||||
logFormat: json
|
||||
|
||||
# Metrics adapter
|
||||
|
|
|
|||
Loading…
Reference in New Issue