From cd3d87abc4a7ec6cc2b979dc3451b410e098ae68 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Tue, 4 Jul 2023 15:12:16 +0000
Subject: [PATCH] v1.26.6-rc2

---
 Dockerfile                            | 4 ++--
 charts/kubeadm/Chart.yaml             | 4 ++--
 charts/kubeadm/templates/_helpers.tpl | 2 +-
 charts/kubezero-ci/values.yaml        | 2 +-
 charts/kubezero-network/Chart.yaml    | 4 ++--
 charts/kubezero-network/values.yaml   | 9 +++------
 charts/kubezero/Chart.yaml            | 4 ++--
 charts/kubezero/values.yaml           | 2 +-
 8 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index fa6b1258..0054f966 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,9 @@
-ARG ALPINE_VERSION=3.17
+ARG ALPINE_VERSION=3.18
 
 FROM docker.io/alpine:${ALPINE_VERSION}
 
 ARG ALPINE_VERSION
-ARG KUBE_VERSION=1.25
+ARG KUBE_VERSION=1.26
 
 RUN cd /etc/apk/keys && \
     wget "https://cdn.zero-downtime.net/alpine/stefan@zero-downtime.net-61bb6bfb.rsa.pub" && \
diff --git a/charts/kubeadm/Chart.yaml b/charts/kubeadm/Chart.yaml
index 1c7c9f6e..dd6dacf1 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.25.8
+version: 1.26.6
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:
@@ -11,4 +11,4 @@ keywords:
 maintainers:
   - name: Stefan Reimer
     email: stefan@zero-downtime.net
-kubeVersion: ">= 1.25.0"
+kubeVersion: ">= 1.26.0"
diff --git a/charts/kubeadm/templates/_helpers.tpl b/charts/kubeadm/templates/_helpers.tpl
index fbb46123..9b5ab6f9 100644
--- a/charts/kubeadm/templates/_helpers.tpl
+++ b/charts/kubeadm/templates/_helpers.tpl
@@ -1,6 +1,6 @@
 {{- /* Feature gates for all control plane components */ -}}
 {{- define "kubeadm.featuregates" }}
-{{- $gates := list "CustomCPUCFSQuotaPeriod" "NodeOutOfServiceVolumeDetach" }}
+{{- $gates := list "CustomCPUCFSQuotaPeriod" }}
 {{- if eq .return "csv" }}
 {{- range $key := $gates }}
 {{- $key }}=true,
diff --git a/charts/kubezero-ci/values.yaml b/charts/kubezero-ci/values.yaml
index eaf906d3..b260149c 100644
--- a/charts/kubezero-ci/values.yaml
+++ b/charts/kubezero-ci/values.yaml
@@ -133,7 +133,7 @@ jenkins:
       - htmlpublisher:1.31
       - build-discarder:139.v05696a_7fe240
       - dark-theme:315.va_22e7d692ea_a
-      - kubernetes-credentials-provider:1.211.vc236a_f5a_2f3c
+        # - kubernetes-credentials-provider:1.211.vc236a_f5a_2f3c
 
   serviceAccountAgent:
     create: true
diff --git a/charts/kubezero-network/Chart.yaml b/charts/kubezero-network/Chart.yaml
index 99f96381..4b004678 100644
--- a/charts/kubezero-network/Chart.yaml
+++ b/charts/kubezero-network/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: kubezero-network
 description: KubeZero umbrella chart for all things network
 type: application
-version: 0.4.3
+version: 0.4.4
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:
@@ -19,7 +19,7 @@ dependencies:
     version: ">= 0.1.6"
     repository: https://cdn.zero-downtime.net/charts/
   - name: cilium
-    version: 1.13.1
+    version: 1.13.4
     repository: https://helm.cilium.io/
     condition: cilium.enabled
   - name: metallb
diff --git a/charts/kubezero-network/values.yaml b/charts/kubezero-network/values.yaml
index 1cbc8da7..86e9d006 100644
--- a/charts/kubezero-network/values.yaml
+++ b/charts/kubezero-network/values.yaml
@@ -27,12 +27,9 @@ multus:
 cilium:
   enabled: false
 
-  containerRuntime:
-    integration: crio
-
-  # remove with 1.26
-  securityContext:
-    privileged: true
+  # breaks preloaded images otherwise
+  image:
+    useDigest: false
 
   resources:
     requests:
diff --git a/charts/kubezero/Chart.yaml b/charts/kubezero/Chart.yaml
index 3e4f16b5..0556f3e8 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.25.8-2
+version: 1.26.6
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:
@@ -15,4 +15,4 @@ dependencies:
   - name: kubezero-lib
     version: ">= 0.1.6"
     repository: https://cdn.zero-downtime.net/charts
-kubeVersion: ">= 1.25.0"
+kubeVersion: ">= 1.26.0"
diff --git a/charts/kubezero/values.yaml b/charts/kubezero/values.yaml
index ad5b27b4..a81c398e 100644
--- a/charts/kubezero/values.yaml
+++ b/charts/kubezero/values.yaml
@@ -29,7 +29,7 @@ addons:
 network:
   enabled: true
   retain: true
-  targetRevision: 0.4.3
+  targetRevision: 0.4.4
   cilium:
     cluster: {}