From f97204ea09c29941d7aa7534044a2f14298fafe4 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Mon, 29 Jan 2024 14:02:50 +0000
Subject: [PATCH] ci and auth version bumps

---
 charts/kubezero-auth/README.md       |  4 ++--
 charts/kubezero-ci/README.md         | 11 ++++++-----
 charts/kubezero-ci/values.yaml       |  3 ++-
 charts/kubezero/templates/istio.yaml |  5 ++++-
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/charts/kubezero-auth/README.md b/charts/kubezero-auth/README.md
index 311bd405..24a7a1b1 100644
--- a/charts/kubezero-auth/README.md
+++ b/charts/kubezero-auth/README.md
@@ -1,6 +1,6 @@
 # kubezero-auth
 
-![Version: 0.4.3](https://img.shields.io/badge/Version-0.4.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 22.0.5](https://img.shields.io/badge/AppVersion-22.0.5-informational?style=flat-square)
+![Version: 0.4.5](https://img.shields.io/badge/Version-0.4.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 22.0.5](https://img.shields.io/badge/AppVersion-22.0.5-informational?style=flat-square)
 
 KubeZero umbrella chart for all things Authentication and Identity management
 
@@ -19,7 +19,7 @@ Kubernetes: `>= 1.26.0`
 | Repository | Name | Version |
 |------------|------|---------|
 | https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.6 |
-| oci://registry-1.docker.io/bitnamicharts | keycloak | 17.3.0 |
+| oci://registry-1.docker.io/bitnamicharts | keycloak | 18.3.2 |
 
 # Keycloak
    
diff --git a/charts/kubezero-ci/README.md b/charts/kubezero-ci/README.md
index aec01d99..3d253f1e 100644
--- a/charts/kubezero-ci/README.md
+++ b/charts/kubezero-ci/README.md
@@ -1,6 +1,6 @@
 # kubezero-ci
 
-![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.8.6](https://img.shields.io/badge/Version-0.8.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 KubeZero umbrella chart for all things CI
 
@@ -20,9 +20,9 @@ Kubernetes: `>= 1.25.0`
 |------------|------|---------|
 | https://aquasecurity.github.io/helm-charts/ | trivy | 0.7.0 |
 | https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.6 |
-| https://charts.jenkins.io | jenkins | 4.9.2 |
-| https://dl.gitea.io/charts/ | gitea | 9.6.1 |
-| https://docs.renovatebot.com/helm-charts | renovate | 37.92.4 |
+| https://charts.jenkins.io | jenkins | 4.12.1 |
+| https://dl.gitea.io/charts/ | gitea | 10.1.0 |
+| https://docs.renovatebot.com/helm-charts | renovate | 37.153.2 |
 
 # Jenkins
 - default build retention 10 builds, 32days
@@ -66,7 +66,7 @@ Kubernetes: `>= 1.25.0`
 | gitea.gitea.metrics.enabled | bool | `false` |  |
 | gitea.gitea.metrics.serviceMonitor.enabled | bool | `true` |  |
 | gitea.image.rootless | bool | `true` |  |
-| gitea.image.tag | string | `"1.21.2"` |  |
+| gitea.image.tag | string | `"1.21.4"` |  |
 | gitea.istio.enabled | bool | `false` |  |
 | gitea.istio.gateway | string | `"istio-ingress/private-ingressgateway"` |  |
 | gitea.istio.url | string | `"git.example.com"` |  |
@@ -112,6 +112,7 @@ Kubernetes: `>= 1.25.0`
 | jenkins.controller.installPlugins[11] | string | `"build-discarder"` |  |
 | jenkins.controller.installPlugins[12] | string | `"dark-theme"` |  |
 | jenkins.controller.installPlugins[13] | string | `"matrix-auth"` |  |
+| jenkins.controller.installPlugins[14] | string | `"reverse-proxy-auth-plugin"` |  |
 | jenkins.controller.installPlugins[1] | string | `"kubernetes-credentials-provider"` |  |
 | jenkins.controller.installPlugins[2] | string | `"workflow-aggregator"` |  |
 | jenkins.controller.installPlugins[3] | string | `"git"` |  |
diff --git a/charts/kubezero-ci/values.yaml b/charts/kubezero-ci/values.yaml
index 72ed6b99..08520878 100644
--- a/charts/kubezero-ci/values.yaml
+++ b/charts/kubezero-ci/values.yaml
@@ -2,7 +2,7 @@ gitea:
   enabled: false
 
   image:
-    tag: 1.21.2
+    #tag: 1.21.4
     rootless: true
 
   repliaCount: 1
@@ -153,6 +153,7 @@ jenkins:
       - build-discarder
       - dark-theme
       - matrix-auth
+      - reverse-proxy-auth-plugin
 
   serviceAccountAgent:
     create: true
diff --git a/charts/kubezero/templates/istio.yaml b/charts/kubezero/templates/istio.yaml
index 39afd781..0b0719ac 100644
--- a/charts/kubezero/templates/istio.yaml
+++ b/charts/kubezero/templates/istio.yaml
@@ -2,12 +2,15 @@
 istiod:
   telemetry:
     enabled: {{ $.Values.metrics.enabled }}
-{{- if .Values.global.highAvailable }}
   pilot:
+{{- if .Values.global.highAvailable }}
     replicaCount: 2
 global:
   defaultPodDisruptionBudget:
     enabled: true
+{{- else }}
+    extraContainerArgs:
+    - --leader-elect=false
 {{- end }}
 {{- with  index .Values "istio" "kiali-server" }}
 kiali-server: