From 2ea6ace05ce134888c813bf36962400fd2cd163c Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Tue, 2 May 2023 10:07:08 +0000
Subject: [PATCH] Some version bumps

---
 charts/kubezero-auth/Chart.yaml               |  6 ++---
 .../templates/keycloak/operator.yaml          | 24 +++++++++----------
 charts/kubezero-ci/Chart.yaml                 |  4 ++--
 charts/kubezero/templates/network.yaml        |  8 +++++++
 docs/v1.25.md                                 |  1 +
 5 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/charts/kubezero-auth/Chart.yaml b/charts/kubezero-auth/Chart.yaml
index 5d17fe4e..452a186e 100644
--- a/charts/kubezero-auth/Chart.yaml
+++ b/charts/kubezero-auth/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: kubezero-auth
 description: KubeZero umbrella chart for all things Authentication and Identity management
 type: application
-version: 0.3.4
-appVersion: 20.0.2
+version: 0.3.5
+appVersion: 21.1.1
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:
@@ -20,4 +20,4 @@ dependencies:
     version: 11.8.1
     repository: https://charts.bitnami.com/bitnami
     condition: postgresql.enabled
-kubeVersion: ">= 1.20.0"
+kubeVersion: ">= 1.25.0"
diff --git a/charts/kubezero-auth/templates/keycloak/operator.yaml b/charts/kubezero-auth/templates/keycloak/operator.yaml
index 4bdd9c60..f31e3b22 100644
--- a/charts/kubezero-auth/templates/keycloak/operator.yaml
+++ b/charts/kubezero-auth/templates/keycloak/operator.yaml
@@ -4,20 +4,20 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   annotations:
-    app.quarkus.io/build-timestamp: 2022-12-13 - 14:29:14 +0000
+    app.quarkus.io/build-timestamp: 2023-04-26 - 10:32:03 +0000
   labels:
     app.kubernetes.io/name: keycloak-operator
-    app.kubernetes.io/version: 20.0.2
+    app.kubernetes.io/version: 21.1.1
   name: keycloak-operator
 ---
 apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    app.quarkus.io/build-timestamp: 2022-12-13 - 14:29:14 +0000
+    app.quarkus.io/build-timestamp: 2023-04-26 - 10:32:03 +0000
   labels:
     app.kubernetes.io/name: keycloak-operator
-    app.kubernetes.io/version: 20.0.2
+    app.kubernetes.io/version: 21.1.1
   name: keycloak-operator
 spec:
   ports:
@@ -26,7 +26,7 @@ spec:
       targetPort: 8080
   selector:
     app.kubernetes.io/name: keycloak-operator
-    app.kubernetes.io/version: 20.0.2
+    app.kubernetes.io/version: 21.1.1
   type: ClusterIP
 ---
 apiVersion: rbac.authorization.k8s.io/v1
@@ -179,24 +179,24 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
-    app.quarkus.io/build-timestamp: 2022-12-13 - 14:29:14 +0000
+    app.quarkus.io/build-timestamp: 2023-04-26 - 10:32:03 +0000
   labels:
     app.kubernetes.io/name: keycloak-operator
-    app.kubernetes.io/version: 20.0.2
+    app.kubernetes.io/version: 21.1.1
   name: keycloak-operator
 spec:
   replicas: 1
   selector:
     matchLabels:
       app.kubernetes.io/name: keycloak-operator
-      app.kubernetes.io/version: 20.0.2
+      app.kubernetes.io/version: 21.1.1
   template:
     metadata:
       annotations:
-        app.quarkus.io/build-timestamp: 2022-12-13 - 14:29:14 +0000
+        app.quarkus.io/build-timestamp: 2023-04-26 - 10:32:03 +0000
       labels:
         app.kubernetes.io/name: keycloak-operator
-        app.kubernetes.io/version: 20.0.2
+        app.kubernetes.io/version: 21.1.1
     spec:
       containers:
         - env:
@@ -205,8 +205,8 @@ spec:
                 fieldRef:
                   fieldPath: metadata.namespace
             - name: OPERATOR_KEYCLOAK_IMAGE
-              value: quay.io/keycloak/keycloak:20.0.2
-          image: quay.io/keycloak/keycloak-operator:20.0.2
+              value: quay.io/keycloak/keycloak:21.1.1
+          image: quay.io/keycloak/keycloak-operator:21.1.1
           imagePullPolicy: Always
           livenessProbe:
             failureThreshold: 3
diff --git a/charts/kubezero-ci/Chart.yaml b/charts/kubezero-ci/Chart.yaml
index 65ea7ac0..d929e8d5 100644
--- a/charts/kubezero-ci/Chart.yaml
+++ b/charts/kubezero-ci/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: kubezero-ci
 description: KubeZero umbrella chart for all things CI
 type: application
-version: 0.6.1
+version: 0.6.2
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:
@@ -22,7 +22,7 @@ dependencies:
     repository: https://gocd.github.io/helm-chart
     condition: gocd.enabled
   - name: gitea
-    version: 8.0.3
+    version: 8.2.0
     repository: https://dl.gitea.io/charts/
     condition: gitea.enabled
   - name: jenkins
diff --git a/charts/kubezero/templates/network.yaml b/charts/kubezero/templates/network.yaml
index 4a8f66af..77002f02 100644
--- a/charts/kubezero/templates/network.yaml
+++ b/charts/kubezero/templates/network.yaml
@@ -19,6 +19,14 @@ cilium:
 
   prometheus:
     enabled: {{ .Values.metrics.enabled }}
+    serviceMonitor:
+      enabled: {{ .Values.metrics.enabled }}
+
+  operator:
+    prometheus:
+      enabled: {{ .Values.metrics.enabled }}
+      serviceMonitor:
+        enabled: {{ .Values.metrics.enabled }}
 
 {{- with index .Values "network" "metallb" }}
 metallb:
diff --git a/docs/v1.25.md b/docs/v1.25.md
index 9c71d520..fbe7a8c2 100644
--- a/docs/v1.25.md
+++ b/docs/v1.25.md
@@ -6,6 +6,7 @@
 - AppArmor is now available and enabled on all controller and worker nodes
 - all KubeZero AMIs and containers updated to latest Alpine 3.17
 - improved worker initialization, ensure cilium is running before any other pod
+- metrics and Grafana dashboards added for Cilium agents and operator
 
 ## Version upgrades
 - cilium 1.13