From f8a2e0d51b29037d3433af2c7fe48ef31abab1e6 Mon Sep 17 00:00:00 2001
From: Chris Werner Rau <cwr@teuto.net>
Date: Mon, 26 May 2025 16:39:50 +0200
Subject: [PATCH] chore(t8s-cluster): pin versions

---
 .github/trusted_registries.yaml                 |  8 ++++++--
 .../cinder-csi-plugin/cinder-csi-plugin.yaml    |  4 +++-
 .../cloud-controller-manager.yaml               |  4 +++-
 charts/t8s-cluster/values.yaml                  | 17 +++++++++++++++--
 4 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/.github/trusted_registries.yaml b/.github/trusted_registries.yaml
index 2f90c938ae..e63c4eac55 100644
--- a/.github/trusted_registries.yaml
+++ b/.github/trusted_registries.yaml
@@ -48,8 +48,12 @@ registry.k8s.io:
   kube-state-metrics: ALL_IMAGES
   sig-storage:
     nfs-provisioner: ALL_TAGS
+    csi-attacher: ALL_TAGS
+    csi-node-driver-registrar: ALL_TAGS
+    csi-provisioner: ALL_TAGS
+    csi-resizer: ALL_TAGS
+    csi-snapshotter: ALL_TAGS
+    livenessprobe: ALL_TAGS
   etcd: ALL_TAGS
   provider-os: ALL_IMAGES
-k8s.gcr.io:
-  sig-storage: ALL_IMAGES
 registry-gitlab.teuto.net: ALL_IMAGES
diff --git a/charts/t8s-cluster/templates/workload-cluster/cinder-csi-plugin/cinder-csi-plugin.yaml b/charts/t8s-cluster/templates/workload-cluster/cinder-csi-plugin/cinder-csi-plugin.yaml
index 2b1f9e0292..b9ab137d20 100644
--- a/charts/t8s-cluster/templates/workload-cluster/cinder-csi-plugin/cinder-csi-plugin.yaml
+++ b/charts/t8s-cluster/templates/workload-cluster/cinder-csi-plugin/cinder-csi-plugin.yaml
@@ -1,3 +1,5 @@
+{{- $repoCharts := (index .Values.global.helmRepositories "cloud-provider-openstack").charts -}}
+{{- $selectedVersion := default (index $repoCharts "openstack-cinder-csi") (index $repoCharts (printf "openstack-cinder-csi 2.%d.x" ($.Values.version.minor | int))) -}}
 apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
@@ -13,7 +15,7 @@ spec:
         kind: HelmRepository
         name: {{ printf "%s-cloud-provider-openstack" .Release.Name }}
         namespace: {{ .Release.Namespace }}
-      version: {{ printf "2.%d.x" (.Values.version.minor | int) }}
+      version: {{ $selectedVersion | quote }}
   interval: 1h
   driftDetection:
     mode: enabled
diff --git a/charts/t8s-cluster/templates/workload-cluster/cloud-controller-manager.yaml b/charts/t8s-cluster/templates/workload-cluster/cloud-controller-manager.yaml
index 703f7363d8..5dab7f53f6 100644
--- a/charts/t8s-cluster/templates/workload-cluster/cloud-controller-manager.yaml
+++ b/charts/t8s-cluster/templates/workload-cluster/cloud-controller-manager.yaml
@@ -1,3 +1,5 @@
+{{- $repoCharts := (index .Values.global.helmRepositories "cloud-provider-openstack").charts -}}
+{{- $selectedVersion := default (index $repoCharts "openstack-cloud-controller-manager") (index $repoCharts (printf "openstack-cloud-controller-manager 2.%d.x" ($.Values.version.minor | int))) -}}
 apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
@@ -12,7 +14,7 @@ spec:
         kind: HelmRepository
         name: {{ printf "%s-cloud-provider-openstack" .Release.Name }}
         namespace: {{ .Release.Namespace }}
-      version: {{ printf "2.%d.x" (.Values.version.minor | int) }}
+      version: {{ $selectedVersion | quote }}
   interval: 1h
   driftDetection:
     mode: enabled
diff --git a/charts/t8s-cluster/values.yaml b/charts/t8s-cluster/values.yaml
index 1b0452093b..c422c4ffbe 100644
--- a/charts/t8s-cluster/values.yaml
+++ b/charts/t8s-cluster/values.yaml
@@ -4,15 +4,28 @@ global:
     cilium:
       url: https://helm.cilium.io
       charts:
-        cilium: 1.x.x
+        cilium: 1.17.4
       condition: '{{ eq (include "t8s-cluster.cni" .) "cilium" }}'
     nvidia:
       url: https://helm.ngc.nvidia.com/nvidia
       charts:
-        gpu-operator: 24.x
+        gpu-operator: 24.9.2
       condition: '{{ include "t8s-cluster.hasGPUNodes" (dict "context" $) }}'
     cloud-provider-openstack:
       url: https://kubernetes.github.io/cloud-provider-openstack
+      charts:
+        openstack-cloud-controller-manager: 2.32.0
+        openstack-cloud-controller-manager 2.31.x: 2.31.3
+        openstack-cloud-controller-manager 2.30.x: 2.30.5
+        openstack-cloud-controller-manager 2.29.x: 2.29.3
+        openstack-cloud-controller-manager 2.28.x: 2.28.5
+        openstack-cloud-controller-manager 2.27.x: 2.27.6
+        openstack-cinder-csi: 2.32.0
+        openstack-cinder-csi 2.31.x: 2.31.7
+        openstack-cinder-csi 2.30.x: 2.30.3
+        openstack-cinder-csi 2.29.x: 2.29.2
+        openstack-cinder-csi 2.28.x: 2.28.3
+        openstack-cinder-csi 2.27.x: 2.27.3
     cetic:
       url: https://cetic.github.io/helm-charts
   etcd: