From dd8ab36f5aade6bf42053b46a55e23a34b59713d Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Thu, 24 Aug 2023 09:07:57 +0000
Subject: [PATCH] kubernetes version bump to 1.26.8, fix metrics ingress

---
 charts/kubeadm/Chart.yaml                            | 2 +-
 charts/kubezero-metrics/templates/istio-service.yaml | 2 ++
 charts/kubezero-metrics/values.yaml                  | 3 +++
 charts/kubezero/Chart.yaml                           | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/charts/kubeadm/Chart.yaml b/charts/kubeadm/Chart.yaml
index c2b924d3..292e0287 100644
--- 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.26.7
+version: 1.26.8
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:
diff --git a/charts/kubezero-metrics/templates/istio-service.yaml b/charts/kubezero-metrics/templates/istio-service.yaml
index a6cea887..48a23900 100644
--- a/charts/kubezero-metrics/templates/istio-service.yaml
+++ b/charts/kubezero-metrics/templates/istio-service.yaml
@@ -17,6 +17,8 @@ spec:
   - route:
     - destination:
         host: {{ $service.destination }}
+        port:
+          number: {{ $service.port }}
 ---
 {{- end }}
 
diff --git a/charts/kubezero-metrics/values.yaml b/charts/kubezero-metrics/values.yaml
index ce3cc8fa..57874ffa 100644
--- a/charts/kubezero-metrics/values.yaml
+++ b/charts/kubezero-metrics/values.yaml
@@ -370,6 +370,7 @@ istio:
     url: ""
     gateway: istio-ingress/ingressgateway
     destination: metrics-grafana
+    port: 80
 
   prometheus:
     enabled: false
@@ -377,6 +378,7 @@ istio:
     url: ""
     gateway: istio-ingress/ingressgateway
     destination: metrics-kube-prometheus-st-prometheus
+    port: 9090
 
   alertmanager:
     enabled: false
@@ -384,3 +386,4 @@ istio:
     url: ""
     gateway: istio-ingress/ingressgateway
     destination: metrics-kube-prometheus-st-alertmanager
+    port: 9093
diff --git a/charts/kubezero/Chart.yaml b/charts/kubezero/Chart.yaml
index 10fe4a2f..1f38f925 100644
--- 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.26.7
+version: 1.26.8
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords: