ZeroDownTime
/
kubezero
3
0
Fork 0
Code Issues 1 Pull Requests 24 Releases Wiki Activity

feat: bump Istio version to 1.11.5m switch to distroless images

This commit is contained in:
Stefan Reimer 2021-12-09 14:23:29 +01:00
parent e8b55e16d6
commit ee9f3ab421
16 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
charts/kubezero-istio-ingress/Chart.yaml
View File

@ -2,23 +2,25 @@ apiVersion: v2
name: kubezero-istio-ingress name: kubezero-istio-ingress
description: KubeZero Umbrella Chart for Istio based Ingress description: KubeZero Umbrella Chart for Istio based Ingress
type: application type: application
version: 0.7.5 version: 0.7.6
appVersion: 1.11.3 appVersion: 1.11.5
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:
- kubezero - kubezero
- istio - istio
- ingress
maintainers: maintainers:
- name: Quarky9 - name: Stefan Reimer
email: stefan@zero-downtime.net
dependencies: dependencies:
- name: kubezero-lib - name: kubezero-lib
version: ">= 0.1.4" version: ">= 0.1.4"
repository: https://cdn.zero-downtime.net/charts/ repository: https://cdn.zero-downtime.net/charts/
- name: istio-ingress - name: istio-ingress
version: 1.11.3 version: 1.11.5
condition: istio-ingress.enabled condition: istio-ingress.enabled
- name: istio-private-ingress - name: istio-private-ingress
version: 1.11.3 version: 1.11.5
condition: istio-private-ingress.enabled condition: istio-private-ingress.enabled
kubeVersion: ">= 1.18.0" kubeVersion: ">= 1.20.0"

2
charts/kubezero-istio-ingress/charts/istio-ingress/Chart.yaml
View File

@ -1,6 +1,6 @@
apiVersion: v1 apiVersion: v1
name: istio-ingress name: istio-ingress
version: 1.11.3 version: 1.11.5
tillerVersion: ">=2.7.2" tillerVersion: ">=2.7.2"
description: Helm chart for deploying Istio gateways description: Helm chart for deploying Istio gateways
keywords: keywords:

2
charts/kubezero-istio-ingress/charts/istio-ingress/values.yaml
View File

@ -169,7 +169,7 @@ global:
hub: docker.io/istio hub: docker.io/istio
# Default tag for Istio images. # Default tag for Istio images.
tag: 1.11.3 tag: 1.11.5
# Specify image pull policy if default behavior isn't desired. # Specify image pull policy if default behavior isn't desired.
# Default behavior: latest images will be Always else IfNotPresent. # Default behavior: latest images will be Always else IfNotPresent.

2
charts/kubezero-istio-ingress/charts/istio-private-ingress/Chart.yaml
View File

@ -1,6 +1,6 @@
apiVersion: v1 apiVersion: v1
name: istio-private-ingress name: istio-private-ingress
version: 1.11.3 version: 1.11.5
tillerVersion: ">=2.7.2" tillerVersion: ">=2.7.2"
description: Helm chart for deploying Istio gateways description: Helm chart for deploying Istio gateways
keywords: keywords:

2
charts/kubezero-istio-ingress/charts/istio-private-ingress/values.yaml
View File

@ -169,7 +169,7 @@ global:
hub: docker.io/istio hub: docker.io/istio
# Default tag for Istio images. # Default tag for Istio images.
tag: 1.11.3 tag: 1.11.5
# Specify image pull policy if default behavior isn't desired. # Specify image pull policy if default behavior isn't desired.
# Default behavior: latest images will be Always else IfNotPresent. # Default behavior: latest images will be Always else IfNotPresent.

2
charts/kubezero-istio-ingress/values.yaml
View File

@ -1,7 +1,7 @@
# Make sure these values match kuberzero-istio !!! # Make sure these values match kuberzero-istio !!!
global: global:
#hub: docker.io/istio #hub: docker.io/istio
#tag: 1.11.0 tag: 1.11.5-distroless
logAsJson: true logAsJson: true

