feat: v1.24.9, istio 1.16

2022-12-13 12:13:33 +00:00 · 2022-12-13 12:13:33 +00:00 · c4968320c3
commit c4968320c3
parent c10853f2d2
24 changed files with 97 additions and 80 deletions
--- a/charts/kubeadm/Chart.yaml
+++ b/charts/kubeadm/Chart.yaml
@ -2,7 +2,7 @@ apiVersion: v2
 name: kubeadm
 description: KubeZero Kubeadm cluster config
 type: application
-version: 1.24.7
+version: 1.24.9
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:
--- a/charts/kubeadm/README.md
+++ b/charts/kubeadm/README.md
@ -1,6 +1,6 @@
 # kubeadm

-![Version: 1.24.7](https://img.shields.io/badge/Version-1.24.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 1.24.9](https://img.shields.io/badge/Version-1.24.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)

 KubeZero Kubeadm cluster config

--- a/charts/kubezero-ci/README.md
+++ b/charts/kubezero-ci/README.md
@ -97,7 +97,7 @@ Kubernetes: `>= 1.20.0`
 | jenkins.controller.initContainerResources.requests.memory | string | `"256Mi"` |  |
 | jenkins.controller.installPlugins[0] | string | `"kubernetes:3734.v562b_b_a_627ea_c"` |  |
 | jenkins.controller.installPlugins[1] | string | `"workflow-aggregator:581.v0c46fa_697ffd"` |  |
-| jenkins.controller.installPlugins[2] | string | `"git:4.14.1"` |  |
+| jenkins.controller.installPlugins[2] | string | `"git:4.14.2"` |  |
 | jenkins.controller.installPlugins[3] | string | `"configuration-as-code:1569.vb_72405b_80249"` |  |
 | jenkins.controller.installPlugins[4] | string | `"antisamy-markup-formatter:155.v795fb_8702324"` |  |
 | jenkins.controller.installPlugins[5] | string | `"prometheus:2.0.11"` |  |
--- a/charts/kubezero-ci/values.yaml
+++ b/charts/kubezero-ci/values.yaml
@ -116,7 +116,7 @@ jenkins:
    installPlugins:
      - kubernetes:3734.v562b_b_a_627ea_c
      - workflow-aggregator:581.v0c46fa_697ffd
-      - git:4.14.1
+      - git:4.14.2
      - configuration-as-code:1569.vb_72405b_80249
      - antisamy-markup-formatter:155.v795fb_8702324
      - prometheus:2.0.11
--- a/charts/kubezero-istio-gateway/Chart.yaml
+++ b/charts/kubezero-istio-gateway/Chart.yaml
@ -2,7 +2,7 @@ apiVersion: v2
 name: kubezero-istio-gateway
 description: KubeZero Umbrella Chart for Istio gateways
 type: application
-version: 0.8.2
+version: 0.9.0
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:
@ -17,6 +17,6 @@ dependencies:
    version: ">= 0.1.5"
    repository: https://cdn.zero-downtime.net/charts/
  - name: gateway
-    version: 1.14.3
+    version: 1.16.1
    repository: https://istio-release.storage.googleapis.com/charts
-kubeVersion: ">= 1.20.0"
+kubeVersion: ">= 1.24.0"
--- a/charts/kubezero-istio-gateway/README.md
+++ b/charts/kubezero-istio-gateway/README.md
@ -1,6 +1,6 @@
 # kubezero-istio-gateway

-![Version: 0.8.2](https://img.shields.io/badge/Version-0.8.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 0.9.0](https://img.shields.io/badge/Version-0.9.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)

 KubeZero Umbrella Chart for Istio gateways

@ -16,12 +16,12 @@ Installs Istio Ingress Gateways, requires kubezero-istio to be installed !

 ## Requirements

-Kubernetes: `>= 1.20.0`
+Kubernetes: `>= 1.24.0`

 | Repository | Name | Version |
 |------------|------|---------|
 | https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.5 |
-| https://istio-release.storage.googleapis.com/charts | gateway | 1.14.3 |
+| https://istio-release.storage.googleapis.com/charts | gateway | 1.16.1 |

 ## Values

--- a/charts/kubezero-istio-gateway/charts/gateway/Chart.yaml
+++ b/charts/kubezero-istio-gateway/charts/gateway/Chart.yaml
@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.14.3
+appVersion: 1.16.1
 description: Helm chart for deploying Istio gateways
 icon: https://istio.io/latest/favicons/android-192x192.png
 keywords:
@ -9,4 +9,4 @@ name: gateway
 sources:
 - http://github.com/istio/istio
 type: application
-version: 1.14.3
+version: 1.16.1
--- a/charts/kubezero-istio-gateway/charts/gateway/templates/deployment.yaml
+++ b/charts/kubezero-istio-gateway/charts/gateway/templates/deployment.yaml
@ -106,6 +106,10 @@ spec:
      tolerations:
        {{- toYaml . | nindent 8 }}
      {{- end }}
+      {{- with .Values.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
      {{- with .Values.volumes }}
      volumes:
        {{- toYaml . | nindent 8 }}
--- a/charts/kubezero-istio-gateway/charts/gateway/values.schema.json
+++ b/charts/kubezero-istio-gateway/charts/gateway/values.schema.json
@ -185,6 +185,9 @@
    "tolerations": {
      "type": "array"
    },
+    "topologySpreadConstraints": {
+      "type": "array"
+    },
    "networkGateway": {
      "type": "string"
    },
--- a/charts/kubezero-istio-gateway/charts/gateway/values.yaml
+++ b/charts/kubezero-istio-gateway/charts/gateway/values.yaml
@ -83,6 +83,8 @@ nodeSelector: {}

 tolerations: []

+topologySpreadConstraints: []
+
 affinity: {}

 # If specified, the gateway will act as a network gateway for the given network.
--- a/charts/kubezero-istio-gateway/zdt.patch
+++ b/charts/kubezero-istio-gateway/zdt.patch
@ -1,6 +1,6 @@
 diff -tubr charts/gateway.orig/templates/deployment.yaml charts/gateway/templates/deployment.yaml
--- charts/gateway.orig/templates/deployment.yaml	2022-04-21 17:33:30.042035869 +0200
-+++ charts/gateway/templates/deployment.yaml	2022-04-21 18:17:15.130605952 +0200
+--- charts/gateway.orig/templates/deployment.yaml	2022-12-09 14:58:33.000000000 +0000
+++ charts/gateway/templates/deployment.yaml	2022-12-13 11:43:02.196667885 +0000
@@ -11,6 +11,9 @@
   {{- if not .Values.autoscaling.enabled }}
   replicas: {{ .Values.replicaCount }}
@ -30,8 +30,8 @@ diff -tubr charts/gateway.orig/templates/deployment.yaml charts/gateway/template
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
-@@ -98,3 +106,7 @@
-       tolerations:
+@@ -102,3 +110,7 @@
+       topologySpreadConstraints:
         {{- toYaml . | nindent 8 }}
       {{- end }}
 +      {{- with .Values.volumes }}
@ -39,8 +39,8 @@ diff -tubr charts/gateway.orig/templates/deployment.yaml charts/gateway/template
 +        {{- toYaml . | nindent 8 }}
 +      {{- end }}
 diff -tubr charts/gateway.orig/templates/service.yaml charts/gateway/templates/service.yaml
--- charts/gateway.orig/templates/service.yaml	2022-04-21 17:33:30.042035869 +0200
-+++ charts/gateway/templates/service.yaml	2022-04-21 17:33:41.801806959 +0200
+--- charts/gateway.orig/templates/service.yaml	2022-12-09 14:58:33.000000000 +0000
+++ charts/gateway/templates/service.yaml	2022-12-12 22:52:27.629670669 +0000
@@ -38,7 +38,14 @@
     port: 15017
     targetPort: 15017
@ -55,12 +55,12 @@ diff -tubr charts/gateway.orig/templates/service.yaml charts/gateway/templates/s
 +    {{- end }}
 +  {{- end }}
 {{- end }}
-   selector:
-     {{- include "gateway.selectorLabels" . | nindent 4 }}
+ {{- if .Values.service.externalIPs }}
+   externalIPs: {{- range .Values.service.externalIPs }}
 diff -tubr charts/gateway.orig/values.schema.json charts/gateway/values.schema.json
--- charts/gateway.orig/values.schema.json	2022-04-21 17:33:30.042035869 +0200
-+++ charts/gateway/values.schema.json	2022-04-21 17:52:51.007536238 +0200
-@@ -47,6 +47,12 @@
+--- charts/gateway.orig/values.schema.json	2022-12-09 14:58:33.000000000 +0000
+++ charts/gateway/values.schema.json	2022-12-12 22:52:27.629670669 +0000
+@@ -51,6 +51,12 @@
     "labels": {
       "type": "object"
     },
--- a/charts/kubezero-istio/Chart.yaml
+++ b/charts/kubezero-istio/Chart.yaml
@ -2,7 +2,7 @@ apiVersion: v2
 name: kubezero-istio
 description: KubeZero Umbrella Chart for Istio
 type: application
-version: 0.8.5
+version: 0.9.0
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:
@ -16,13 +16,13 @@ dependencies:
    version: ">= 0.1.5"
    repository: https://cdn.zero-downtime.net/charts/
  - name: base
-    version: 1.14.3
+    version: 1.16.1
    repository: https://istio-release.storage.googleapis.com/charts
  - name: istiod
-    version: 1.14.3
+    version: 1.16.1
    repository: https://istio-release.storage.googleapis.com/charts
  - name: kiali-server
-    version: "1.54"
+    version: "1.60.0"
    repository: https://kiali.org/helm-charts
    condition: kiali-server.enabled
 kubeVersion: ">= 1.24.0"
--- a/charts/kubezero-istio/README.md
+++ b/charts/kubezero-istio/README.md
@ -1,6 +1,6 @@
 # kubezero-istio

-![Version: 0.8.5](https://img.shields.io/badge/Version-0.8.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 0.9.0](https://img.shields.io/badge/Version-0.9.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)

 KubeZero Umbrella Chart for Istio

@ -21,9 +21,9 @@ Kubernetes: `>= 1.24.0`
 | Repository | Name | Version |
 |------------|------|---------|
 | https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.5 |
-| https://istio-release.storage.googleapis.com/charts | base | 1.14.3 |
-| https://istio-release.storage.googleapis.com/charts | istiod | 1.14.3 |
-| https://kiali.org/helm-charts | kiali-server | 1.54 |
+| https://istio-release.storage.googleapis.com/charts | base | 1.16.1 |
+| https://istio-release.storage.googleapis.com/charts | istiod | 1.16.1 |
+| https://kiali.org/helm-charts | kiali-server | 1.60.0 |

 ## Values

--- a/charts/kubezero-istio/dashboards.yaml
+++ b/charts/kubezero-istio/dashboards.yaml
@ -1,22 +1,22 @@
-# Revision 128 = 1.14.3
+# Revision 148 = 1.16
 configmap: grafana-dashboards
 gzip: true
 folder: Istio
 condition: '.Values.istiod.telemetry.enabled'
 dashboards:
 - name: istio-control-plane
-  url: https://grafana.com/api/dashboards/7645/revisions/128/download
+  url: https://grafana.com/api/dashboards/7645/revisions/148/download
  tags:
  - Istio
 - name: istio-mesh
-  url: https://grafana.com/api/dashboards/7639/revisions/128/download
+  url: https://grafana.com/api/dashboards/7639/revisions/148/download
  tags:
  - Istio
 - name: istio-service
-  url: https://grafana.com/api/dashboards/7636/revisions/128/download
+  url: https://grafana.com/api/dashboards/7636/revisions/148/download
  tags:
  - Istio
 - name: istio-workload
-  url: https://grafana.com/api/dashboards/7630/revisions/128/download
+  url: https://grafana.com/api/dashboards/7630/revisions/148/download
  tags:
  - Istio
--- a/charts/kubezero-istio/templates/grafana-dashboards.yaml
+++ b/charts/kubezero-istio/templates/grafana-dashboards.yaml
--- a/charts/kubezero-istio/update.sh
+++ b/charts/kubezero-istio/update.sh
@ -7,7 +7,7 @@ export KIALI_VERSION=$(yq eval '.dependencies[] | select(.name=="kiali-server")
 helm dep update

 # 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; }
+# [ -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; }

 # Fetch dashboards from Grafana.com and update ZDT CM
 ../kubezero-metrics/sync_grafana_dashboards.py dashboards.yaml templates/grafana-dashboards.yaml
--- a/charts/kubezero-istio/values.yaml
+++ b/charts/kubezero-istio/values.yaml
@ -1,6 +1,5 @@
 global:
-  # hub: docker.io/istio
-  tag: 1.14.4-distroless
+  variant: distroless

  logAsJson: true

--- a/charts/kubezero-metrics/Chart.yaml
+++ b/charts/kubezero-metrics/Chart.yaml
@ -17,6 +17,7 @@ dependencies:
  - name: kubezero-lib
    version: ">= 0.1.5"
    repository: https://cdn.zero-downtime.net/charts/
+    # https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack
  - name: kube-prometheus-stack
    version: 42.2.1
    # Switch back to upstream once all alerts are fixed eg. etcd gpcr
--- a/charts/kubezero-metrics/README.md
+++ b/charts/kubezero-metrics/README.md
@ -1,6 +1,6 @@
 # kubezero-metrics

-![Version: 0.8.7](https://img.shields.io/badge/Version-0.8.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 0.8.8](https://img.shields.io/badge/Version-0.8.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)

 KubeZero Umbrella Chart for Prometheus, Grafana and Alertmanager as well as all Kubernetes integrations.

@ -18,10 +18,10 @@ Kubernetes: `>= 1.24.0`

 | Repository | Name | Version |
 |------------|------|---------|
-|  | kube-prometheus-stack | 41.4.1 |
-|  | prometheus-pushgateway | 1.20.0 |
+|  | kube-prometheus-stack | 42.2.1 |
 | https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.5 |
-| https://prometheus-community.github.io/helm-charts | prometheus-adapter | 3.4.0 |
+| https://prometheus-community.github.io/helm-charts | prometheus-adapter | 3.4.2 |
+| https://prometheus-community.github.io/helm-charts | prometheus-pushgateway | 2.0.2 |

 ## Values

--- a/charts/kubezero/Chart.yaml
+++ b/charts/kubezero/Chart.yaml
@ -2,7 +2,7 @@ apiVersion: v2
 name: kubezero
 description: KubeZero - Root App of Apps chart
 type: application
-version: 1.24.7
+version: 1.24.9
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:
--- a/charts/kubezero/README.md
+++ b/charts/kubezero/README.md
@ -1,6 +1,6 @@
 # kubezero

-![Version: 1.24.7](https://img.shields.io/badge/Version-1.24.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 1.24.9](https://img.shields.io/badge/Version-1.24.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)

 KubeZero - Root App of Apps chart

@ -45,15 +45,15 @@ Kubernetes: `>= 1.24.0`
 | istio-ingress.enabled | bool | `false` |  |
 | istio-ingress.gateway.service | object | `{}` |  |
 | istio-ingress.namespace | string | `"istio-ingress"` |  |
-| istio-ingress.targetRevision | string | `"0.8.2"` |  |
+| istio-ingress.targetRevision | string | `"0.9.0"` |  |
 | istio-private-ingress.chart | string | `"kubezero-istio-gateway"` |  |
 | istio-private-ingress.enabled | bool | `false` |  |
 | istio-private-ingress.gateway.service | object | `{}` |  |
 | istio-private-ingress.namespace | string | `"istio-ingress"` |  |
-| istio-private-ingress.targetRevision | string | `"0.8.2"` |  |
+| istio-private-ingress.targetRevision | string | `"0.9.0"` |  |
 | istio.enabled | bool | `false` |  |
 | istio.namespace | string | `"istio-system"` |  |
-| istio.targetRevision | string | `"0.8.5"` |  |
+| istio.targetRevision | string | `"0.9.0"` |  |
 | kubezero.defaultTargetRevision | string | `"*"` |  |
 | kubezero.gitSync | object | `{}` |  |
 | kubezero.repoURL | string | `"https://cdn.zero-downtime.net/charts"` |  |
@ -65,7 +65,7 @@ Kubernetes: `>= 1.24.0`
 | metrics.istio.grafana | object | `{}` |  |
 | metrics.istio.prometheus | object | `{}` |  |
 | metrics.namespace | string | `"monitoring"` |  |
-| metrics.targetRevision | string | `"0.8.7"` |  |
+| metrics.targetRevision | string | `"0.8.8"` |  |
 | network.cilium.cluster | object | `{}` |  |
 | network.enabled | bool | `true` |  |
 | network.retain | bool | `true` |  |
--- a/charts/kubezero/templates/istio-ingress.yaml
+++ b/charts/kubezero/templates/istio-ingress.yaml
@ -2,9 +2,6 @@

 gateway:
  name: istio-ingressgateway
-  labels:
-    app: istio-ingressgateway
-    istio: ingressgateway

  {{- with index .Values "istio-ingress" "gateway" "replicaCount" }}
  replicaCount: {{ . }}
@ -19,17 +16,24 @@ gateway:
        - matchExpressions:
          - key: node.kubernetes.io/ingress.public
            operator: Exists
-    podAntiAffinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
-      - labelSelector:
-          matchExpressions:
-          - key: app
-            operator: In
-            values:
-            - istio-ingressgateway
-        topologyKey: "kubernetes.io/hostname"
  {{- end }}

+  topologySpreadConstraints:
+    - maxSkew: 1
+      topologyKey: topology.kubernetes.io/zone
+      whenUnsatisfiable: DoNotSchedule
+      labelSelector:
+        matchLabels:
+          app: istio-ingressgateway
+          istio: ingressgateway
+    - maxSkew: 1
+      topologyKey: kubernetes.io/hostname
+      whenUnsatisfiable: DoNotSchedule
+      labelSelector:
+        matchLabels:
+          app: istio-ingressgateway
+          istio: ingressgateway
+
  service:
    {{- with index .Values "istio-ingress" "gateway" "service" "type" }}
    type: {{ . }}
--- a/charts/kubezero/templates/istio-private-ingress.yaml
+++ b/charts/kubezero/templates/istio-private-ingress.yaml
@ -2,9 +2,6 @@

 gateway:
  name: istio-private-ingressgateway
-  labels:
-    app: istio-private-ingressgateway
-    istio: private-ingressgateway

  {{- with index .Values "istio-private-ingress" "gateway" "replicaCount" }}
  replicaCount: {{ . }}
@ -19,17 +16,24 @@ gateway:
        - matchExpressions:
          - key: node.kubernetes.io/ingress.private
            operator: Exists
-    podAntiAffinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
-      - labelSelector:
-          matchExpressions:
-          - key: app
-            operator: In
-            values:
-            - istio-private-ingressgateway
-        topologyKey: "kubernetes.io/hostname"
  {{- end }}

+  topologySpreadConstraints:
+    - maxSkew: 1
+      topologyKey: topology.kubernetes.io/zone
+      whenUnsatisfiable: DoNotSchedule
+      labelSelector:
+        matchLabels:
+          app: istio-private-ingressgateway
+          istio: private-ingressgateway
+    - maxSkew: 1
+      topologyKey: kubernetes.io/hostname
+      whenUnsatisfiable: DoNotSchedule
+      labelSelector:
+        matchLabels:
+          app: istio-private-ingressgateway
+          istio: private-ingressgateway
+
  service:
    ports:
    - name: status-port
--- a/charts/kubezero/values.yaml
+++ b/charts/kubezero/values.yaml
@ -45,13 +45,13 @@ storage:
 istio:
  enabled: false
  namespace: istio-system
-  targetRevision: 0.8.5
+  targetRevision: 0.9.0

 istio-ingress:
  enabled: false
  chart: kubezero-istio-gateway
  namespace: istio-ingress
-  targetRevision: 0.8.2
+  targetRevision: 0.9.0
  gateway:
    service: {}

@ -59,7 +59,7 @@ istio-private-ingress:
  enabled: false
  chart: kubezero-istio-gateway
  namespace: istio-ingress
-  targetRevision: 0.8.2
+  targetRevision: 0.9.0
  gateway:
    service: {}