Update ceph-csi helm charts to v3.13.1

Update RBD/CephFS provisioners to v3.13.1 based on
https://github.com/ceph/ceph-csi/releases/tag/v3.13.1

We use the latest versions of cephcsi, csi-provisioner,
csi-attacher, csi-snapshotter, csi-node-driver-registrar
and csi-resizer:

- cephcsi v13.3.1
- csi-provisioner v5.2.0
- csi-attacher v4.8.1
- csi-snapshotter v8.2.0
- csi-node-driver-registrar v2.13.0
- csi-resizer v1.13.2

Test Plan:
 PASS: App upload/apply/remove/delete/update
 PASS: App update with old package (downgrade)
 PASS: Create PVC using storageclass general (rbd)
 PASS: Create pod using RBD PVC
 PASS: Resize RBD PVC
 PASS: Create RBD volume snapshot
 PASS: Create PVC using storageclass cephfs
 PASS: Create pod using cephfs PVC
 PASS: Resize cephfs PVC
 PASS: Create cephfs volume snapshot
 PASS: B&R on AIO-SX (optimized) and AIO-DX (legacy)

* Tests were performed on SX/DX/STD/Storage
  with k8s v1.29 and v1.30

Story: 2011353
Task: 51824

Change-Id: Iff830553d9dc3dd2548f76dea6953b5128b39bdb
Signed-off-by: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
This commit is contained in:
Erickson Silva de Oliveira 2025-03-17 10:08:36 -03:00
parent 627c1d30e7
commit b1ce86e1b2
13 changed files with 93 additions and 81 deletions

View File

@ -1,3 +1,9 @@
platform-helm (3.13-1) unstable; urgency=medium
* New upstream release 3.13.1.
-- Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com> Fri, 14 Mar 2025 10:37:21 -0300
platform-helm (3.13-0) unstable; urgency=medium platform-helm (3.13-0) unstable; urgency=medium
* New upstream release 3.13.0. * New upstream release 3.13.0.

View File

@ -1,32 +1,32 @@
From 8f66eceb99bdafea35c1b42fa6d573ac930ac999 Mon Sep 17 00:00:00 2001 From 1744d7499b47eb33b2943cad3ed1cc5d9422f426 Mon Sep 17 00:00:00 2001
From: Gabriel Przybysz Gonçalves Júnior <gabriel.przybyszgoncalvesjunior@windriver.com> From: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
Date: Wed, 4 Dec 2024 09:13:10 -0300 Date: Mon, 17 Mar 2025 08:06:53 -0300
Subject: [PATCH] ceph-csi-cephfs: replace appVersion/version Subject: [PATCH] ceph-csi-cephfs: replace appVersion/version
This patch changes the appVersion of the cephfs chart to the This patch changes the appVersion of the cephfs chart to the
upstream version that ceph-csi is being updated to. upstream version that ceph-csi is being updated to.
Signed-off-by: Gabriel Przybysz Gonçalves Júnior <gabriel.przybyszgoncalvesjunior@windriver.com> Signed-off-by: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
--- ---
charts/ceph-csi-cephfs/Chart.yaml | 4 ++-- charts/ceph-csi-cephfs/Chart.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/charts/ceph-csi-cephfs/Chart.yaml b/charts/ceph-csi-cephfs/Chart.yaml diff --git a/charts/ceph-csi-cephfs/Chart.yaml b/charts/ceph-csi-cephfs/Chart.yaml
index 46d38df..a85c26f 100644 index 46d38df..2c4cc4c 100644
--- a/charts/ceph-csi-cephfs/Chart.yaml --- a/charts/ceph-csi-cephfs/Chart.yaml
+++ b/charts/ceph-csi-cephfs/Chart.yaml +++ b/charts/ceph-csi-cephfs/Chart.yaml
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
--- ---
apiVersion: v1 apiVersion: v1
-appVersion: canary -appVersion: canary
+appVersion: 3.13.0 +appVersion: 3.13.1
description: "Container Storage Interface (CSI) driver, description: "Container Storage Interface (CSI) driver,
provisioner, snapshotter and resizer for Ceph cephfs" provisioner, snapshotter and resizer for Ceph cephfs"
name: ceph-csi-cephfs name: ceph-csi-cephfs
-version: 3-canary -version: 3-canary
+version: 3.13.0 +version: 3.13.1
keywords: keywords:
- ceph - ceph
- cephfs - cephfs
-- --
2.25.1 2.34.1