13
charts/kubezero-istio/Chart.yaml
View File

@ -2,25 +2,26 @@ apiVersion: v2
name: kubezero-istio name: kubezero-istio
description: KubeZero Umbrella Chart for Istio description: KubeZero Umbrella Chart for Istio
type: application type: application
version: 0.7.5 version: 0.7.6
appVersion: 1.11.3 appVersion: 1.11.5
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:
- kubezero - kubezero
- istio - istio
maintainers: maintainers:
- name: Quarky9 - name: Stefan Reimer
email: stefan@zero-downtime.net
dependencies: dependencies:
- name: kubezero-lib - name: kubezero-lib
version: ">= 0.1.4" version: ">= 0.1.4"
repository: https://cdn.zero-downtime.net/charts/ repository: https://cdn.zero-downtime.net/charts/
- name: base - name: base
version: 1.11.3 version: 1.11.5
- name: istio-discovery - name: istio-discovery
version: 1.11.3 version: 1.11.5
- name: kiali-server - name: kiali-server
version: 1.38.1 version: 1.38.1
# repository: https://github.com/kiali/helm-charts/tree/master/docs # repository: https://github.com/kiali/helm-charts/tree/master/docs
condition: kiali-server.enabled condition: kiali-server.enabled
kubeVersion: ">= 1.18.0" kubeVersion: ">= 1.20.0"

2
charts/kubezero-istio/charts/base/Chart.yaml
View File

@ -1,6 +1,6 @@
apiVersion: v1 apiVersion: v1
name: base name: base
version: 1.11.3 version: 1.11.5
tillerVersion: ">=2.7.2" tillerVersion: ">=2.7.2"
description: Helm chart for deploying Istio cluster resources and CRDs description: Helm chart for deploying Istio cluster resources and CRDs
keywords: keywords:

2
charts/kubezero-istio/charts/istio-discovery/Chart.yaml
View File

@ -1,6 +1,6 @@
apiVersion: v1 apiVersion: v1
name: istio-discovery name: istio-discovery
version: 1.11.3 version: 1.11.5
tillerVersion: ">=2.7.2" tillerVersion: ">=2.7.2"
description: Helm chart for istio control plane description: Helm chart for istio control plane
keywords: keywords:

6
charts/kubezero-istio/charts/istio-discovery/templates/deployment.yaml
View File

@ -54,14 +54,16 @@ spec:
{{ toYaml .Values.pilot.podAnnotations | indent 8 }} {{ toYaml .Values.pilot.podAnnotations | indent 8 }}
{{- end }} {{- end }}
spec: spec:
{{- if .Values.pilot.nodeSelector }}
nodeSelector:
{{ toYaml .Values.pilot.nodeSelector | indent 8 }}
{{- end }}
serviceAccountName: istiod{{- if not (eq .Values.revision "") }}-{{ .Values.revision }}{{- end }} serviceAccountName: istiod{{- if not (eq .Values.revision "") }}-{{ .Values.revision }}{{- end }}
{{- if .Values.global.priorityClassName }} {{- if .Values.global.priorityClassName }}
priorityClassName: "{{ .Values.global.priorityClassName }}" priorityClassName: "{{ .Values.global.priorityClassName }}"
{{- end }} {{- end }}
securityContext: securityContext:
fsGroup: 1337 fsGroup: 1337
nodeSelector:
node-role.kubernetes.io/control-plane: ""
tolerations: tolerations:
- effect: NoSchedule - effect: NoSchedule
key: node-role.kubernetes.io/master key: node-role.kubernetes.io/master

2
charts/kubezero-istio/charts/istio-discovery/values.yaml
View File

@ -239,7 +239,7 @@ global:
# Dev builds from prow are on gcr.io # Dev builds from prow are on gcr.io
hub: docker.io/istio hub: docker.io/istio
# Default tag for Istio images. # Default tag for Istio images.
tag: 1.11.3 tag: 1.11.5
# Specify image pull policy if default behavior isn't desired. # Specify image pull policy if default behavior isn't desired.
# Default behavior: latest images will be Always else IfNotPresent. # Default behavior: latest images will be Always else IfNotPresent.

2
charts/kubezero-istio/templates/grafana-dashboards.yaml
View File

@ -6,7 +6,7 @@ metadata:
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
labels: labels:
grafana_dashboard: "1" grafana_dashboard: "1"
{{ include "kubezero-lib.labels" . | indent 4 }} {{- include "kubezero-lib.labels" . | nindent 4 }}
annotations: annotations:
k8s-sidecar-target-directory: Istio k8s-sidecar-target-directory: Istio
binaryData: binaryData:

5
charts/kubezero-istio/values.yaml
View File

@ -1,6 +1,6 @@
global: global:
# hub: docker.io/istio # hub: docker.io/istio
# tag: 1.11.0 tag: 1.11.5-distroless
logAsJson: true logAsJson: true
@ -14,9 +14,10 @@ istio-discovery:
autoscaleEnabled: false autoscaleEnabled: false
replicaCount: 1 replicaCount: 1
# Not implemented, monkey patched in the chart itself
nodeSelector: nodeSelector:
node-role.kubernetes.io/control-plane: "" node-role.kubernetes.io/control-plane: ""
# Not implemented, monkey patched in the chart itself
tolerations: tolerations:
- effect: NoSchedule - effect: NoSchedule
key: node-role.kubernetes.io/master key: node-role.kubernetes.io/master

4
charts/kubezero-istio/zdt.patch
View File

@ -68,12 +68,10 @@ diff -tubr istio/manifests/charts/gateways/istio-ingress/templates/service.yaml
diff -tubr istio/manifests/charts/istio-control/istio-discovery/templates/deployment.yaml istio.zdt/manifests/charts/istio-control/istio-discovery/templates/deployment.yaml diff -tubr istio/manifests/charts/istio-control/istio-discovery/templates/deployment.yaml istio.zdt/manifests/charts/istio-control/istio-discovery/templates/deployment.yaml
--- istio/manifests/charts/istio-control/istio-discovery/templates/deployment.yaml 2021-07-15 07:32:30.000000000 +0200 --- istio/manifests/charts/istio-control/istio-discovery/templates/deployment.yaml 2021-07-15 07:32:30.000000000 +0200
+++ istio.zdt/manifests/charts/istio-control/istio-discovery/templates/deployment.yaml 2021-08-10 15:46:23.216421660 +0200 +++ istio.zdt/manifests/charts/istio-control/istio-discovery/templates/deployment.yaml 2021-08-10 15:46:23.216421660 +0200
@@ -60,6 +60,11 @@ @@ -60,6 +60,9 @@
{{- end }} {{- end }}
securityContext: securityContext:
fsGroup: 1337 fsGroup: 1337
+ nodeSelector:
+ node-role.kubernetes.io/control-plane: ""
+ tolerations: + tolerations:
+ - effect: NoSchedule + - effect: NoSchedule
+ key: node-role.kubernetes.io/master + key: node-role.kubernetes.io/master

2
charts/kubezero/Chart.yaml
View File

@ -2,7 +2,7 @@ apiVersion: v2
name: kubezero name: kubezero
description: KubeZero - Root App of Apps chart description: KubeZero - Root App of Apps chart
type: application type: application
version: 1.21.7-7 version: 1.21.7-8
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:

4
charts/kubezero/values.yaml
View File

@ -32,12 +32,12 @@ storage:
istio: istio:
enabled: false enabled: false
namespace: istio-system namespace: istio-system
targetRevision: 0.7.5 targetRevision: 0.7.6
istio-ingress: istio-ingress:
enabled: false enabled: false
namespace: istio-ingress namespace: istio-ingress
targetRevision: 0.7.5 targetRevision: 0.7.6
metrics: metrics:
enabled: false enabled: false