starlingx/platform-armada-app
Code Issues Proposed changes

Update ceph-csi helm charts to v3.15.0

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

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

- cephcsi v3.15.0
- csi-provisioner v5.3.0
- csi-attacher v4.10.0
- csi-snapshotter v8.3.0
- csi-node-driver-registrar v2.15.0
- csi-resizer v1.14.0
- ceph-config-helper ubuntu_jammy_18.2.2-1-20241210

Two patches were replaced (14 and 15) which were about creating
the snapshotclass.yaml files for both RBD and CephFs. This is not
needed anymore since in cephcsi v3.15.0 these files already exist
and instead of snapshotClass, the main field is called
volumeSnapshotClass. We altered the existing snapshotclass.yaml
files and values.yaml to use the old names and ensure backwards
compatibility.

This are the field names changed in 3.15.0 upstream release we
reverted back:

- snapshotClass	-> volumeSnapshotClass
- provisionerSecretNamespace -> snapshotterSecretNamespace
- provisionerSecret -> snapshotterSecret

In v3.15.0 the csi-attaccher was added to cephfs
changing the attachRequired field from false to true
in the CSI driver definitions. Since this field is immutable,
we need to delete the CSI driver for cephfs before upgrading
or downgrading it, hence the change in the lifecycle.

Test Plan:
 PASS: App upload/apply/remove/delete/update/rollback
 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: Enable ceph-pools-audit
 PASS: Change pool size and in the backend and check the pools
 PASS: B&R with and without the flag wipe_ceph_osds=true

* Tests were performed on SX using IPv4 with K8s 1.32.2-1.33.0

Change-Id: I9fc045645ccc7a1683b57a31a954dd7f044011d0
Signed-off-by: Heitor Farhat <heitor.farhat@windriver.com>
This commit is contained in:
Heitor Farhat
2025-09-05 11:35:12 -03:00
committed by Erickson Silva de Oliveira
parent 4ccf16d914
commit 5d4398dd0d
26 changed files with 364 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
helm-charts/custom/ceph-pools-audit-helm/ceph-pools-audit-helm/ceph-pools-audit/Chart.yaml
View File

@@ -7,4 +7,4 @@ apiVersion: v1
appVersion: "1.0"
description: Ceph RBD pool replication monitor chart
name: ceph-pools-audit
version: 1.0.0
version: 1.0.1

2
helm-charts/custom/ceph-pools-audit-helm/ceph-pools-audit-helm/ceph-pools-audit/values.yaml
View File

@@ -26,7 +26,7 @@ conf:
images:
tags:
ceph_config_helper: docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.1-1-20250207
ceph_config_helper: docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.2-1-20241210
pullPolicy: "IfNotPresent"
local_registry:
active: false

6
helm-charts/custom/ceph-pools-audit-helm/debian/deb_folder/changelog
View File

@@ -1,3 +1,9 @@
ceph-pools-audit-helm (1.0-1) unstable; urgency=medium
* Update of ceph-config-helper image.
-- Heitor Farhat <heitor.farhat@windriver.com> Tue, 02 Sep 2025 10:05:47 +0000
ceph-pools-audit-helm (1.0-0) unstable; urgency=medium
* Change CronJob to Deployment and improves audit script performance.

4
helm-charts/custom/ceph-pools-audit-helm/debian/meta_data.yaml
View File

@@ -1,9 +1,9 @@
---
debname: ceph-pools-audit-helm
debver: 1.0-0
debver: 1.0-1
src_path: ceph-pools-audit-helm
revision:
dist: $STX_DIST
GITREVCOUNT:
SRC_DIR: ${MY_REPO}/stx/platform-armada-app/helm-charts/custom/ceph-pools-audit-helm/ceph-pools-audit-helm/ceph-pools-audit
BASE_SRCREV: b9b1d8a515f539be66d50341ca1b4b015c5507cd
BASE_SRCREV: 627c1d30e7455cc381262aeb36cfa10b8aff814a

6
helm-charts/upstream/platform-helm/debian/deb_folder/changelog
View File

@@ -1,3 +1,9 @@
platform-helm (3.15-0) unstable; urgency=medium
* New upstream release 3.15.0.
-- Heitor Farhat <heitor.farhat@windriver.com> Tue, 02 Sep 2025 09:32:12 -0300
platform-helm (3.13-1) unstable; urgency=medium
* New upstream release 3.13.1.

16
helm-charts/upstream/platform-helm/debian/deb_folder/patches/0001-ceph-csi-cephfs-replace-appVersion-version.patch
View File

@@ -1,30 +1,30 @@
From 1744d7499b47eb33b2943cad3ed1cc5d9422f426 Mon Sep 17 00:00:00 2001
From: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
Date: Mon, 17 Mar 2025 08:06:53 -0300
From b56cdba3615f3dcde34fa8e654e731b3d08e5d22 Mon Sep 17 00:00:00 2001
From: Heitor Farhat <heitor.farhat@windriver.com>
Date: Tue, 2 Sep 2025 09:18:15 -0300
Subject: [PATCH] ceph-csi-cephfs: replace appVersion/version
This patch changes the appVersion of the cephfs chart to the
upstream version that ceph-csi is being updated to.
Signed-off-by: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
Signed-off-by: Heitor Farhat <heitor.farhat@windriver.com>
---
charts/ceph-csi-cephfs/Chart.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/charts/ceph-csi-cephfs/Chart.yaml b/charts/ceph-csi-cephfs/Chart.yaml
index 46d38df..2c4cc4c 100644
index bc8dd7e..1f886a8 100644
--- a/charts/ceph-csi-cephfs/Chart.yaml
+++ b/charts/ceph-csi-cephfs/Chart.yaml
@@ -1,10 +1,10 @@
---
apiVersion: v1
-appVersion: canary
+appVersion: 3.13.1
+appVersion: 3.15.0
description: "Container Storage Interface (CSI) driver,
provisioner, snapshotter and resizer for Ceph cephfs"
provisioner, snapshotter, resizer and attacher for Ceph cephfs"
name: ceph-csi-cephfs
-version: 3-canary
+version: 3.13.1
+version: 3.15.0
keywords:
- ceph
- cephfs

30
helm-charts/upstream/platform-helm/debian/deb_folder/patches/0002-ceph-csi-cephfs-add-default-fields-to-values.yaml.patch
View File

@@ -1,21 +1,21 @@
From 56abdf56024a46a2ea09a72a11a85f3bcdc61fd5 Mon Sep 17 00:00:00 2001
From: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
Date: Thu, 27 Feb 2025 20:16:53 -0300
From d37f39b7d2c2f34272a2f23bdbf5d97131286054 Mon Sep 17 00:00:00 2001
From: Heitor Farhat <heitor.farhat@windriver.com>
Date: Tue, 2 Sep 2025 10:06:49 -0300
Subject: [PATCH] ceph-csi-cephfs: add default fields to values.yaml
This patch adds fields and values necessary for the proper use
of the cephfs chart in the system.
Signed-off-by: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
Signed-off-by: Heitor Farhat <heitor.farhat@windriver.com>
---
charts/ceph-csi-cephfs/values.yaml | 41 ++++++++++++++++++++++++++++--
1 file changed, 39 insertions(+), 2 deletions(-)
charts/ceph-csi-cephfs/values.yaml | 43 ++++++++++++++++++++++++++++--
1 file changed, 41 insertions(+), 2 deletions(-)
diff --git a/charts/ceph-csi-cephfs/values.yaml b/charts/ceph-csi-cephfs/values.yaml
index f30e2b7..160b7da 100644
index 9174ee7..69b11c8 100644
--- a/charts/ceph-csi-cephfs/values.yaml
+++ b/charts/ceph-csi-cephfs/values.yaml
@@ -290,10 +290,10 @@ provisioner:
@@ -307,10 +307,10 @@ provisioner:
podAnnotations: {}
@@ -24,11 +24,11 @@ index f30e2b7..160b7da 100644
# Enable read affinity for CephFS subvolumes. Recommended to
# set to true if running kernel 5.8 or newer.
-# enabled: false
+ enabled: false
+enabled: false
# Define which node labels to use as CRUSH location.
# This should correspond to the values set in the CRUSH map.
# NOTE: the value here serves as an example
@@ -375,6 +375,26 @@ storageClass:
@@ -392,6 +392,27 @@ storageClass:
# mountOptions:
# - discard
@@ -52,14 +52,16 @@ index f30e2b7..160b7da 100644
+ # Ceph pools name
+ metadata_pool: kube-cephfs-metadata
+
secret:
# Specifies whether the secret should be created
+
volumeSnapshotClass:
# Specifies whether the VolumeSnapshotClass should be created
create: false
@@ -431,6 +451,23 @@ externallyManagedConfigmap: false
@@ -511,6 +532,24 @@ externallyManagedConfigmap: false
cephConfConfigMapName: ceph-config
# Name of the configmap used for encryption kms configuration
kmsConfigMapName: ceph-csi-encryption-kms-config
+
+
+#
+# Defaults for storage classes.
+#
@@ -75,7 +77,7 @@ index f30e2b7..160b7da 100644
+storage_init:
+ image:
+ repository: docker.io/openstackhelm/ceph-config-helper
+ tag: ubuntu_jammy_19.2.1-1-20250207
+ tag: ubuntu_jammy_18.2.2-1-20241210
# CephFS RadosNamespace used to store CSI specific objects and keys.
# radosNamespaceCephFS: csi
# Unique ID distinguishing this instance of Ceph CSI among other instances,

14
helm-charts/upstream/platform-helm/debian/deb_folder/patches/0006-ceph-csi-rbd-replace-appVersion-version.patch
View File

@@ -1,30 +1,30 @@
From e5e49250e10d03bb8e3c235046a46e745f83e577 Mon Sep 17 00:00:00 2001
From: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
Date: Mon, 17 Mar 2025 08:23:53 -0300
From da851e00e1342963a8d9e41630166091b2975313 Mon Sep 17 00:00:00 2001
From: Heitor Farhat <heitor.farhat@windriver.com>
Date: Tue, 2 Sep 2025 10:38:28 -0300
Subject: [PATCH] ceph-csi-rbd: replace appVersion/version
This patch changes the appVersion of the rbd chart to the
upstream version that ceph-csi is being updated to.
Signed-off-by: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
Signed-off-by: Heitor Farhat <heitor.farhat@windriver.com>
---
charts/ceph-csi-rbd/Chart.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/charts/ceph-csi-rbd/Chart.yaml b/charts/ceph-csi-rbd/Chart.yaml
index 5ab42a1..0d89dd2 100644
index 5ab42a1..ab0f2a1 100644
--- a/charts/ceph-csi-rbd/Chart.yaml
+++ b/charts/ceph-csi-rbd/Chart.yaml
@@ -1,10 +1,10 @@
---
apiVersion: v1
-appVersion: canary
+appVersion: 3.13.1
+appVersion: 3.15.0
description: "Container Storage Interface (CSI) driver,
provisioner, snapshotter, resizer and attacher for Ceph RBD"
name: ceph-csi-rbd
-version: 3-canary
+version: 3.13.1
+version: 3.15.0
keywords:
- ceph
- rbd

22
helm-charts/upstream/platform-helm/debian/deb_folder/patches/0007-ceph-csi-rbd-add-default-fields-to-values.yaml.patch
View File

@@ -1,18 +1,18 @@
From d7571be3b5312c170ffd6a18f71ef6072064bf46 Mon Sep 17 00:00:00 2001
From: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
Date: Thu, 27 Feb 2025 20:12:39 -0300
From 0db2bdf58f2d614a1240e9592b77524dad73e598 Mon Sep 17 00:00:00 2001
From: Heitor Farhat <heitor.farhat@windriver.com>
Date: Tue, 2 Sep 2025 10:42:36 -0300
Subject: [PATCH] ceph-csi-rbd: add default fields to values.yaml
This patch adds fields and values necessary for the proper use
of the rbd chart in the system.
Signed-off-by: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
Signed-off-by: Heitor Farhat <heitor.farhat@windriver.com>
---
charts/ceph-csi-rbd/values.yaml | 42 +++++++++++++++++++++++++++++++--
1 file changed, 40 insertions(+), 2 deletions(-)
diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml
index 91d4ad2..e835624 100644
index 2593b97..1fb94a9 100644
--- a/charts/ceph-csi-rbd/values.yaml
+++ b/charts/ceph-csi-rbd/values.yaml
@@ -337,10 +337,10 @@ topology:
@@ -24,7 +24,7 @@ index 91d4ad2..e835624 100644
# Enable read affinity for RBD volumes. Recommended to
# set to true if running kernel 5.8 or newer.
-# enabled: false
+ enabled: false
+enabled: false
# Define which node labels to use as CRUSH location.
# This should correspond to the values set in the CRUSH map.
# NOTE: the value here serves as an example
@@ -50,10 +50,10 @@ index 91d4ad2..e835624 100644
+ - default
+ - kube-public
+
# Mount the host /etc/selinux inside pods to support
# selinux-enabled filesystems
selinuxMount: true
@@ -582,6 +600,26 @@ externallyManagedConfigmap: false
volumeSnapshotClass:
# Specifies whether the VolumeSnapshotClass should be created
create: false
@@ -650,6 +668,26 @@ externallyManagedConfigmap: false
cephConfConfigMapName: ceph-config
# Name of the configmap used for encryption kms configuration
kmsConfigMapName: ceph-csi-encryption-kms-config
@@ -76,7 +76,7 @@ index 91d4ad2..e835624 100644
+storage_init:
+ image:
+ repository: docker.io/openstackhelm/ceph-config-helper
+ tag: ubuntu_jammy_19.2.1-1-20250207
+ tag: ubuntu_jammy_18.2.2-1-20241210
# Unique ID distinguishing this instance of Ceph CSI among other instances,
# when sharing Ceph clusters across CSI instances for provisioning
# instanceID: default

62
helm-charts/upstream/platform-helm/debian/deb_folder/patches/0014-ceph-csi-cephfs-add-snapshotclass.patch
View File

@@ -1,62 +0,0 @@
From cc40abf2495bdaa0ace32441cfc6d5a78a397d3b Mon Sep 17 00:00:00 2001
From: Gabriel de Araújo Cabral <gabriel.cabral@windriver.com>
Date: Thu, 30 Nov 2023 12:51:37 -0300
Subject: ceph-csi-cephfs: add snapshotclass
Signed-off-by: Gabriel de Araújo Cabral <gabriel.cabral@windriver.com>
---
.../templates/snapshotclass.yaml | 13 +++++++++++++
charts/ceph-csi-cephfs/values.yaml | 18 ++++++++++++++++++
2 files changed, 31 insertions(+)
create mode 100644 charts/ceph-csi-cephfs/templates/snapshotclass.yaml
diff --git a/charts/ceph-csi-cephfs/templates/snapshotclass.yaml b/charts/ceph-csi-cephfs/templates/snapshotclass.yaml
new file mode 100644
index 000000000..3bad19026
--- /dev/null
+++ b/charts/ceph-csi-cephfs/templates/snapshotclass.yaml
@@ -0,0 +1,13 @@
+{{- if .Values.snapshotClass.create -}}
+apiVersion: snapshot.storage.k8s.io/v1
+kind: VolumeSnapshotClass
+metadata:
+ name: {{ .Values.snapshotClass.name }}
+driver: {{ .Values.driverName }}
+parameters:
+ clusterID: {{ .Values.snapshotClass.clusterID }}
+ snapshotNamePrefix: {{ .Values.snapshotClass.snapshotNamePrefix }}
+ csi.storage.k8s.io/snapshotter-secret-name: {{ .Values.snapshotClass.provisionerSecret }}
+ csi.storage.k8s.io/snapshotter-secret-namespace: {{ .Values.snapshotClass.provisionerSecretNamespace }}
+deletionPolicy: {{ .Values.snapshotClass.deletionPolicy }}
+{{- end -}}
diff --git a/charts/ceph-csi-cephfs/values.yaml b/charts/ceph-csi-cephfs/values.yaml
index 7c85abd7d..912165f1d 100644
--- a/charts/ceph-csi-cephfs/values.yaml
+++ b/charts/ceph-csi-cephfs/values.yaml
@@ -302,6 +302,24 @@ storageClass:
# Ceph pools name
metadata_pool: kube-cephfs-metadata
+snapshotClass:
+ # Specifies whether the snapshotclass should be created
+ create: false
+ # Specifies the snapshotclass name
+ name: csi-cephfsplugin-snapclass
+ # (required) Unique string representing a Ceph cluster to provision
+ #storage from.
+ clusterID: <cluster-ID>
+ # Prefix to use for naming CephFS snapshots.
+ # If omitted, defaults to "csi-snap-".
+ # snapshotNamePrefix: "foo-bar-"
+ snapshotNamePrefix: ""
+ # K8s secret name
+ provisionerSecret: csi-cephfs-secret
+ # K8s secret namespace
+ provisionerSecretNamespace: ""
+ deletionPolicy: Delete
+
secret:
# Specifies whether the secret should be created
create: false
--
2.25.1

89
helm-charts/upstream/platform-helm/debian/deb_folder/patches/0014-ceph-csi-cephfs-fix-snapshotclass-names.patch Normal file
View File

@@ -0,0 +1,89 @@
From 3501d2231e1ceffa7a4e1cc3cfaaa2836b3fa87d Mon Sep 17 00:00:00 2001
From: Heitor Farhat <heitor.farhat@windriver.com>
Date: Thu, 4 Sep 2025 11:05:33 -0300
Subject: [PATCH] ceph-csi-cephfs: fix snapshotclass names
In cephcsi 3.15.0 the snapshotclass.yaml file already exists
but a few field names are different than what we used.
We need to fix those names for backwards compatibility
on upgrade and rollback.
Signed-off-by: Heitor Farhat <heitor.farhat@windriver.com>
---
.../templates/snapshotclass.yaml | 22 +++++++++----------
charts/ceph-csi-cephfs/values.yaml | 7 +++---
2 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/charts/ceph-csi-cephfs/templates/snapshotclass.yaml b/charts/ceph-csi-cephfs/templates/snapshotclass.yaml
index e603397..65cd33b 100644
--- a/charts/ceph-csi-cephfs/templates/snapshotclass.yaml
+++ b/charts/ceph-csi-cephfs/templates/snapshotclass.yaml
@@ -1,11 +1,11 @@
-{{- if .Values.volumeSnapshotClass.create -}}
+{{- if .Values.snapshotClass.create -}}
apiVersion: snapshot.storage.k8s.io/v1
kind: VolumeSnapshotClass
metadata:
- name: {{ .Values.volumeSnapshotClass.name }}
-{{- if .Values.volumeSnapshotClass.annotations }}
+ name: {{ .Values.snapshotClass.name }}
+{{- if .Values.snapshotClass.annotations }}
annotations:
-{{ toYaml .Values.volumeSnapshotClass.annotations | indent 4 }}
+{{ toYaml .Values.snapshotClass.annotations | indent 4 }}
{{- end }}
labels:
app: {{ include "ceph-csi-cephfs.name" . }}
@@ -15,15 +15,15 @@ metadata:
{{- with .Values.commonLabels }}{{ toYaml . | trim | nindent 4 }}{{- end }}
driver: {{ .Values.driverName }}
parameters:
- clusterID: {{ .Values.volumeSnapshotClass.clusterID }}
-{{- if .Values.volumeSnapshotClass.snapshotNamePrefix }}
- snapshotNamePrefix: "{{ .Values.volumeSnapshotClass.snapshotNamePrefix }}"
+ clusterID: {{ .Values.snapshotClass.clusterID }}
+{{- if .Values.snapshotClass.snapshotNamePrefix }}
+ snapshotNamePrefix: "{{ .Values.snapshotClass.snapshotNamePrefix }}"
{{- end }}
- csi.storage.k8s.io/snapshotter-secret-name: {{ .Values.volumeSnapshotClass.snapshotterSecret }}
-{{- if .Values.volumeSnapshotClass.snapshotterSecretNamespace }}
- csi.storage.k8s.io/snapshotter-secret-namespace: {{ .Values.volumeSnapshotClass.snapshotterSecretNamespace }}
+ csi.storage.k8s.io/snapshotter-secret-name: {{ .Values.snapshotClass.provisionerSecret }}
+{{- if .Values.snapshotClass.provisionerSecretNamespace }}
+ csi.storage.k8s.io/snapshotter-secret-namespace: {{ .Values.snapshotClass.provisionerSecretNamespace }}
{{ else }}
csi.storage.k8s.io/snapshotter-secret-namespace: {{ .Release.Namespace }}
{{- end }}
-deletionPolicy: {{ .Values.volumeSnapshotClass.deletionPolicy }}
+deletionPolicy: {{ .Values.snapshotClass.deletionPolicy }}
{{- end -}}
diff --git a/charts/ceph-csi-cephfs/values.yaml b/charts/ceph-csi-cephfs/values.yaml
index 25059f4..f1c3bc8 100644
--- a/charts/ceph-csi-cephfs/values.yaml
+++ b/charts/ceph-csi-cephfs/values.yaml
@@ -416,8 +416,7 @@ storageClass:
# Ceph pools name
metadata_pool: kube-cephfs-metadata
-
-volumeSnapshotClass:
+snapshotClass:
# Specifies whether the VolumeSnapshotClass should be created
create: false
name: csi-cephfsplugin-snapclass
@@ -443,10 +442,10 @@ volumeSnapshotClass:
snapshotNamePrefix: ""
# The secrets have to contain user and/or Ceph admin credentials.
- snapshotterSecret: csi-cephfs-secret
+ provisionerSecret: csi-cephfs-secret
# If the Namespaces are not specified, the secrets are assumed to
# be in the Release namespace.
- snapshotterSecretNamespace: ""
+ provisionerSecretNamespace: ""
deletionPolicy: Delete
--
2.34.1

62
helm-charts/upstream/platform-helm/debian/deb_folder/patches/0015-ceph-csi-rbd-add-snapshotclass.patch
View File

@@ -1,62 +0,0 @@
From d6dbc163f3be00789a74f85556de4486792f9d72 Mon Sep 17 00:00:00 2001
From: Gabriel de Araújo Cabral <gabriel.cabral@windriver.com>
Date: Thu, 30 Nov 2023 13:38:09 -0300
Subject: ceph-csi-rbd: add snapshotclass
Signed-off-by: Gabriel de Araújo Cabral <gabriel.cabral@windriver.com>
---
.../ceph-csi-rbd/templates/snapshotclass.yaml | 13 +++++++++++++
charts/ceph-csi-rbd/values.yaml | 18 ++++++++++++++++++
2 files changed, 31 insertions(+)
create mode 100644 charts/ceph-csi-rbd/templates/snapshotclass.yaml
diff --git a/charts/ceph-csi-rbd/templates/snapshotclass.yaml b/charts/ceph-csi-rbd/templates/snapshotclass.yaml
new file mode 100644
index 000000000..3bad19026
--- /dev/null
+++ b/charts/ceph-csi-rbd/templates/snapshotclass.yaml
@@ -0,0 +1,13 @@
+{{- if .Values.snapshotClass.create -}}
+apiVersion: snapshot.storage.k8s.io/v1
+kind: VolumeSnapshotClass
+metadata:
+ name: {{ .Values.snapshotClass.name }}
+driver: {{ .Values.driverName }}
+parameters:
+ clusterID: {{ .Values.snapshotClass.clusterID }}
+ snapshotNamePrefix: {{ .Values.snapshotClass.snapshotNamePrefix }}
+ csi.storage.k8s.io/snapshotter-secret-name: {{ .Values.snapshotClass.provisionerSecret }}
+ csi.storage.k8s.io/snapshotter-secret-namespace: {{ .Values.snapshotClass.provisionerSecretNamespace }}
+deletionPolicy: {{ .Values.snapshotClass.deletionPolicy }}
+{{- end -}}
diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml
index c33d5f2a6..8dd9ea3d5 100644
--- a/charts/ceph-csi-rbd/values.yaml
+++ b/charts/ceph-csi-rbd/values.yaml
@@ -449,6 +449,24 @@ storageClass:
# selinux-enabled filesystems
selinuxMount: true
+snapshotClass:
+ # Specifies whether the snapshotclass should be created
+ create: false
+ # Specifies the snapshotclass name
+ name: csi-rbdplugin-snapclass
+ # (required) Unique string representing a Ceph cluster to provision
+ #storage from.
+ clusterID: <cluster-ID>
+ # Prefix to use for naming RBD snapshots.
+ # If omitted, defaults to "csi-snap-".
+ # snapshotNamePrefix: "foo-bar-"
+ snapshotNamePrefix: ""
+ # K8s secret name
+ provisionerSecret: csi-rbd-secret
+ # K8s secret namespace
+ provisionerSecretNamespace: ""
+ deletionPolicy: Delete
+
secret:
# Specifies whether the secret should be created
create: false
--
2.25.1

88
helm-charts/upstream/platform-helm/debian/deb_folder/patches/0015-ceph-csi-rbd-fix-snapshotclass-names.patch Normal file
View File

@@ -0,0 +1,88 @@
From 9dd14b53a9250bec70cf7f961b7a3979df204e79 Mon Sep 17 00:00:00 2001
From: Heitor Farhat <heitor.farhat@windriver.com>
Date: Thu, 4 Sep 2025 11:16:27 -0300
Subject: [PATCH] ceph-csi-rbd: fix snapshotclass names
In cephcsi 3.15.0 the snapshotclass.yaml file already exists
but a few field names are different than what we used.
We need to fix those names for backwards compatibility
on upgrade and rollback.
Signed-off-by: Heitor Farhat <heitor.farhat@windriver.com>
---
.../ceph-csi-rbd/templates/snapshotclass.yaml | 22 +++++++++----------
charts/ceph-csi-rbd/values.yaml | 6 ++---
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/charts/ceph-csi-rbd/templates/snapshotclass.yaml b/charts/ceph-csi-rbd/templates/snapshotclass.yaml
index 4456b0e..7d176e9 100644
--- a/charts/ceph-csi-rbd/templates/snapshotclass.yaml
+++ b/charts/ceph-csi-rbd/templates/snapshotclass.yaml
@@ -1,11 +1,11 @@
-{{- if .Values.volumeSnapshotClass.create -}}
+{{- if .Values.snapshotClass.create -}}
apiVersion: snapshot.storage.k8s.io/v1
kind: VolumeSnapshotClass
metadata:
- name: {{ .Values.volumeSnapshotClass.name }}
-{{- if .Values.volumeSnapshotClass.annotations }}
+ name: {{ .Values.snapshotClass.name }}
+{{- if .Values.snapshotClass.annotations }}
annotations:
-{{ toYaml .Values.volumeSnapshotClass.annotations | indent 4 }}
+{{ toYaml .Values.snapshotClass.annotations | indent 4 }}
{{- end }}
labels:
app: {{ include "ceph-csi-rbd.name" . }}
@@ -15,15 +15,15 @@ metadata:
{{- with .Values.commonLabels }}{{ toYaml . | trim | nindent 4 }}{{- end }}
driver: {{ .Values.driverName }}
parameters:
- clusterID: {{ .Values.volumeSnapshotClass.clusterID }}
-{{- if .Values.volumeSnapshotClass.snapshotNamePrefix }}
- snapshotNamePrefix: "{{ .Values.volumeSnapshotClass.snapshotNamePrefix }}"
+ clusterID: {{ .Values.snapshotClass.clusterID }}
+{{- if .Values.snapshotClass.snapshotNamePrefix }}
+ snapshotNamePrefix: "{{ .Values.snapshotClass.snapshotNamePrefix }}"
{{- end }}
- csi.storage.k8s.io/snapshotter-secret-name: {{ .Values.volumeSnapshotClass.snapshotterSecret }}
-{{- if .Values.volumeSnapshotClass.snapshotterSecretNamespace }}
- csi.storage.k8s.io/snapshotter-secret-namespace: {{ .Values.volumeSnapshotClass.snapshotterSecretNamespace }}
+ csi.storage.k8s.io/snapshotter-secret-name: {{ .Values.snapshotClass.provisionerSecret }}
+{{- if .Values.snapshotClass.provisionerSecretNamespace }}
+ csi.storage.k8s.io/snapshotter-secret-namespace: {{ .Values.snapshotClass.provisionerSecretNamespace }}
{{ else }}
csi.storage.k8s.io/snapshotter-secret-namespace: {{ .Release.Namespace }}
{{- end }}
-deletionPolicy: {{ .Values.volumeSnapshotClass.deletionPolicy }}
+deletionPolicy: {{ .Values.snapshotClass.deletionPolicy }}
{{- end -}}
diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml
index 5ed1af9..22a8a3f 100644
--- a/charts/ceph-csi-rbd/values.yaml
+++ b/charts/ceph-csi-rbd/values.yaml
@@ -548,7 +548,7 @@ storageClass:
- default
- kube-public
-volumeSnapshotClass:
+snapshotClass:
# Specifies whether the VolumeSnapshotClass should be created
create: false
name: csi-rbdplugin-snapclass
@@ -574,10 +574,10 @@ volumeSnapshotClass:
snapshotNamePrefix: ""
# The secrets have to contain user and/or Ceph admin credentials.
- snapshotterSecret: csi-rbd-secret
+ provisionerSecret: csi-rbd-secret
# If the Namespaces are not specified, the secrets are assumed to
# be in the Release namespace.
- snapshotterSecretNamespace: ""
+ provisionerSecretNamespace: ""
deletionPolicy: Delete
--
2.34.1

1
helm-charts/upstream/platform-helm/debian/deb_folder/patches/0016-ceph-csi-cephfs-remove-mountoptions-debug-on-pvs.patch
View File

@@ -44,4 +44,3 @@ index dc47e0afc..6bcaf8b30 100644
CURRENT_FS_GROUP_POLICY=$(kubectl describe csidriver "${CSI_DRIVER_NAME}" 2>/dev/null | grep -oP 'Fs Group Policy:\K.*' | tr -d ' ')
--
2.34.1

26
helm-charts/upstream/platform-helm/debian/deb_folder/patches/0017-ceph-csi-cephfs-add-conditional-for-csi-snapshotter-creation.patch
View File

@@ -1,24 +1,24 @@
From 5f2dc34fdad92fbb95a0dc6e4b0446b1681da9b4 Mon Sep 17 00:00:00 2001
From: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
Date: Mon, 17 Mar 2025 09:06:15 -0300
Subject: [PATCH] ceph-csi-cephfs: Add conditional for csi-snapshotter
From ffff91af78c22c92d8431056c15c01bcb4ef151e Mon Sep 17 00:00:00 2001
From: Heitor Farhat <heitor.farhat@windriver.com>
Date: Tue, 2 Sep 2025 11:16:47 -0300
Subject: [PATCH] ceph-csi-cephfs: add conditional for csi-snapshotter
container creation
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
snapshot-controller to support PVC snapshots.
Signed-off-by: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
Signed-off-by: Heitor Farhat <heitor.farhat@windriver.com>
---
charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml | 2 ++
charts/ceph-csi-cephfs/values.yaml | 1 +
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
index c6ebf3c..3a5287f 100644
index 8877268..0d2d77e 100644
--- a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml
+++ b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml
@@ -168,6 +168,7 @@ spec:
@@ -169,6 +169,7 @@ spec:
mountPath: /csi
resources:
{{ toYaml .Values.provisioner.provisioner.resources | indent 12 }}
@@ -26,19 +26,19 @@ index c6ebf3c..3a5287f 100644
- name: csi-snapshotter
image: {{ .Values.provisioner.snapshotter.image.repository }}:{{ .Values.provisioner.snapshotter.image.tag }}
imagePullPolicy: {{ .Values.provisioner.snapshotter.image.pullPolicy }}
@@ -202,6 +203,7 @@ spec:
@@ -203,6 +204,7 @@ spec:
mountPath: /csi
resources:
{{ toYaml .Values.provisioner.snapshotter.resources | indent 12 }}
+{{- end }}
{{- if .Values.provisioner.resizer.enabled }}
- name: csi-resizer
image: "{{ .Values.provisioner.resizer.image.repository }}:{{ .Values.provisioner.resizer.image.tag }}"
{{- if .Values.provisioner.attacher.enabled }}
- name: csi-attacher
image: "{{ .Values.provisioner.attacher.image.repository }}:{{ .Values.provisioner.attacher.image.tag }}"
diff --git a/charts/ceph-csi-cephfs/values.yaml b/charts/ceph-csi-cephfs/values.yaml
index ce0a7e1..4307ce0 100644
index 69b11c8..e345d28 100644
--- a/charts/ceph-csi-cephfs/values.yaml
+++ b/charts/ceph-csi-cephfs/values.yaml
@@ -262,6 +262,7 @@ provisioner:
@@ -279,6 +279,7 @@ provisioner:
extraArgs: []
snapshotter:

18
helm-charts/upstream/platform-helm/debian/deb_folder/patches/0018-ceph-csi-rbd-add-conditional-for-csi-snapshotter-creation.patch
View File

@@ -1,24 +1,24 @@
From 2abb1879618d854781bfe92453966ccce843d7a4 Mon Sep 17 00:00:00 2001
From: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
Date: Mon, 17 Mar 2025 09:13:56 -0300
Subject: [PATCH] ceph-csi-rbd: Add conditional for csi-snapshotter container
From 20b30f632dac8cd9340111b0e34fbe85411a0b2e Mon Sep 17 00:00:00 2001
From: Heitor Farhat <heitor.farhat@windriver.com>
Date: Tue, 2 Sep 2025 11:24:17 -0300
Subject: [PATCH] ceph-csi-rbd: add conditional for csi-snapshotter container
creation
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
snapshot-controller to support PVC snapshots.
Signed-off-by: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
Signed-off-by: Heitor Farhat <heitor.farhat@windriver.com>
---
charts/ceph-csi-rbd/templates/provisioner-deployment.yaml | 2 ++
charts/ceph-csi-rbd/values.yaml | 1 +
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
index 9849ff1..8cfde0d 100644
index f2aea0e..92dbb3f 100644
--- a/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml
+++ b/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml
@@ -219,6 +219,7 @@ spec:
@@ -220,6 +220,7 @@ spec:
resources:
{{ toYaml .Values.provisioner.resizer.resources | indent 12 }}
{{- end }}
@@ -26,7 +26,7 @@ index 9849ff1..8cfde0d 100644
- name: csi-snapshotter
image: {{ .Values.provisioner.snapshotter.image.repository }}:{{ .Values.provisioner.snapshotter.image.tag }}
imagePullPolicy: {{ .Values.provisioner.snapshotter.image.pullPolicy }}
@@ -253,6 +254,7 @@ spec:
@@ -254,6 +255,7 @@ spec:
mountPath: /csi
resources:
{{ toYaml .Values.provisioner.snapshotter.resources | indent 12 }}
@@ -35,7 +35,7 @@ index 9849ff1..8cfde0d 100644
- name: csi-attacher
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
index 17bcfa5..b3792bc 100644
index 1fb94a9..a136201 100644
--- a/charts/ceph-csi-rbd/values.yaml
+++ b/charts/ceph-csi-rbd/values.yaml
@@ -300,6 +300,7 @@ provisioner:

26
helm-charts/upstream/platform-helm/debian/deb_folder/patches/0019-ceph-csi-cephfs-add-conditional-to-enable-leader-election.patch
View File

@@ -1,23 +1,23 @@
From 6e9281276ddd6d37040b49083d4c39b154a40eae Mon Sep 17 00:00:00 2001
From: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
Date: Mon, 17 Mar 2025 09:25:21 -0300
Subject: [PATCH] ceph-csi-cephfs: Add conditional to enable leader election
From 27e6ed6be7146fd94175e9b43af874e9d7f93009 Mon Sep 17 00:00:00 2001
From: Heitor Farhat <heitor.farhat@windriver.com>
Date: Tue, 2 Sep 2025 11:32:43 -0300
Subject: [PATCH] ceph-csi-cephfs: add conditional to enable leader election
The rbd-provisioner and cephfs-provisioner pods use the K8s
API to conduct leadership elections, but these elections
should be disabled on AIO-SX, since they are not needed.
Signed-off-by: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
Signed-off-by: Heitor Farhat <heitor.farhat@windriver.com>
---
.../ceph-csi-cephfs/templates/provisioner-deployment.yaml | 6 ++++++
charts/ceph-csi-cephfs/values.yaml | 3 +++
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
index 3a5287f..fe8206c 100644
index 0d2d77e..e3b786d 100644
--- a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml
+++ b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml
@@ -139,7 +139,9 @@ spec:
@@ -140,7 +140,9 @@ spec:
- "--csi-address=$(ADDRESS)"
- "--v={{ .Values.sidecarLogLevel }}"
- "--timeout={{ .Values.provisioner.timeout }}"
@@ -27,7 +27,7 @@ index 3a5287f..fe8206c 100644
- "--retry-interval-start=500ms"
- "--extra-create-metadata=true"
- "--feature-gates=HonorPVReclaimPolicy=true"
@@ -176,7 +178,9 @@ spec:
@@ -177,7 +179,9 @@ spec:
- "--csi-address=$(ADDRESS)"
- "--v={{ .Values.sidecarLogLevel }}"
- "--timeout={{ .Values.provisioner.timeout }}"
@@ -38,17 +38,17 @@ index 3a5287f..fe8206c 100644
- "--feature-gates=CSIVolumeGroupSnapshot={{.Values.provisioner.snapshotter.args.enableVolumeGroupSnapshots }}"
{{- if and .Values.provisioner.snapshotter.args .Values.provisioner.snapshotter.args.httpEndpointPort }}
@@ -212,7 +216,9 @@ spec:
args:
- "--v={{ .Values.sidecarLogLevel }}"
- "--csi-address=$(ADDRESS)"
- "--timeout={{ .Values.provisioner.timeout }}"
+{{- if .Values.provisioner.leaderElection.enabled }}
- "--leader-election"
- "--leader-election=true"
+{{- end }}
- "--retry-interval-start=500ms"
- "--handle-volume-inuse-error=false"
- "--feature-gates=RecoverVolumeExpansionFailure=true"
{{- if and .Values.provisioner.attacher.args .Values.provisioner.attacher.args.httpEndpointPort }}
- "--http-endpoint=$(POD_IP):{{ .Values.provisioner.attacher.args.httpEndpointPort }}"
diff --git a/charts/ceph-csi-cephfs/values.yaml b/charts/ceph-csi-cephfs/values.yaml
index 4307ce0..974a428 100644
index e345d28..25059f4 100644
--- a/charts/ceph-csi-cephfs/values.yaml
+++ b/charts/ceph-csi-cephfs/values.yaml
@@ -187,6 +187,9 @@ provisioner:

22
helm-charts/upstream/platform-helm/debian/deb_folder/patches/0020-ceph-csi-rbd-add-conditional-to-enable-leader-election.patch
View File

@@ -1,23 +1,23 @@
From 2b272c765d622fd42491eaa4d1ab7a356eb64c8b Mon Sep 17 00:00:00 2001
From: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
Date: Mon, 17 Mar 2025 09:31:42 -0300
Subject: [PATCH] ceph-csi-rbd: Add conditional to enable leader election
From 76c055a35e4d96c7214021301bc7f106c5e72c51 Mon Sep 17 00:00:00 2001
From: Heitor Farhat <heitor.farhat@windriver.com>
Date: Tue, 2 Sep 2025 11:39:00 -0300
Subject: [PATCH] ceph-csi-rbd: add conditional to enable leader election
The rbd-provisioner and cephfs-provisioner pods use the K8s
API to conduct leadership elections, but these elections
should be disabled on AIO-SX, since they are not needed.
Signed-off-by: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
Signed-off-by: Heitor Farhat <heitor.farhat@windriver.com>
---
charts/ceph-csi-rbd/templates/provisioner-deployment.yaml | 8 ++++++++
charts/ceph-csi-rbd/values.yaml | 3 +++
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
index 8cfde0d..d80c858 100644
index 92dbb3f..a8615b8 100644
--- a/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml
+++ b/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml
@@ -151,7 +151,9 @@ spec:
@@ -152,7 +152,9 @@ spec:
- "--csi-address=$(ADDRESS)"
- "--v={{ .Values.sidecarLogLevel }}"
- "--timeout={{ .Values.provisioner.timeout }}"
@@ -27,7 +27,7 @@ index 8cfde0d..d80c858 100644
- "--retry-interval-start=500ms"
- "--default-fstype={{ .Values.provisioner.defaultFSType }}"
- "--extra-create-metadata=true"
@@ -190,7 +192,9 @@ spec:
@@ -191,7 +193,9 @@ spec:
- "--v={{ .Values.sidecarLogLevel }}"
- "--csi-address=$(ADDRESS)"
- "--timeout={{ .Values.provisioner.timeout }}"
@@ -37,7 +37,7 @@ index 8cfde0d..d80c858 100644
- "--retry-interval-start=500ms"
- "--handle-volume-inuse-error=false"
- "--feature-gates=RecoverVolumeExpansionFailure=true"
@@ -227,7 +231,9 @@ spec:
@@ -228,7 +232,9 @@ spec:
- "--csi-address=$(ADDRESS)"
- "--v={{ .Values.sidecarLogLevel }}"
- "--timeout={{ .Values.provisioner.timeout }}"
@@ -47,7 +47,7 @@ index 8cfde0d..d80c858 100644
- "--extra-create-metadata=true"
- "--feature-gates=CSIVolumeGroupSnapshot={{.Values.provisioner.snapshotter.args.enableVolumeGroupSnapshots }}"
{{- if and .Values.provisioner.snapshotter.args .Values.provisioner.snapshotter.args.httpEndpointPort }}
@@ -262,7 +268,9 @@ spec:
@@ -263,7 +269,9 @@ spec:
args:
- "--v={{ .Values.sidecarLogLevel }}"
- "--csi-address=$(ADDRESS)"
@@ -58,7 +58,7 @@ index 8cfde0d..d80c858 100644
- "--default-fstype=ext4"
{{- 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
index b3792bc..f2bcc66 100644
index a136201..5ed1af9 100644
--- a/charts/ceph-csi-rbd/values.yaml
+++ b/charts/ceph-csi-rbd/values.yaml
@@ -207,6 +207,9 @@ provisioner:

4
helm-charts/upstream/platform-helm/debian/deb_folder/patches/series
View File

@@ -11,8 +11,8 @@
0011-ceph-csi-cephfs-update-storageclass.patch
0012-ceph-csi-rbd-add-annotations-to-nodeplugin-daemonset.patch
0013-ceph-csi-cephfs-add-annotations-to-nodeplugin-daemonset.patch
0014-ceph-csi-cephfs-add-snapshotclass.patch
0015-ceph-csi-rbd-add-snapshotclass.patch
0014-ceph-csi-cephfs-fix-snapshotclass-names.patch
0015-ceph-csi-rbd-fix-snapshotclass-names.patch
0016-ceph-csi-cephfs-remove-mountoptions-debug-on-pvs.patch
0017-ceph-csi-cephfs-add-conditional-for-csi-snapshotter-creation.patch
0018-ceph-csi-rbd-add-conditional-for-csi-snapshotter-creation.patch

10
helm-charts/upstream/platform-helm/debian/meta_data.yaml
View File

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

56
python3-k8sapp-platform/k8sapp_platform/k8sapp_platform/lifecycle/lifecycle_platform.py
View File

@@ -69,8 +69,11 @@ class PlatformAppLifecycleOperator(base.AppLifecycleOperator):
elif hook_info.operation == constants.APP_REMOVE_OP and \
hook_info.relative_timing == LifecycleConstants.APP_LIFECYCLE_TIMING_POST:
return lifecycle_utils.delete_local_registry_secrets(app_op, app, hook_info)
elif (hook_info.operation == constants.APP_DOWNGRADE_OP and
hook_info.relative_timing == LifecycleConstants.APP_LIFECYCLE_TIMING_PRE):
elif hook_info.operation == constants.APP_UPDATE_OP and \
hook_info.relative_timing == LifecycleConstants.APP_LIFECYCLE_TIMING_PRE:
return self.pre_update(app)
elif hook_info.operation == constants.APP_DOWNGRADE_OP and \
hook_info.relative_timing == LifecycleConstants.APP_LIFECYCLE_TIMING_PRE:
return self.pre_downgrade(app, hook_info)
# Use the default behaviour for other hooks
@@ -150,12 +153,29 @@ class PlatformAppLifecycleOperator(base.AppLifecycleOperator):
def pre_downgrade(self, app, hook_info):
""" Pre downgrade actions
:param app: AppOperator.Application object
:param hook_info: LifecycleHookInfo object
"""
self.truncate_helm_overrides(app, hook_info)
self.delete_cephfs_driver(app)
def pre_update(self, app):
""" Pre update actions
:param app: AppOperator.Application object
"""
self.delete_cephfs_driver(app)
def truncate_helm_overrides(self, app, hook_info):
""" Truncate helm overrides
This function forces a reapply of the app after 'software deploy activate-rollback',
clearing the contents of the N-1 release overrides, so that kube_app can identify
changes in the overrides.
:param app: AppOperator.Application object
:param app_op: AppOperator object
:param hook_info: LifecycleHookInfo object
"""
from_app_version = hook_info.extra.get("from_app_version")
to_app_version = hook_info.extra.get("to_app_version")
@@ -173,6 +193,32 @@ class PlatformAppLifecycleOperator(base.AppLifecycleOperator):
for override_path in overrides_path.glob("*.yaml"):
override_path.write_text("")
def delete_cephfs_driver(self, app):
""" Delete CephFS CSI driver
This is to address a breaking change when downgrading from cephcsi v3.15.0
which added the csi-attacher to cephfs and the attachRequired field
changed from false to true on the csi driver.
Since this field is immutable, we need to delete the driver and allow
helm to recreate it.
:param app: AppOperator.Application object
"""
driver_name = "cephfs.csi.ceph.com"
self.delete_csi_driver(app, driver_name)
def delete_csi_driver(self, app, driver_name):
""" Delete a specific CSI driver
:param app: AppOperator.Application object
:param driver_name: name of the CSI driver to delete
"""
cmd = ["kubectl", "--kubeconfig", kubernetes.KUBERNETES_ADMIN_CONF, "delete", "csidriver", driver_name]
cutils.trycmd(*cmd)
def delete_csi_drivers(self, app):
""" Delete CSI drivers
@@ -184,9 +230,7 @@ class PlatformAppLifecycleOperator(base.AppLifecycleOperator):
"""
drivers = ["cephfs.csi.ceph.com", "rbd.csi.ceph.com"]
for driver in drivers:
cmd = ["kubectl", "--kubeconfig", kubernetes.KUBERNETES_ADMIN_CONF, "delete", "csidriver", driver]
stdout, stderr = cutils.trycmd(*cmd)
LOG.debug("{} app: cmd={} stdout={} stderr={}".format(app.name, cmd, stdout, stderr))
self.delete_csi_driver(app, driver)
def _get_helm_user_overrides(self, dbapi_instance, app, chart, namespace):
try:

6
stx-platform-helm/debian/deb_folder/changelog
View File

@@ -1,3 +1,9 @@
stx-platform-helm (1.6-0) unstable; urgency=medium
* New upstream release.
-- Heitor Farhat <heitor.farhat@windriver.com> Tue, 02 Sep 2025 09:38:04 -0300
stx-platform-helm (1.5-1) unstable; urgency=medium
* New upstream release.

4
stx-platform-helm/debian/meta_data.yaml
View File

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

2
stx-platform-helm/stx-platform-helm/files/metadata.yaml
View File

@@ -11,7 +11,7 @@ upgrades:
auto_update: true
supported_k8s_version:
minimum: 1.24.4
minimum: 1.32.2
behavior:
platform_managed_app: yes

16
stx-platform-helm/stx-platform-helm/fluxcd-manifests/cephfs-provisioner/cephfs-provisioner-static-overrides.yaml
View File

@@ -33,15 +33,19 @@ provisioner:
provisioner:
image:
repository: registry.k8s.io/sig-storage/csi-provisioner
tag: v5.2.0
tag: v5.3.0
attacher:
image:
repository: registry.k8s.io/sig-storage/csi-attacher
tag: v4.10.0
resizer:
image:
repository: registry.k8s.io/sig-storage/csi-resizer
tag: v1.13.2
tag: v1.14.0
snapshotter:
image:
repository: registry.k8s.io/sig-storage/csi-snapshotter
tag: v8.2.0
tag: v8.3.0
annotations: {
"helm.sh/hook": "post-upgrade, post-install, post-delete",
"helm.sh/hook-delete-policy": "before-hook-creation"
@@ -61,11 +65,11 @@ nodeplugin:
registrar:
image:
repository: registry.k8s.io/sig-storage/csi-node-driver-registrar
tag: v2.13.0
tag: v2.15.0
plugin:
image:
repository: quay.io/cephcsi/cephcsi
tag: v3.13.1
tag: v3.15.0
serviceAccounts:
nodeplugin:
@@ -118,4 +122,4 @@ cephconf: |-
storage_init:
image:
repository: docker.io/openstackhelm/ceph-config-helper
tag: ubuntu_jammy_19.2.1-1-20250207
tag: ubuntu_jammy_18.2.2-1-20241210

14
stx-platform-helm/stx-platform-helm/fluxcd-manifests/rbd-provisioner/rbd-provisioner-static-overrides.yaml
View File

@@ -31,21 +31,21 @@ provisioner:
provisioner:
image:
repository: registry.k8s.io/sig-storage/csi-provisioner
tag: v5.2.0
tag: v5.3.0
attacher:
name: attacher
image:
repository: registry.k8s.io/sig-storage/csi-attacher
tag: v4.8.1
tag: v4.10.0
resizer:
name: resizer
image:
repository: registry.k8s.io/sig-storage/csi-resizer
tag: v1.13.2
tag: v1.14.0
snapshotter:
image:
repository: registry.k8s.io/sig-storage/csi-snapshotter
tag: v8.2.0
tag: v8.3.0
annotations: {
"helm.sh/hook": "post-upgrade, post-install, post-delete",
"helm.sh/hook-delete-policy": "before-hook-creation"
@@ -65,11 +65,11 @@ nodeplugin:
registrar:
image:
repository: registry.k8s.io/sig-storage/csi-node-driver-registrar
tag: v2.13.0
tag: v2.15.0
plugin:
image:
repository: quay.io/cephcsi/cephcsi
tag: v3.13.1
tag: v3.15.0
serviceAccounts:
nodeplugin:
@@ -117,4 +117,4 @@ cephconf: |-
storage_init:
image:
repository: docker.io/openstackhelm/ceph-config-helper
tag: ubuntu_jammy_19.2.1-1-20250207
tag: ubuntu_jammy_18.2.2-1-20241210