View File

@ -1,19 +1,19 @@
From cc06b73b13ec2433507978d1ce42728c8be3a4dc Mon Sep 17 00:00:00 2001 From a87102a0117e369821d90ad0cf27bd82ee2bf46c Mon Sep 17 00:00:00 2001
From: Gabriel Przybysz Gonçalves Júnior <gabriel.przybyszgoncalvesjunior@windriver.com> From: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
Date: Wed, 4 Dec 2024 09:18:39 -0300 Date: Mon, 17 Mar 2025 08:11:40 -0300
Subject: [PATCH] ceph-csi-cephfs: add annotations to Subject: [PATCH] ceph-csi-cephfs: add annotations to
provisioner-deployment.yaml provisioner-deployment.yaml
This patch adds annotations to the cephfs deployment so that This patch adds annotations to the cephfs deployment so that
disabling the chart works correctly. disabling the chart works correctly.
Signed-off-by: Gabriel Przybysz Gonçalves Júnior <gabriel.przybyszgoncalvesjunior@windriver.com> Signed-off-by: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
--- ---
charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml | 5 ++++- charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml | 2 +-
1 file changed, 4 insertions(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml diff --git a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml
index e68dd03..a43193d 100644 index 84d9dcb..c6ebf3c 100644
--- a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml --- a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml
+++ b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml
@@ -176,7 +176,7 @@ spec: @@ -176,7 +176,7 @@ spec:
@ -22,8 +22,8 @@ index e68dd03..a43193d 100644
- "--leader-election=true" - "--leader-election=true"
- - "--extra-create-metadata=true" - - "--extra-create-metadata=true"
+ - "--extra-create-metadata=false" + - "--extra-create-metadata=false"
- "--enable-volume-group-snapshots={{.Values.provisioner.snapshotter.args.enableVolumeGroupSnapshots }}" - "--feature-gates=CSIVolumeGroupSnapshot={{.Values.provisioner.snapshotter.args.enableVolumeGroupSnapshots }}"
{{- if and .Values.provisioner.snapshotter.args .Values.provisioner.snapshotter.args.httpEndpointPort }} {{- if and .Values.provisioner.snapshotter.args .Values.provisioner.snapshotter.args.httpEndpointPort }}
- "--http-endpoint=$(POD_IP):{{ .Values.provisioner.snapshotter.args.httpEndpointPort }}" - "--http-endpoint=$(POD_IP):{{ .Values.provisioner.snapshotter.args.httpEndpointPort }}"
-- --
2.25.1 2.34.1

View File

@ -1,32 +1,32 @@
From a7d30b59169bfe98ce02b48ec2057ec10ddb3c21 Mon Sep 17 00:00:00 2001 From e5e49250e10d03bb8e3c235046a46e745f83e577 Mon Sep 17 00:00:00 2001
From: Gabriel Przybysz Gonçalves Júnior <gabriel.przybyszgoncalvesjunior@windriver.com> From: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
Date: Wed, 4 Dec 2024 09:20:35 -0300 Date: Mon, 17 Mar 2025 08:23:53 -0300
Subject: [PATCH] ceph-csi-rbd: replace appVersion/version Subject: [PATCH] ceph-csi-rbd: replace appVersion/version
This patch changes the appVersion of the rbd chart to the This patch changes the appVersion of the rbd chart to the
upstream version that ceph-csi is being updated to. upstream version that ceph-csi is being updated to.
Signed-off-by: Gabriel Przybysz Gonçalves Júnior <gabriel.przybyszgoncalvesjunior@windriver.com> Signed-off-by: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
--- ---
charts/ceph-csi-rbd/Chart.yaml | 4 ++-- charts/ceph-csi-rbd/Chart.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/charts/ceph-csi-rbd/Chart.yaml b/charts/ceph-csi-rbd/Chart.yaml diff --git a/charts/ceph-csi-rbd/Chart.yaml b/charts/ceph-csi-rbd/Chart.yaml
index 5ab42a1..f176f53 100644 index 5ab42a1..0d89dd2 100644
--- a/charts/ceph-csi-rbd/Chart.yaml --- a/charts/ceph-csi-rbd/Chart.yaml
+++ b/charts/ceph-csi-rbd/Chart.yaml +++ b/charts/ceph-csi-rbd/Chart.yaml
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
--- ---
apiVersion: v1 apiVersion: v1
-appVersion: canary -appVersion: canary
+appVersion: 3.13.0 +appVersion: 3.13.1
description: "Container Storage Interface (CSI) driver, description: "Container Storage Interface (CSI) driver,
provisioner, snapshotter, resizer and attacher for Ceph RBD" provisioner, snapshotter, resizer and attacher for Ceph RBD"
name: ceph-csi-rbd name: ceph-csi-rbd
-version: 3-canary -version: 3-canary
+version: 3.13.0 +version: 3.13.1
keywords: keywords:
- ceph - ceph
- rbd - rbd
-- --
2.25.1 2.34.1

View File

@ -1,6 +1,6 @@
From 287878041859bdd1390e938abc0ce7a562891d4c Mon Sep 17 00:00:00 2001 From 5f2dc34fdad92fbb95a0dc6e4b0446b1681da9b4 Mon Sep 17 00:00:00 2001
From: Gabriel Przybysz Gonçalves Júnior <gabriel.przybyszgoncalvesjunior@windriver.com> From: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
Date: Wed, 4 Dec 2024 09:28:52 -0300 Date: Mon, 17 Mar 2025 09:06:15 -0300
Subject: [PATCH] ceph-csi-cephfs: Add conditional for csi-snapshotter Subject: [PATCH] ceph-csi-cephfs: Add conditional for csi-snapshotter
container creation container creation
@ -8,17 +8,17 @@ The creation of the csi-snapshotter container will only occur if the
create field is 'true', as a result of the presence of CRDs and create field is 'true', as a result of the presence of CRDs and
snapshot-controller to support PVC snapshots. snapshot-controller to support PVC snapshots.
Signed-off-by: Gabriel Przybysz Gonçalves Júnior <gabriel.przybyszgoncalvesjunior@windriver.com> Signed-off-by: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
--- ---
charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml | 2 ++ charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml | 2 ++
charts/ceph-csi-cephfs/values.yaml | 1 + charts/ceph-csi-cephfs/values.yaml | 1 +
2 files changed, 3 insertions(+) 2 files changed, 3 insertions(+)
diff --git a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml diff --git a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml
index f4b0abb..471c6fd 100644 index c6ebf3c..3a5287f 100644
--- a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml --- a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml
+++ b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml
@@ -146,6 +146,7 @@ spec: @@ -168,6 +168,7 @@ spec:
mountPath: /csi mountPath: /csi
resources: resources:
{{ toYaml .Values.provisioner.provisioner.resources | indent 12 }} {{ toYaml .Values.provisioner.provisioner.resources | indent 12 }}
@ -26,7 +26,7 @@ index f4b0abb..471c6fd 100644
- name: csi-snapshotter - name: csi-snapshotter
image: {{ .Values.provisioner.snapshotter.image.repository }}:{{ .Values.provisioner.snapshotter.image.tag }} image: {{ .Values.provisioner.snapshotter.image.repository }}:{{ .Values.provisioner.snapshotter.image.tag }}
imagePullPolicy: {{ .Values.provisioner.snapshotter.image.pullPolicy }} imagePullPolicy: {{ .Values.provisioner.snapshotter.image.pullPolicy }}
@@ -167,6 +167,7 @@ spec: @@ -202,6 +203,7 @@ spec:
mountPath: /csi mountPath: /csi
resources: resources:
{{ toYaml .Values.provisioner.snapshotter.resources | indent 12 }} {{ toYaml .Values.provisioner.snapshotter.resources | indent 12 }}
@ -35,16 +35,16 @@ index f4b0abb..471c6fd 100644
- name: csi-resizer - name: csi-resizer
image: "{{ .Values.provisioner.resizer.image.repository }}:{{ .Values.provisioner.resizer.image.tag }}" image: "{{ .Values.provisioner.resizer.image.repository }}:{{ .Values.provisioner.resizer.image.tag }}"
diff --git a/charts/ceph-csi-cephfs/values.yaml b/charts/ceph-csi-cephfs/values.yaml diff --git a/charts/ceph-csi-cephfs/values.yaml b/charts/ceph-csi-cephfs/values.yaml
index 110e622..3846450 100644 index ce0a7e1..4307ce0 100644
--- a/charts/ceph-csi-cephfs/values.yaml --- a/charts/ceph-csi-cephfs/values.yaml
+++ b/charts/ceph-csi-cephfs/values.yaml +++ b/charts/ceph-csi-cephfs/values.yaml
@@ -227,6 +227,7 @@ provisioner: @@ -262,6 +262,7 @@ provisioner:
extraArgs: [] extraArgs: []
snapshotter: snapshotter:
+ enabled: true + enabled: true
image: image:
repository: registry.k8s.io/sig-storage/csi-snapshotter repository: registry.k8s.io/sig-storage/csi-snapshotter
tag: v8.0.1 tag: v8.2.0
-- --
2.25.1 2.34.1

View File

@ -1,6 +1,6 @@
From 2fe7690dca1c60b34fdc3d215011bb7bb0ae78a3 Mon Sep 17 00:00:00 2001 From 2abb1879618d854781bfe92453966ccce843d7a4 Mon Sep 17 00:00:00 2001
From: Gabriel Przybysz Gonçalves Júnior <gabriel.przybyszgoncalvesjunior@windriver.com> From: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
Date: Wed, 4 Dec 2024 09:30:39 -0300 Date: Mon, 17 Mar 2025 09:13:56 -0300
Subject: [PATCH] ceph-csi-rbd: Add conditional for csi-snapshotter container Subject: [PATCH] ceph-csi-rbd: Add conditional for csi-snapshotter container
creation creation
@ -8,17 +8,17 @@ The creation of the csi-snapshotter container will only occur if the
create field is 'true', as a result of the presence of CRDs and create field is 'true', as a result of the presence of CRDs and
snapshot-controller to support PVC snapshots. snapshot-controller to support PVC snapshots.
Signed-off-by: Gabriel Przybysz Gonçalves Júnior <gabriel.przybyszgoncalvesjunior@windriver.com> Signed-off-by: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
--- ---
charts/ceph-csi-rbd/templates/provisioner-deployment.yaml | 2 ++ charts/ceph-csi-rbd/templates/provisioner-deployment.yaml | 2 ++
charts/ceph-csi-rbd/values.yaml | 1 + charts/ceph-csi-rbd/values.yaml | 1 +
2 files changed, 3 insertions(+) 2 files changed, 3 insertions(+)
diff --git a/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml b/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml diff --git a/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml b/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml
index 33cd2ae..2ec90bf 100644 index 9849ff1..8cfde0d 100644
--- a/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml --- a/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml
+++ b/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml
@@ -184,6 +184,7 @@ spec: @@ -219,6 +219,7 @@ spec:
resources: resources:
{{ toYaml .Values.provisioner.resizer.resources | indent 12 }} {{ toYaml .Values.provisioner.resizer.resources | indent 12 }}
{{- end }} {{- end }}
@ -26,7 +26,7 @@ index 33cd2ae..2ec90bf 100644
- name: csi-snapshotter - name: csi-snapshotter
image: {{ .Values.provisioner.snapshotter.image.repository }}:{{ .Values.provisioner.snapshotter.image.tag }} image: {{ .Values.provisioner.snapshotter.image.repository }}:{{ .Values.provisioner.snapshotter.image.tag }}
imagePullPolicy: {{ .Values.provisioner.snapshotter.image.pullPolicy }} imagePullPolicy: {{ .Values.provisioner.snapshotter.image.pullPolicy }}
@@ -205,6 +207,7 @@ spec: @@ -253,6 +254,7 @@ spec:
mountPath: /csi mountPath: /csi
resources: resources:
{{ toYaml .Values.provisioner.snapshotter.resources | indent 12 }} {{ toYaml .Values.provisioner.snapshotter.resources | indent 12 }}
@ -35,16 +35,16 @@ index 33cd2ae..2ec90bf 100644
- name: csi-attacher - name: csi-attacher
image: "{{ .Values.provisioner.attacher.image.repository }}:{{ .Values.provisioner.attacher.image.tag }}" image: "{{ .Values.provisioner.attacher.image.repository }}:{{ .Values.provisioner.attacher.image.tag }}"
diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml
index 873e260..61eccf0 100644 index 17bcfa5..b3792bc 100644
--- a/charts/ceph-csi-rbd/values.yaml --- a/charts/ceph-csi-rbd/values.yaml
+++ b/charts/ceph-csi-rbd/values.yaml +++ b/charts/ceph-csi-rbd/values.yaml
@@ -278,6 +278,7 @@ provisioner: @@ -300,6 +300,7 @@ provisioner:
extraArgs: [] extraArgs: []
snapshotter: snapshotter:
+ enabled: true + enabled: true
image: image:
repository: registry.k8s.io/sig-storage/csi-snapshotter repository: registry.k8s.io/sig-storage/csi-snapshotter
tag: v8.0.1 tag: v8.2.0
-- --
2.25.1 2.34.1

View File

@ -1,20 +1,20 @@
From e1135482686d37c98e794668c205d1ac29afd8f9 Mon Sep 17 00:00:00 2001 From 6e9281276ddd6d37040b49083d4c39b154a40eae Mon Sep 17 00:00:00 2001
From: Gabriel Przybysz Gonçalves Júnior <gabriel.przybyszgoncalvesjunior@windriver.com> From: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
Date: Wed, 4 Dec 2024 09:32:37 -0300 Date: Mon, 17 Mar 2025 09:25:21 -0300
Subject: [PATCH] cephfs: Add conditional to enable leader election Subject: [PATCH] ceph-csi-cephfs: Add conditional to enable leader election
The rbd-provisioner and cephfs-provisioner pods use the K8s The rbd-provisioner and cephfs-provisioner pods use the K8s
API to conduct leadership elections, but these elections API to conduct leadership elections, but these elections
should be disabled on AIO-SX, since they are not needed. should be disabled on AIO-SX, since they are not needed.
Signed-off-by: Gabriel Przybysz Gonçalves Júnior <gabriel.przybyszgoncalvesjunior@windriver.com> Signed-off-by: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
--- ---
.../ceph-csi-cephfs/templates/provisioner-deployment.yaml | 6 ++++++ .../ceph-csi-cephfs/templates/provisioner-deployment.yaml | 6 ++++++
charts/ceph-csi-cephfs/values.yaml | 3 +++ charts/ceph-csi-cephfs/values.yaml | 3 +++
2 files changed, 9 insertions(+) 2 files changed, 9 insertions(+)
diff --git a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml diff --git a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml
index ff64785..94f5300 100644 index 3a5287f..fe8206c 100644
--- a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml --- a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml
+++ b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml
@@ -139,7 +139,9 @@ spec: @@ -139,7 +139,9 @@ spec:
@ -35,7 +35,7 @@ index ff64785..94f5300 100644
- "--leader-election=true" - "--leader-election=true"
+{{- end }} +{{- end }}
- "--extra-create-metadata=false" - "--extra-create-metadata=false"
- "--enable-volume-group-snapshots={{.Values.provisioner.snapshotter.args.enableVolumeGroupSnapshots }}" - "--feature-gates=CSIVolumeGroupSnapshot={{.Values.provisioner.snapshotter.args.enableVolumeGroupSnapshots }}"
{{- if and .Values.provisioner.snapshotter.args .Values.provisioner.snapshotter.args.httpEndpointPort }} {{- if and .Values.provisioner.snapshotter.args .Values.provisioner.snapshotter.args.httpEndpointPort }}
@@ -212,7 +216,9 @@ spec: @@ -212,7 +216,9 @@ spec:
- "--v={{ .Values.sidecarLogLevel }}" - "--v={{ .Values.sidecarLogLevel }}"
@ -48,7 +48,7 @@ index ff64785..94f5300 100644
- "--handle-volume-inuse-error=false" - "--handle-volume-inuse-error=false"
- "--feature-gates=RecoverVolumeExpansionFailure=true" - "--feature-gates=RecoverVolumeExpansionFailure=true"
diff --git a/charts/ceph-csi-cephfs/values.yaml b/charts/ceph-csi-cephfs/values.yaml diff --git a/charts/ceph-csi-cephfs/values.yaml b/charts/ceph-csi-cephfs/values.yaml
index 6af072e..94b7531 100644 index 4307ce0..974a428 100644
--- a/charts/ceph-csi-cephfs/values.yaml --- a/charts/ceph-csi-cephfs/values.yaml
+++ b/charts/ceph-csi-cephfs/values.yaml +++ b/charts/ceph-csi-cephfs/values.yaml
@@ -187,6 +187,9 @@ provisioner: @@ -187,6 +187,9 @@ provisioner:

View File

@ -1,20 +1,20 @@
From ae6f83d0f1709f9cc4149253cfe51383b5295455 Mon Sep 17 00:00:00 2001 From 2b272c765d622fd42491eaa4d1ab7a356eb64c8b Mon Sep 17 00:00:00 2001
From: Gabriel Przybysz Gonçalves Júnior <gabriel.przybyszgoncalvesjunior@windriver.com> From: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
Date: Wed, 18 Dec 2024 09:13:23 -0300 Date: Mon, 17 Mar 2025 09:31:42 -0300
Subject: [PATCH] rbd: Add conditional to enable leader election Subject: [PATCH] ceph-csi-rbd: Add conditional to enable leader election
The rbd-provisioner and cephfs-provisioner pods use the K8s The rbd-provisioner and cephfs-provisioner pods use the K8s
API to conduct leadership elections, but these elections API to conduct leadership elections, but these elections
should be disabled on AIO-SX, since they are not needed. should be disabled on AIO-SX, since they are not needed.
Signed-off-by: Gabriel Przybysz Gonçalves Júnior <gabriel.przybyszgoncalvesjunior@windriver.com> Signed-off-by: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
--- ---
charts/ceph-csi-rbd/templates/provisioner-deployment.yaml | 8 ++++++++ charts/ceph-csi-rbd/templates/provisioner-deployment.yaml | 8 ++++++++
charts/ceph-csi-rbd/values.yaml | 3 +++ charts/ceph-csi-rbd/values.yaml | 3 +++
2 files changed, 11 insertions(+) 2 files changed, 11 insertions(+)
diff --git a/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml b/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml diff --git a/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml b/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml
index 508e597..c87cce0 100644 index 8cfde0d..d80c858 100644
--- a/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml --- a/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml
+++ b/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml
@@ -151,7 +151,9 @@ spec: @@ -151,7 +151,9 @@ spec:
@ -45,7 +45,7 @@ index 508e597..c87cce0 100644
- "--leader-election=true" - "--leader-election=true"
+{{- end }} +{{- end }}
- "--extra-create-metadata=true" - "--extra-create-metadata=true"
- "--enable-volume-group-snapshots={{.Values.provisioner.snapshotter.args.enableVolumeGroupSnapshots }}" - "--feature-gates=CSIVolumeGroupSnapshot={{.Values.provisioner.snapshotter.args.enableVolumeGroupSnapshots }}"
{{- if and .Values.provisioner.snapshotter.args .Values.provisioner.snapshotter.args.httpEndpointPort }} {{- if and .Values.provisioner.snapshotter.args .Values.provisioner.snapshotter.args.httpEndpointPort }}
@@ -262,7 +268,9 @@ spec: @@ -262,7 +268,9 @@ spec:
args: args:
@ -58,7 +58,7 @@ index 508e597..c87cce0 100644
- "--default-fstype=ext4" - "--default-fstype=ext4"
{{- if and .Values.provisioner.attacher.args .Values.provisioner.attacher.args.httpEndpointPort }} {{- if and .Values.provisioner.attacher.args .Values.provisioner.attacher.args.httpEndpointPort }}
diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml
index 2cb763f..51f5e52 100644 index b3792bc..f2bcc66 100644
--- a/charts/ceph-csi-rbd/values.yaml --- a/charts/ceph-csi-rbd/values.yaml
+++ b/charts/ceph-csi-rbd/values.yaml +++ b/charts/ceph-csi-rbd/values.yaml
@@ -207,6 +207,9 @@ provisioner: @@ -207,6 +207,9 @@ provisioner:

View File

@ -1,15 +1,15 @@
--- ---
debname: platform-helm debname: platform-helm
debver: 3.13-0 debver: 3.13-1
dl_path: dl_path:
name: ceph-csi-3.13.0.tar.gz name: ceph-csi-3.13.1.tar.gz
url: https://github.com/ceph/ceph-csi/archive/v3.13.0.tar.gz url: https://github.com/ceph/ceph-csi/archive/v3.13.1.tar.gz
sha256sum: 852d260461ee84ca4b0248388551fb2170faf6442995ef1516755ad41c56241e sha256sum: 45641e0b1540602151b3275ddf1f504d6894df5e89a45878fbbcc3b59b7d0219
src_files: src_files:
- platform-helm/files/Makefile - platform-helm/files/Makefile
revision: revision:
dist: $STX_DIST dist: $STX_DIST
stx_patch: 19 stx_patch: 19
GITREVCOUNT: GITREVCOUNT:
BASE_SRCREV: bc01cdee112dbb9a5511a180c07a5e3513b48692 BASE_SRCREV: b9b1d8a515f539be66d50341ca1b4b015c5507cd
SRC_DIR: ${MY_REPO}/stx/platform-armada-app/helm-charts/upstream/platform-helm SRC_DIR: ${MY_REPO}/stx/platform-armada-app/helm-charts/upstream/platform-helm

View File

@ -1,3 +1,9 @@
stx-platform-helm (1.5-1) unstable; urgency=medium
* New upstream release.
-- Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com> Fri, 14 Mar 2025 10:42:34 -0300
stx-platform-helm (1.5-0) unstable; urgency=medium stx-platform-helm (1.5-0) unstable; urgency=medium
* New upstream release. * New upstream release.

View File

@ -1,9 +1,9 @@
--- ---
debname: stx-platform-helm debname: stx-platform-helm
debver: 1.5-0 debver: 1.5-1
src_path: stx-platform-helm src_path: stx-platform-helm
revision: revision:
dist: $STX_DIST dist: $STX_DIST
GITREVCOUNT: GITREVCOUNT:
SRC_DIR: ${MY_REPO}/stx/platform-armada-app SRC_DIR: ${MY_REPO}/stx/platform-armada-app
BASE_SRCREV: bc01cdee112dbb9a5511a180c07a5e3513b48692 BASE_SRCREV: b9b1d8a515f539be66d50341ca1b4b015c5507cd

View File

@ -33,15 +33,15 @@ provisioner:
provisioner: provisioner:
image: image:
repository: registry.k8s.io/sig-storage/csi-provisioner repository: registry.k8s.io/sig-storage/csi-provisioner
tag: v5.1.0 tag: v5.2.0
resizer: resizer:
image: image:
repository: registry.k8s.io/sig-storage/csi-resizer repository: registry.k8s.io/sig-storage/csi-resizer
tag: v1.12.0 tag: v1.13.2
snapshotter: snapshotter:
image: image:
repository: registry.k8s.io/sig-storage/csi-snapshotter repository: registry.k8s.io/sig-storage/csi-snapshotter
tag: v8.0.1 tag: v8.2.0
annotations: { annotations: {
"helm.sh/hook": "post-upgrade, post-install, post-delete", "helm.sh/hook": "post-upgrade, post-install, post-delete",
"helm.sh/hook-delete-policy": "before-hook-creation" "helm.sh/hook-delete-policy": "before-hook-creation"
@ -61,11 +61,11 @@ nodeplugin:
registrar: registrar:
image: image:
repository: registry.k8s.io/sig-storage/csi-node-driver-registrar repository: registry.k8s.io/sig-storage/csi-node-driver-registrar
tag: v2.12.0 tag: v2.13.0
plugin: plugin:
image: image:
repository: quay.io/cephcsi/cephcsi repository: quay.io/cephcsi/cephcsi
tag: v3.13.0 tag: v3.13.1
serviceAccounts: serviceAccounts:
nodeplugin: nodeplugin:

View File

@ -31,21 +31,21 @@ provisioner:
provisioner: provisioner:
image: image:
repository: registry.k8s.io/sig-storage/csi-provisioner repository: registry.k8s.io/sig-storage/csi-provisioner
tag: v5.1.0 tag: v5.2.0
attacher: attacher:
name: attacher name: attacher
image: image:
repository: registry.k8s.io/sig-storage/csi-attacher repository: registry.k8s.io/sig-storage/csi-attacher
tag: v4.7.0 tag: v4.8.1
resizer: resizer:
name: resizer name: resizer
image: image:
repository: registry.k8s.io/sig-storage/csi-resizer repository: registry.k8s.io/sig-storage/csi-resizer
tag: v1.12.0 tag: v1.13.2
snapshotter: snapshotter:
image: image:
repository: registry.k8s.io/sig-storage/csi-snapshotter repository: registry.k8s.io/sig-storage/csi-snapshotter
tag: v8.0.1 tag: v8.2.0
annotations: { annotations: {
"helm.sh/hook": "post-upgrade, post-install, post-delete", "helm.sh/hook": "post-upgrade, post-install, post-delete",
"helm.sh/hook-delete-policy": "before-hook-creation" "helm.sh/hook-delete-policy": "before-hook-creation"
@ -65,11 +65,11 @@ nodeplugin:
registrar: registrar:
image: image:
repository: registry.k8s.io/sig-storage/csi-node-driver-registrar repository: registry.k8s.io/sig-storage/csi-node-driver-registrar
tag: v2.12.0 tag: v2.13.0
plugin: plugin:
image: image:
repository: quay.io/cephcsi/cephcsi repository: quay.io/cephcsi/cephcsi
tag: v3.13.0 tag: v3.13.1
serviceAccounts: serviceAccounts:
nodeplugin: nodeplugin: