From 8a7b4a820106c1338ae25da321dcd7fcd22c6cb5 Mon Sep 17 00:00:00 2001
From: Mikael Frykholm <mifr@sunet.se>
Date: Thu, 6 Feb 2025 07:53:05 +0100
Subject: [PATCH] More cores and ram, upgrade cinder to newest upstream.

---
 k8s/cinder-csi-controllerplugin-rbac.yaml |  3 +--
 k8s/cinder-csi-controllerplugin.yaml      | 13 +++++++------
 k8s/cinder-csi-nodeplugin.yaml            |  7 ++++---
 vars.tf                                   |  6 +++---
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/k8s/cinder-csi-controllerplugin-rbac.yaml b/k8s/cinder-csi-controllerplugin-rbac.yaml
index 067e0f8..b05dfca 100644
--- a/k8s/cinder-csi-controllerplugin-rbac.yaml
+++ b/k8s/cinder-csi-controllerplugin-rbac.yaml
@@ -53,7 +53,7 @@ metadata:
 rules:
   - apiGroups: [""]
     resources: ["persistentvolumes"]
-    verbs: ["get", "list", "watch", "create", "delete"]
+    verbs: ["get", "list", "watch", "create", "delete", "patch"]
   - apiGroups: [""]
     resources: ["persistentvolumeclaims"]
     verbs: ["get", "list", "watch", "update"]
@@ -181,4 +181,3 @@ roleRef:
   kind: ClusterRole
   name: csi-resizer-role
   apiGroup: rbac.authorization.k8s.io
-
diff --git a/k8s/cinder-csi-controllerplugin.yaml b/k8s/cinder-csi-controllerplugin.yaml
index 3deeae6..19027a5 100644
--- a/k8s/cinder-csi-controllerplugin.yaml
+++ b/k8s/cinder-csi-controllerplugin.yaml
@@ -25,7 +25,7 @@ spec:
       serviceAccount: csi-cinder-controller-sa
       containers:
         - name: csi-attacher
-          image: registry.k8s.io/sig-storage/csi-attacher:v4.2.0
+          image: registry.k8s.io/sig-storage/csi-attacher:v4.7.0
           args:
             - "--csi-address=$(ADDRESS)"
             - "--timeout=3m"
@@ -39,7 +39,7 @@ spec:
             - name: socket-dir
               mountPath: /var/lib/csi/sockets/pluginproxy/
         - name: csi-provisioner
-          image: registry.k8s.io/sig-storage/csi-provisioner:v3.4.1
+          image: registry.k8s.io/sig-storage/csi-provisioner:v5.1.0
           args:
             - "--csi-address=$(ADDRESS)"
             - "--timeout=3m"
@@ -55,7 +55,7 @@ spec:
             - name: socket-dir
               mountPath: /var/lib/csi/sockets/pluginproxy/
         - name: csi-snapshotter
-          image: registry.k8s.io/sig-storage/csi-snapshotter:v6.2.1
+          image: registry.k8s.io/sig-storage/csi-snapshotter:v8.1.0
           args:
             - "--csi-address=$(ADDRESS)"
             - "--timeout=3m"
@@ -69,7 +69,7 @@ spec:
             - mountPath: /var/lib/csi/sockets/pluginproxy/
               name: socket-dir
         - name: csi-resizer
-          image: registry.k8s.io/sig-storage/csi-resizer:v1.7.0
+          image: registry.k8s.io/sig-storage/csi-resizer:v1.12.0
           args:
             - "--csi-address=$(ADDRESS)"
             - "--timeout=3m"
@@ -83,7 +83,7 @@ spec:
             - name: socket-dir
               mountPath: /var/lib/csi/sockets/pluginproxy/
         - name: liveness-probe
-          image: registry.k8s.io/sig-storage/livenessprobe:v2.9.0
+          image: registry.k8s.io/sig-storage/livenessprobe:v2.14.0
           args:
             - "--csi-address=$(ADDRESS)"
           env:
@@ -93,12 +93,13 @@ spec:
             - mountPath: /var/lib/csi/sockets/pluginproxy/
               name: socket-dir
         - name: cinder-csi-plugin
-          image: registry.k8s.io/provider-os/cinder-csi-plugin:v1.27.1
+          image: registry.k8s.io/provider-os/cinder-csi-plugin:v1.31.2
           args:
             - /bin/cinder-csi-plugin
             - "--endpoint=$(CSI_ENDPOINT)"
             - "--cloud-config=$(CLOUD_CONFIG)"
             - "--cluster=$(CLUSTER_NAME)"
+            - "--pvc-annotations"
             - "--v=1"
           env:
             - name: CSI_ENDPOINT
diff --git a/k8s/cinder-csi-nodeplugin.yaml b/k8s/cinder-csi-nodeplugin.yaml
index d114655..48d30c7 100644
--- a/k8s/cinder-csi-nodeplugin.yaml
+++ b/k8s/cinder-csi-nodeplugin.yaml
@@ -21,7 +21,7 @@ spec:
       hostNetwork: true
       containers:
         - name: node-driver-registrar
-          image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.6.3
+          image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.12.0
           args:
             - "--csi-address=$(ADDRESS)"
             - "--kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)"
@@ -41,7 +41,7 @@ spec:
             - name: registration-dir
               mountPath: /registration
         - name: liveness-probe
-          image: registry.k8s.io/sig-storage/livenessprobe:v2.9.0
+          image: registry.k8s.io/sig-storage/livenessprobe:v2.14.0
           args:
             - --csi-address=/csi/csi.sock
           volumeMounts:
@@ -53,10 +53,11 @@ spec:
             capabilities:
               add: ["SYS_ADMIN"]
             allowPrivilegeEscalation: true
-          image: registry.k8s.io/provider-os/cinder-csi-plugin:v1.27.1
+          image: registry.k8s.io/provider-os/cinder-csi-plugin:v1.31.2
           args:
             - /bin/cinder-csi-plugin
             - "--endpoint=$(CSI_ENDPOINT)"
+            - "--provide-controller-service=false"
             - "--cloud-config=$(CLOUD_CONFIG)"
             - "--v=1"
           env:
diff --git a/vars.tf b/vars.tf
index 9f62d20..4cc7111 100644
--- a/vars.tf
+++ b/vars.tf
@@ -9,13 +9,13 @@ variable "pgcluster_instance_count" {
 }
 
 variable "controller_instance_type" {
-  default = "b2.c2r4"
+  default = "b2.c4r16"
 }
 variable "monitor_instance_type" {
-  default = "b2.c2r4"
+  default = "b2.c4r16"
 }
 variable "worker_instance_type" {
-  default = "b2.c4r16"
+  default = "b2.c8r32"
 }
 variable "worker_name" {
   default = "internal-sto4-test-k8sw"