SUNET/rut-test-ops
10
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

More cores and ram, upgrade cinder to newest upstream.

Browse source
This commit is contained in:
Mikael Frykholm 2025-02-06 07:53:05 +01:00
parent 28d4413a9f
commit 8a7b4a8201
Signed by: mifr
GPG key ID: 1467F9D69135C236
4 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
k8s/cinder-csi-controllerplugin-rbac.yaml
View file

@ -53,7 +53,7 @@ metadata:
rules: rules:
- apiGroups: [""] - apiGroups: [""]
resources: ["persistentvolumes"] resources: ["persistentvolumes"]
verbs: ["get", "list", "watch", "create", "delete"] verbs: ["get", "list", "watch", "create", "delete", "patch"]
- apiGroups: [""] - apiGroups: [""]
resources: ["persistentvolumeclaims"] resources: ["persistentvolumeclaims"]
verbs: ["get", "list", "watch", "update"] verbs: ["get", "list", "watch", "update"]
@ -181,4 +181,3 @@ roleRef:
kind: ClusterRole kind: ClusterRole
name: csi-resizer-role name: csi-resizer-role
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io

13
k8s/cinder-csi-controllerplugin.yaml
View file

@ -25,7 +25,7 @@ spec:
serviceAccount: csi-cinder-controller-sa serviceAccount: csi-cinder-controller-sa
containers: containers:
- name: csi-attacher - 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: args:
- "--csi-address=$(ADDRESS)" - "--csi-address=$(ADDRESS)"
- "--timeout=3m" - "--timeout=3m"
@ -39,7 +39,7 @@ spec:
- name: socket-dir - name: socket-dir
mountPath: /var/lib/csi/sockets/pluginproxy/ mountPath: /var/lib/csi/sockets/pluginproxy/
- name: csi-provisioner - 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: args:
- "--csi-address=$(ADDRESS)" - "--csi-address=$(ADDRESS)"
- "--timeout=3m" - "--timeout=3m"
@ -55,7 +55,7 @@ spec:
- name: socket-dir - name: socket-dir
mountPath: /var/lib/csi/sockets/pluginproxy/ mountPath: /var/lib/csi/sockets/pluginproxy/
- name: csi-snapshotter - 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: args:
- "--csi-address=$(ADDRESS)" - "--csi-address=$(ADDRESS)"
- "--timeout=3m" - "--timeout=3m"
@ -69,7 +69,7 @@ spec:
- mountPath: /var/lib/csi/sockets/pluginproxy/ - mountPath: /var/lib/csi/sockets/pluginproxy/
name: socket-dir name: socket-dir
- name: csi-resizer - 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: args:
- "--csi-address=$(ADDRESS)" - "--csi-address=$(ADDRESS)"
- "--timeout=3m" - "--timeout=3m"
@ -83,7 +83,7 @@ spec:
- name: socket-dir - name: socket-dir
mountPath: /var/lib/csi/sockets/pluginproxy/ mountPath: /var/lib/csi/sockets/pluginproxy/
- name: liveness-probe - name: liveness-probe
image: registry.k8s.io/sig-storage/livenessprobe:v2.9.0 image: registry.k8s.io/sig-storage/livenessprobe:v2.14.0
args: args:
- "--csi-address=$(ADDRESS)" - "--csi-address=$(ADDRESS)"
env: env:
@ -93,12 +93,13 @@ spec:
- mountPath: /var/lib/csi/sockets/pluginproxy/ - mountPath: /var/lib/csi/sockets/pluginproxy/
name: socket-dir name: socket-dir
- name: cinder-csi-plugin - 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: args:
- /bin/cinder-csi-plugin - /bin/cinder-csi-plugin
- "--endpoint=$(CSI_ENDPOINT)" - "--endpoint=$(CSI_ENDPOINT)"
- "--cloud-config=$(CLOUD_CONFIG)" - "--cloud-config=$(CLOUD_CONFIG)"
- "--cluster=$(CLUSTER_NAME)" - "--cluster=$(CLUSTER_NAME)"
- "--pvc-annotations"
- "--v=1" - "--v=1"
env: env:
- name: CSI_ENDPOINT - name: CSI_ENDPOINT

7
k8s/cinder-csi-nodeplugin.yaml
View file

@ -21,7 +21,7 @@ spec:
hostNetwork: true hostNetwork: true
containers: containers:
- name: node-driver-registrar - 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: args:
- "--csi-address=$(ADDRESS)" - "--csi-address=$(ADDRESS)"
- "--kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)" - "--kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)"
@ -41,7 +41,7 @@ spec:
- name: registration-dir - name: registration-dir
mountPath: /registration mountPath: /registration
- name: liveness-probe - name: liveness-probe
image: registry.k8s.io/sig-storage/livenessprobe:v2.9.0 image: registry.k8s.io/sig-storage/livenessprobe:v2.14.0
args: args:
- --csi-address=/csi/csi.sock - --csi-address=/csi/csi.sock
volumeMounts: volumeMounts:
@ -53,10 +53,11 @@ spec:
capabilities: capabilities:
add: ["SYS_ADMIN"] add: ["SYS_ADMIN"]
allowPrivilegeEscalation: true 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: args:
- /bin/cinder-csi-plugin - /bin/cinder-csi-plugin
- "--endpoint=$(CSI_ENDPOINT)" - "--endpoint=$(CSI_ENDPOINT)"
- "--provide-controller-service=false"
- "--cloud-config=$(CLOUD_CONFIG)" - "--cloud-config=$(CLOUD_CONFIG)"
- "--v=1" - "--v=1"
env: env:

6
vars.tf
View file

@ -9,13 +9,13 @@ variable "pgcluster_instance_count" {
} }
variable "controller_instance_type" { variable "controller_instance_type" {
default = "b2.c2r4" default = "b2.c4r16"
} }
variable "monitor_instance_type" { variable "monitor_instance_type" {
default = "b2.c2r4" default = "b2.c4r16"
} }
variable "worker_instance_type" { variable "worker_instance_type" {
default = "b2.c4r16" default = "b2.c8r32"
} }
variable "worker_name" { variable "worker_name" {
default = "internal-sto4-test-k8sw" default = "internal-sto4-test-k8sw"