From e8d5daf4af6e74420258769a49cdb5b5b5e896a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20de=20Ara=C3=BAjo=20Cabral?= Date: Tue, 16 Apr 2024 08:52:15 -0300 Subject: [PATCH] Update ceph-csi helm charts to v3.11.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update RBD/CephFS provisioners to v3.11.0 based on https://github.com/ceph/ceph-csi/releases/tag/v3.11.0 We use the new versions of ceph-csi, csi-provisioner, csi-attacher, csi-snapshotter, csi-node-driver-registrar, csi-resizer: - https://github.com/kubernetes-csi/external-provisioner/releases/tag/v4.0.0 - https://github.com/kubernetes-csi/external-attacher/releases/tag/v4.5.0 - https://github.com/kubernetes-csi/external-snapshotter/releases/tag/v7.0.1 - https://github.com/kubernetes-csi/node-driver-registrar/releases/tag/v2.10.0 - https://github.com/kubernetes-csi/external-resizer/releases/tag/v1.10.0 Test Plan: PASS: App upload/apply/remove/delete/update 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: DX B&R * The tests above that do not specify the system were performed on IPV4 SX/DX/Standard/Storage, with validation on K8s versions from 1.24 to 1.29. Furthermore, It was also tested on an IPV6 AIO-SX. Story: 2010688 Task: 49903 Change-Id: I7c49970d08e022e44b1d1bf3c2c26eef9262d169 Signed-off-by: Gabriel de Araújo Cabral --- .../ceph-pools-audit/Chart.yaml | 2 +- .../templates/job-ceph-pools-audit.yaml | 2 +- .../ceph-pools-audit/values.yaml | 2 +- .../debian/deb_folder/changelog | 6 +++++ .../debian/meta_data.yaml | 5 ++-- .../platform-helm/debian/deb_folder/changelog | 7 ++++++ ...si-cephfs-replace-appVersion-version.patch | 18 +++++++------ ...fs-add-default-fields-to-values.yaml.patch | 22 ++++++++-------- ...nnotations-to-provisioner-deployment.patch | 22 ++++++++-------- ...h-csi-rbd-replace-appVersion-version.patch | 18 +++++++------ ...bd-add-default-fields-to-values.yaml.patch | 22 ++++++++-------- ...011-ceph-csi-rbd-update-storageclass.patch | 25 +++++++++++-------- ...itional-for-csi-snapshotter-creation.patch | 24 +++++++++--------- ...itional-for-csi-snapshotter-creation.patch | 20 +++++++-------- .../platform-helm/debian/meta_data.yaml | 12 ++++----- .../lifecycle/lifecycle_platform.py | 2 +- stx-platform-helm/debian/deb_folder/changelog | 6 +++++ stx-platform-helm/debian/meta_data.yaml | 2 +- .../cephfs-provisioner-static-overrides.yaml | 12 ++++----- .../rbd-provisioner-static-overrides.yaml | 14 +++++------ 20 files changed, 138 insertions(+), 105 deletions(-) diff --git a/helm-charts/custom/ceph-pools-audit-helm/ceph-pools-audit-helm/ceph-pools-audit/Chart.yaml b/helm-charts/custom/ceph-pools-audit-helm/ceph-pools-audit-helm/ceph-pools-audit/Chart.yaml index badfdc9..16ed2ab 100644 --- a/helm-charts/custom/ceph-pools-audit-helm/ceph-pools-audit-helm/ceph-pools-audit/Chart.yaml +++ b/helm-charts/custom/ceph-pools-audit-helm/ceph-pools-audit-helm/ceph-pools-audit/Chart.yaml @@ -7,4 +7,4 @@ apiVersion: v1 appVersion: "1.0" description: Ceph RBD pool replication monitor chart name: ceph-pools-audit -version: 0.1.1 +version: 0.2.0 diff --git a/helm-charts/custom/ceph-pools-audit-helm/ceph-pools-audit-helm/ceph-pools-audit/templates/job-ceph-pools-audit.yaml b/helm-charts/custom/ceph-pools-audit-helm/ceph-pools-audit-helm/ceph-pools-audit/templates/job-ceph-pools-audit.yaml index de99d4c..f822028 100644 --- a/helm-charts/custom/ceph-pools-audit-helm/ceph-pools-audit-helm/ceph-pools-audit/templates/job-ceph-pools-audit.yaml +++ b/helm-charts/custom/ceph-pools-audit-helm/ceph-pools-audit-helm/ceph-pools-audit/templates/job-ceph-pools-audit.yaml @@ -1,6 +1,6 @@ {{/* # -# Copyright (c) 2020-2022 Wind River Systems, Inc. +# Copyright (c) 2020-2024 Wind River Systems, Inc. # # SPDX-License-Identifier: Apache-2.0 # diff --git a/helm-charts/custom/ceph-pools-audit-helm/ceph-pools-audit-helm/ceph-pools-audit/values.yaml b/helm-charts/custom/ceph-pools-audit-helm/ceph-pools-audit-helm/ceph-pools-audit/values.yaml index 6eddd94..5fa3ea7 100644 --- a/helm-charts/custom/ceph-pools-audit-helm/ceph-pools-audit-helm/ceph-pools-audit/values.yaml +++ b/helm-charts/custom/ceph-pools-audit-helm/ceph-pools-audit-helm/ceph-pools-audit/values.yaml @@ -26,7 +26,7 @@ conf: images: tags: - ceph_config_helper: docker.io/openstackhelm/ceph-config-helper:ubuntu_focal_18.2.0-1-20231013 + ceph_config_helper: docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.2-1-20240312 pullPolicy: "IfNotPresent" local_registry: active: false diff --git a/helm-charts/custom/ceph-pools-audit-helm/debian/deb_folder/changelog b/helm-charts/custom/ceph-pools-audit-helm/debian/deb_folder/changelog index 7eecd37..fc9bfbf 100644 --- a/helm-charts/custom/ceph-pools-audit-helm/debian/deb_folder/changelog +++ b/helm-charts/custom/ceph-pools-audit-helm/debian/deb_folder/changelog @@ -1,3 +1,9 @@ +ceph-pools-audit-helm (0.2-0) unstable; urgency=medium + + * Update of ceph-config-helper image. + + -- Gabriel de Araújo Cabral Thu, 4 Apr 2024 16:57:00 +0000 + ceph-pools-audit-helm (0.1-1) unstable; urgency=medium * Update of ceph-config-helper image. diff --git a/helm-charts/custom/ceph-pools-audit-helm/debian/meta_data.yaml b/helm-charts/custom/ceph-pools-audit-helm/debian/meta_data.yaml index 68e56e1..34330d4 100644 --- a/helm-charts/custom/ceph-pools-audit-helm/debian/meta_data.yaml +++ b/helm-charts/custom/ceph-pools-audit-helm/debian/meta_data.yaml @@ -1,10 +1,9 @@ --- debname: ceph-pools-audit-helm -debver: 0.1-0 +debver: 0.2-0 src_path: ceph-pools-audit-helm revision: dist: $STX_DIST - stx_patch: 19 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: 301e310b67f608c309a34c7431848f680e2ea827 + BASE_SRCREV: fbee8e217a95f7760f314db04d51e80994f4ba9d diff --git a/helm-charts/upstream/platform-helm/debian/deb_folder/changelog b/helm-charts/upstream/platform-helm/debian/deb_folder/changelog index 2a1c0cd..ab60487 100644 --- a/helm-charts/upstream/platform-helm/debian/deb_folder/changelog +++ b/helm-charts/upstream/platform-helm/debian/deb_folder/changelog @@ -1,3 +1,10 @@ + +platform-helm (3.11-0) unstable; urgency=medium + + * New upstream release. + + -- Gabriel de Araújo Cabral Thu, 4 Apr 2024 16:57:00 +0000 + platform-helm (3.10-1) unstable; urgency=medium * New upstream release. diff --git a/helm-charts/upstream/platform-helm/debian/deb_folder/patches/0001-ceph-csi-cephfs-replace-appVersion-version.patch b/helm-charts/upstream/platform-helm/debian/deb_folder/patches/0001-ceph-csi-cephfs-replace-appVersion-version.patch index 2c3cd94..6d47491 100644 --- a/helm-charts/upstream/platform-helm/debian/deb_folder/patches/0001-ceph-csi-cephfs-replace-appVersion-version.patch +++ b/helm-charts/upstream/platform-helm/debian/deb_folder/patches/0001-ceph-csi-cephfs-replace-appVersion-version.patch @@ -1,30 +1,32 @@ -From a3dc71e29e28a608936c20220d29c1ab1c0ded60 Mon Sep 17 00:00:00 2001 -From: Hediberto Cavalcante da Silva -Date: Thu, 4 Jan 2024 14:54:20 -0300 +From 38f93e32c9437dd2a473322c291e36fba2587ffc Mon Sep 17 00:00:00 2001 +From: Gabriel de Araújo Cabral +Date: Thu, 4 Apr 2024 14:11:08 -0300 Subject: [PATCH] ceph-csi-cephfs: replace appVersion/version -Signed-off-by: Hediberto Cavalcante da Silva +This patch changes the appVersion of the cephfs chart to the +upstream version that ceph-csi is being updated to. + Signed-off-by: Gabriel de Araújo Cabral --- 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..a1dd211 100644 +index 46d38df97..96432c638 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.10.1 ++appVersion: 3.11.0 description: "Container Storage Interface (CSI) driver, provisioner, snapshotter and resizer for Ceph cephfs" name: ceph-csi-cephfs -version: 3-canary -+version: 3.10.1 ++version: 3.11.0 keywords: - ceph - cephfs -- -2.34.1 +2.25.1 diff --git a/helm-charts/upstream/platform-helm/debian/deb_folder/patches/0002-ceph-csi-cephfs-add-default-fields-to-values.yaml.patch b/helm-charts/upstream/platform-helm/debian/deb_folder/patches/0002-ceph-csi-cephfs-add-default-fields-to-values.yaml.patch index b4babc2..d8e5e72 100644 --- a/helm-charts/upstream/platform-helm/debian/deb_folder/patches/0002-ceph-csi-cephfs-add-default-fields-to-values.yaml.patch +++ b/helm-charts/upstream/platform-helm/debian/deb_folder/patches/0002-ceph-csi-cephfs-add-default-fields-to-values.yaml.patch @@ -1,19 +1,21 @@ -From c85077bed399ab34fe2da87311247fe766fee094 Mon Sep 17 00:00:00 2001 -From: Hediberto Cavalcante da Silva -Date: Thu, 4 Jan 2024 14:59:12 -0300 +From 693e28c33b1c0bfe8628fbd4c83f2c80cd6872c4 Mon Sep 17 00:00:00 2001 +From: Gabriel de Araújo Cabral +Date: Thu, 4 Apr 2024 14:11:08 -0300 Subject: [PATCH] ceph-csi-cephfs: add default fields to values.yaml -Signed-off-by: Hediberto Cavalcante da Silva +This patch adds fields and values necessary for the proper use +of the cephfs chart in the system. + Signed-off-by: Gabriel de Araújo Cabral --- charts/ceph-csi-cephfs/values.yaml | 39 ++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/charts/ceph-csi-cephfs/values.yaml b/charts/ceph-csi-cephfs/values.yaml -index fd681c1..24c0a30 100644 +index c62833526..4bbe6a3b9 100644 --- a/charts/ceph-csi-cephfs/values.yaml +++ b/charts/ceph-csi-cephfs/values.yaml -@@ -222,10 +222,10 @@ provisioner: +@@ -244,10 +244,10 @@ provisioner: affinity: {} @@ -26,7 +28,7 @@ index fd681c1..24c0a30 100644 # 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 -@@ -295,6 +295,24 @@ storageClass: +@@ -317,6 +317,24 @@ storageClass: # mountOptions: # - discard @@ -51,7 +53,7 @@ index fd681c1..24c0a30 100644 secret: # Specifies whether the secret should be created create: false -@@ -346,3 +364,20 @@ configMapName: ceph-csi-config +@@ -368,3 +386,20 @@ configMapName: ceph-csi-config externallyManagedConfigmap: false # Name of the configmap used for ceph.conf cephConfConfigMapName: ceph-config @@ -71,6 +73,6 @@ index fd681c1..24c0a30 100644 +storage_init: + image: + repository: docker.io/openstackhelm/ceph-config-helper -+ tag: ubuntu_focal_18.2.0-1-20231013 ++ tag: ubuntu_jammy_18.2.2-1-20240312 -- -2.34.1 +2.25.1 diff --git a/helm-charts/upstream/platform-helm/debian/deb_folder/patches/0005-ceph-csi-cephfs-add-annotations-to-provisioner-deployment.patch b/helm-charts/upstream/platform-helm/debian/deb_folder/patches/0005-ceph-csi-cephfs-add-annotations-to-provisioner-deployment.patch index 3b1f62a..04f19ce 100644 --- a/helm-charts/upstream/platform-helm/debian/deb_folder/patches/0005-ceph-csi-cephfs-add-annotations-to-provisioner-deployment.patch +++ b/helm-charts/upstream/platform-helm/debian/deb_folder/patches/0005-ceph-csi-cephfs-add-annotations-to-provisioner-deployment.patch @@ -1,17 +1,19 @@ -From e0afca6467c6986ca8f6f1facbc6859a3c42ecf5 Mon Sep 17 00:00:00 2001 -From: Gustavo Ornaghi Antunes -Date: Fri, 04 Aug 2023 10:20:51 -0300 -Subject: [PATCH] ceph-csi-cephfs: add annotations to provisioner-deployment.yaml +From 2a1a89a6e94b90f2feea2b1a285330eaa2707c0c Mon Sep 17 00:00:00 2001 +From: Gabriel de Araújo Cabral +Date: Thu, 4 Apr 2024 16:10:05 -0300 +Subject: [PATCH] ceph-csi-cephfs: add annotations to + provisioner-deployment.yaml -Signed-off-by: Hediberto Cavalcante da Silva -Signed-off-by: Erickson Silva de Oliveira -Signed-off-by: Gustavo Ornaghi Antunes +This patch adds annotations to the cephfs deployment so that +disabling the chart works correctly. + +Signed-off-by: Gabriel de Araújo Cabral --- charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml -index dcc15ee..2d7c815 100644 +index 4767866ba..d2ae00510 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml @@ -10,6 +10,9 @@ metadata: @@ -24,14 +26,14 @@ index dcc15ee..2d7c815 100644 spec: replicas: {{ .Values.provisioner.replicaCount }} strategy: -@@ -98,7 +101,7 @@ spec: +@@ -147,7 +150,7 @@ spec: - "--v={{ .Values.sidecarLogLevel }}" - "--timeout={{ .Values.provisioner.timeout }}" - "--leader-election=true" - - "--extra-create-metadata=true" + - "--extra-create-metadata=false" + - "--enable-volume-group-snapshots={{.Values.provisioner.snapshotter.args.enableVolumeGroupSnapshots }}" {{- range .Values.provisioner.snapshotter.extraArgs }} - "--{{ . }}" - {{- end }} -- 2.25.1 diff --git a/helm-charts/upstream/platform-helm/debian/deb_folder/patches/0006-ceph-csi-rbd-replace-appVersion-version.patch b/helm-charts/upstream/platform-helm/debian/deb_folder/patches/0006-ceph-csi-rbd-replace-appVersion-version.patch index 01c81cc..ff54007 100644 --- a/helm-charts/upstream/platform-helm/debian/deb_folder/patches/0006-ceph-csi-rbd-replace-appVersion-version.patch +++ b/helm-charts/upstream/platform-helm/debian/deb_folder/patches/0006-ceph-csi-rbd-replace-appVersion-version.patch @@ -1,30 +1,32 @@ -From e0cbd82d3dbfb606c27d266d700bf71390da3104 Mon Sep 17 00:00:00 2001 -From: Hediberto Cavalcante da Silva -Date: Thu, 4 Jan 2024 15:12:02 -0300 +From 80a4880fc1fdf555a30bf1a3b8ff658fd6acf899 Mon Sep 17 00:00:00 2001 +From: Gabriel de Araújo Cabral +Date: Thu, 4 Apr 2024 16:19:22 -0300 Subject: [PATCH] ceph-csi-rbd: replace appVersion/version -Signed-off-by: Hediberto Cavalcante da Silva +This patch changes the appVersion of the rbd chart to the +upstream version that ceph-csi is being updated to. + Signed-off-by: Gabriel de Araújo Cabral --- 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..11ad868 100644 +index 5ab42a106..9bc43e889 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.10.1 ++appVersion: 3.11.0 description: "Container Storage Interface (CSI) driver, provisioner, snapshotter, resizer and attacher for Ceph RBD" name: ceph-csi-rbd -version: 3-canary -+version: 3.10.1 ++version: 3.11.0 keywords: - ceph - rbd -- -2.34.1 +2.25.1 diff --git a/helm-charts/upstream/platform-helm/debian/deb_folder/patches/0007-ceph-csi-rbd-add-default-fields-to-values.yaml.patch b/helm-charts/upstream/platform-helm/debian/deb_folder/patches/0007-ceph-csi-rbd-add-default-fields-to-values.yaml.patch index c2790a8..3c44d07 100644 --- a/helm-charts/upstream/platform-helm/debian/deb_folder/patches/0007-ceph-csi-rbd-add-default-fields-to-values.yaml.patch +++ b/helm-charts/upstream/platform-helm/debian/deb_folder/patches/0007-ceph-csi-rbd-add-default-fields-to-values.yaml.patch @@ -1,19 +1,21 @@ -From 664018df5a965c4a2d38f84824c80567c9941d62 Mon Sep 17 00:00:00 2001 -From: Hediberto Cavalcante da Silva -Date: Thu, 4 Jan 2024 15:47:27 -0300 +From 6cbd4ffb0f66391ec333411452e99b7e30ee3398 Mon Sep 17 00:00:00 2001 +From: Gabriel de Araújo Cabral +Date: Thu, 4 Apr 2024 16:19:22 -0300 Subject: [PATCH] ceph-csi-rbd: add default fields to values.yaml -Signed-off-by: Hediberto Cavalcante da Silva +This patch adds fields and values necessary for the proper use +of the rbd chart in the system. + Signed-off-by: Gabriel de Araújo Cabral --- charts/ceph-csi-rbd/values.yaml | 40 +++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml -index 0d75418..b5f2f5a 100644 +index 0d0f77dd8..1ab58d7cb 100644 --- a/charts/ceph-csi-rbd/values.yaml +++ b/charts/ceph-csi-rbd/values.yaml -@@ -284,10 +284,10 @@ topology: +@@ -306,10 +306,10 @@ topology: - failure-domain/region - failure-domain/zone @@ -26,7 +28,7 @@ index 0d75418..b5f2f5a 100644 # 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 -@@ -472,6 +472,22 @@ storageClass: +@@ -495,6 +495,22 @@ storageClass: # mountOptions: # - discard @@ -49,7 +51,7 @@ index 0d75418..b5f2f5a 100644 # Mount the host /etc/selinux inside pods to support # selinux-enabled filesystems selinuxMount: true -@@ -528,3 +544,23 @@ externallyManagedConfigmap: false +@@ -551,3 +567,23 @@ externallyManagedConfigmap: false cephConfConfigMapName: ceph-config # Name of the configmap used for encryption kms configuration kmsConfigMapName: ceph-csi-encryption-kms-config @@ -72,6 +74,6 @@ index 0d75418..b5f2f5a 100644 +storage_init: + image: + repository: docker.io/openstackhelm/ceph-config-helper -+ tag: ubuntu_focal_18.2.0-1-20231013 ++ tag: ubuntu_jammy_18.2.2-1-20240312 -- -2.34.1 +2.25.1 diff --git a/helm-charts/upstream/platform-helm/debian/deb_folder/patches/0011-ceph-csi-rbd-update-storageclass.patch b/helm-charts/upstream/platform-helm/debian/deb_folder/patches/0011-ceph-csi-rbd-update-storageclass.patch index a816838..066961d 100644 --- a/helm-charts/upstream/platform-helm/debian/deb_folder/patches/0011-ceph-csi-rbd-update-storageclass.patch +++ b/helm-charts/upstream/platform-helm/debian/deb_folder/patches/0011-ceph-csi-rbd-update-storageclass.patch @@ -1,19 +1,20 @@ -From a4a5246c189c3ee43901bbc57427e8427c4146e7 Mon Sep 17 00:00:00 2001 -From: Hediberto Cavalcante da Silva -Date: Thu, 4 Jan 2024 16:06:44 -0300 +From d9c0f98127938abcfb073cfc8d75645b90548a53 Mon Sep 17 00:00:00 2001 +From: Gabriel de Araújo Cabral +Date: Thu, 18 Apr 2024 08:36:28 -0300 Subject: [PATCH] ceph-csi-rbd: update storageclass -Signed-off-by: Hediberto Cavalcante da Silva +This patch updates some fields and values for the rbd storage class. + Signed-off-by: Gabriel de Araújo Cabral --- - .../ceph-csi-rbd/templates/storageclass.yaml | 194 ++++++++++-------- - 1 file changed, 113 insertions(+), 81 deletions(-) + .../ceph-csi-rbd/templates/storageclass.yaml | 198 ++++++++++-------- + 1 file changed, 115 insertions(+), 83 deletions(-) diff --git a/charts/ceph-csi-rbd/templates/storageclass.yaml b/charts/ceph-csi-rbd/templates/storageclass.yaml -index 459a6ea..ab489d1 100644 +index 188362fc0..d971ed1fe 100644 --- a/charts/ceph-csi-rbd/templates/storageclass.yaml +++ b/charts/ceph-csi-rbd/templates/storageclass.yaml -@@ -1,94 +1,126 @@ +@@ -1,96 +1,128 @@ {{- if .Values.storageClass.create -}} +{{- $cephCsiDefault := .Values.storageClass }} +{{- $defaults := .Values.classdefaults }} @@ -46,8 +47,10 @@ index 459a6ea..ab489d1 100644 +provisioner: {{ $.Values.driverName }} parameters: - clusterID: {{ .Values.storageClass.clusterID }} -- pool: {{ .Values.storageClass.pool }} - imageFeatures: {{ .Values.storageClass.imageFeatures }} +-{{- if .Values.storageClass.pool }} +- pool: {{ .Values.storageClass.pool }} +-{{- end }} -{{- if .Values.storageClass.tryOtherMounters }} - tryOtherMounters: {{ .Values.storageClass.tryOtherMounters | quote}} -{{- end }} @@ -79,7 +82,9 @@ index 459a6ea..ab489d1 100644 +{{- with (first $.Values.csiConfig) }} + clusterID: {{ or $sc.clusterID .clusterID }} +{{- end}} ++{{- if $sc.pool_name }} + pool: {{ $sc.pool_name }} ++{{- end }} + imageFeatures: {{ or $sc.imageFeatures $cephCsiDefault.imageFeatures }} +{{- if $sc.tryOtherMounters }} + tryOtherMounters: {{ $sc.tryOtherMounters | quote}} @@ -222,4 +227,4 @@ index 459a6ea..ab489d1 100644 +{{- end }} {{- end -}} -- -2.34.1 +2.25.1 diff --git a/helm-charts/upstream/platform-helm/debian/deb_folder/patches/0019-ceph-csi-cephfs-add-conditional-for-csi-snapshotter-creation.patch b/helm-charts/upstream/platform-helm/debian/deb_folder/patches/0019-ceph-csi-cephfs-add-conditional-for-csi-snapshotter-creation.patch index 1d8b96b..1f6c540 100644 --- a/helm-charts/upstream/platform-helm/debian/deb_folder/patches/0019-ceph-csi-cephfs-add-conditional-for-csi-snapshotter-creation.patch +++ b/helm-charts/upstream/platform-helm/debian/deb_folder/patches/0019-ceph-csi-cephfs-add-conditional-for-csi-snapshotter-creation.patch @@ -1,8 +1,8 @@ -From ecdb1fa261cb6e1c48e4ae4ad7e36b4a2d9ae385 Mon Sep 17 00:00:00 2001 +From 3ef9d011849d3d40834df53d0d8a5d8277e69e90 Mon Sep 17 00:00:00 2001 From: Gabriel de Araújo Cabral -Date: Mon, 15 Jan 2024 10:07:55 -0300 -Subject: [PATCH] ceph-csi-cephfs: Add conditional for csi-snapshotter container - creation +Date: Thu, 4 Apr 2024 17:36:28 -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 @@ -15,36 +15,36 @@ Signed-off-by: Gabriel de Araújo Cabral 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 2d7c8158e..6e6d013d5 100644 +index d2ae00510..9c930d369 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml -@@ -93,6 +93,7 @@ spec: +@@ -142,6 +142,7 @@ spec: mountPath: /csi resources: {{ toYaml .Values.provisioner.provisioner.resources | indent 12 }} -+{{ if .Values.provisioner.snapshotter.enabled }} ++{{- if .Values.provisioner.snapshotter.enabled }} - name: csi-snapshotter image: {{ .Values.provisioner.snapshotter.image.repository }}:{{ .Values.provisioner.snapshotter.image.tag }} imagePullPolicy: {{ .Values.provisioner.snapshotter.image.pullPolicy }} -@@ -113,6 +114,7 @@ spec: +@@ -163,6 +164,7 @@ spec: mountPath: /csi resources: {{ toYaml .Values.provisioner.snapshotter.resources | indent 12 }} -+{{ end }} ++{{- end }} {{- if .Values.provisioner.resizer.enabled }} - name: csi-resizer 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 -index 76726f980..41276836f 100644 +index 25e18ed64..8141d86bf 100644 --- a/charts/ceph-csi-cephfs/values.yaml +++ b/charts/ceph-csi-cephfs/values.yaml -@@ -207,6 +207,7 @@ provisioner: +@@ -225,6 +225,7 @@ provisioner: extraArgs: [] snapshotter: + enabled: true image: repository: registry.k8s.io/sig-storage/csi-snapshotter - tag: v6.3.2 + tag: v7.0.0 -- 2.25.1 diff --git a/helm-charts/upstream/platform-helm/debian/deb_folder/patches/0020-ceph-csi-rbd-add-conditional-for-csi-snapshotter-creation.patch b/helm-charts/upstream/platform-helm/debian/deb_folder/patches/0020-ceph-csi-rbd-add-conditional-for-csi-snapshotter-creation.patch index 3c4fd53..6603a82 100644 --- a/helm-charts/upstream/platform-helm/debian/deb_folder/patches/0020-ceph-csi-rbd-add-conditional-for-csi-snapshotter-creation.patch +++ b/helm-charts/upstream/platform-helm/debian/deb_folder/patches/0020-ceph-csi-rbd-add-conditional-for-csi-snapshotter-creation.patch @@ -1,6 +1,6 @@ -From 35d5d47bd6a1736fa2945346dc55b40c85744c14 Mon Sep 17 00:00:00 2001 +From fb64dfe6fe6fd7afa3dd0c06c5c1b53b82c4899a Mon Sep 17 00:00:00 2001 From: Gabriel de Araújo Cabral -Date: Mon, 15 Jan 2024 10:17:58 -0300 +Date: Thu, 4 Apr 2024 17:36:28 -0300 Subject: [PATCH] ceph-csi-rbd: Add conditional for csi-snapshotter container creation @@ -15,36 +15,36 @@ Signed-off-by: Gabriel de Araújo Cabral 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 f31b5d654..982be155e 100644 +index 8c7839515..8f4e3b238 100644 --- a/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml -@@ -121,6 +121,7 @@ spec: +@@ -185,6 +185,7 @@ spec: resources: {{ toYaml .Values.provisioner.resizer.resources | indent 12 }} {{- end }} -+{{ if .Values.provisioner.snapshotter.enabled }} ++{{- if .Values.provisioner.snapshotter.enabled }} - name: csi-snapshotter image: {{ .Values.provisioner.snapshotter.image.repository }}:{{ .Values.provisioner.snapshotter.image.tag }} imagePullPolicy: {{ .Values.provisioner.snapshotter.image.pullPolicy }} -@@ -141,6 +142,7 @@ spec: +@@ -206,6 +207,7 @@ spec: mountPath: /csi resources: {{ toYaml .Values.provisioner.snapshotter.resources | indent 12 }} -+{{ end }} ++{{- end }} {{- 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-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml -index 7527d0fad..70987d311 100644 +index b9b163202..308779494 100644 --- a/charts/ceph-csi-rbd/values.yaml +++ b/charts/ceph-csi-rbd/values.yaml -@@ -257,6 +257,7 @@ provisioner: +@@ -275,6 +275,7 @@ provisioner: extraArgs: [] snapshotter: + enabled: true image: repository: registry.k8s.io/sig-storage/csi-snapshotter - tag: v6.3.2 + tag: v7.0.0 -- 2.25.1 diff --git a/helm-charts/upstream/platform-helm/debian/meta_data.yaml b/helm-charts/upstream/platform-helm/debian/meta_data.yaml index d78e16f..0bd7779 100644 --- a/helm-charts/upstream/platform-helm/debian/meta_data.yaml +++ b/helm-charts/upstream/platform-helm/debian/meta_data.yaml @@ -1,15 +1,15 @@ --- debname: platform-helm -debver: 3.10-1 +debver: 3.11-0 dl_path: - name: ceph-csi-3.10.1.tar.gz - url: https://github.com/ceph/ceph-csi/archive/v3.10.1.tar.gz - sha256sum: 1733d0435aa5a59d94b68dda5bf24013ba995c475e6b48d6e06830d5ab491dd8 + name: ceph-csi-3.11.0.tar.gz + url: https://github.com/ceph/ceph-csi/archive/v3.11.0.tar.gz + sha256sum: cd27befa86097ea19fab2cf2a6ef12a97bb182fb10b6361687a7f6fdf3dc221e src_files: - platform-helm/files/Makefile revision: dist: $STX_DIST - stx_patch: 16 + stx_patch: 19 GITREVCOUNT: - BASE_SRCREV: 69c37e9978d45dd928537523eda905e34e034b73 + BASE_SRCREV: 855c7b1da9ab3779397ffffbc49b7a6e03bca115 SRC_DIR: ${MY_REPO}/stx/platform-armada-app/helm-charts/upstream/platform-helm diff --git a/python3-k8sapp-platform/k8sapp_platform/k8sapp_platform/lifecycle/lifecycle_platform.py b/python3-k8sapp-platform/k8sapp_platform/k8sapp_platform/lifecycle/lifecycle_platform.py index 6c2411b..36796af 100644 --- a/python3-k8sapp-platform/k8sapp_platform/k8sapp_platform/lifecycle/lifecycle_platform.py +++ b/python3-k8sapp-platform/k8sapp_platform/k8sapp_platform/lifecycle/lifecycle_platform.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2021 Wind River Systems, Inc. +# Copyright (c) 2021-2024 Wind River Systems, Inc. # # SPDX-License-Identifier: Apache-2.0 # diff --git a/stx-platform-helm/debian/deb_folder/changelog b/stx-platform-helm/debian/deb_folder/changelog index d3f09db..7cab30c 100644 --- a/stx-platform-helm/debian/deb_folder/changelog +++ b/stx-platform-helm/debian/deb_folder/changelog @@ -1,3 +1,9 @@ +stx-platform-helm (1.4-0) unstable; urgency=medium + + * New upstream release. + + -- Gabriel de Araújo Cabral Thu, 4 Apr 2024 16:57:00 +0000 + stx-platform-helm (1.3-0) unstable; urgency=medium * New upstream release. diff --git a/stx-platform-helm/debian/meta_data.yaml b/stx-platform-helm/debian/meta_data.yaml index 5749dd5..1661a53 100644 --- a/stx-platform-helm/debian/meta_data.yaml +++ b/stx-platform-helm/debian/meta_data.yaml @@ -1,6 +1,6 @@ --- debname: stx-platform-helm -debver: 1.3-0 +debver: 1.4-0 src_path: stx-platform-helm revision: dist: $STX_DIST diff --git a/stx-platform-helm/stx-platform-helm/fluxcd-manifests/cephfs-provisioner/cephfs-provisioner-static-overrides.yaml b/stx-platform-helm/stx-platform-helm/fluxcd-manifests/cephfs-provisioner/cephfs-provisioner-static-overrides.yaml index b92d667..d223543 100644 --- a/stx-platform-helm/stx-platform-helm/fluxcd-manifests/cephfs-provisioner/cephfs-provisioner-static-overrides.yaml +++ b/stx-platform-helm/stx-platform-helm/fluxcd-manifests/cephfs-provisioner/cephfs-provisioner-static-overrides.yaml @@ -31,15 +31,15 @@ provisioner: provisioner: image: repository: registry.k8s.io/sig-storage/csi-provisioner - tag: v3.6.2 + tag: v4.0.0 resizer: image: repository: registry.k8s.io/sig-storage/csi-resizer - tag: v1.9.2 + tag: v1.10.0 snapshotter: image: repository: registry.k8s.io/sig-storage/csi-snapshotter - tag: v6.3.2 + tag: v7.0.1 nodeplugin: name: cephfs-nodeplugin @@ -55,11 +55,11 @@ nodeplugin: registrar: image: repository: registry.k8s.io/sig-storage/csi-node-driver-registrar - tag: v2.9.1 + tag: v2.10.0 plugin: image: repository: quay.io/cephcsi/cephcsi - tag: v3.10.1 + tag: v3.11.0 serviceAccounts: nodeplugin: @@ -112,4 +112,4 @@ cephconf: |- storage_init: image: repository: docker.io/openstackhelm/ceph-config-helper - tag: ubuntu_focal_18.2.0-1-20231013 + tag: ubuntu_jammy_18.2.2-1-20240312 diff --git a/stx-platform-helm/stx-platform-helm/fluxcd-manifests/rbd-provisioner/rbd-provisioner-static-overrides.yaml b/stx-platform-helm/stx-platform-helm/fluxcd-manifests/rbd-provisioner/rbd-provisioner-static-overrides.yaml index 9632be4..18fc689 100644 --- a/stx-platform-helm/stx-platform-helm/fluxcd-manifests/rbd-provisioner/rbd-provisioner-static-overrides.yaml +++ b/stx-platform-helm/stx-platform-helm/fluxcd-manifests/rbd-provisioner/rbd-provisioner-static-overrides.yaml @@ -31,21 +31,21 @@ provisioner: provisioner: image: repository: registry.k8s.io/sig-storage/csi-provisioner - tag: v3.6.2 + tag: v4.0.0 attacher: name: attacher image: repository: registry.k8s.io/sig-storage/csi-attacher - tag: v4.4.2 + tag: v4.5.0 resizer: name: resizer image: repository: registry.k8s.io/sig-storage/csi-resizer - tag: v1.9.2 + tag: v1.10.0 snapshotter: image: repository: registry.k8s.io/sig-storage/csi-snapshotter - tag: v6.3.2 + tag: v7.0.1 nodeplugin: name: rbd-nodeplugin @@ -61,11 +61,11 @@ nodeplugin: registrar: image: repository: registry.k8s.io/sig-storage/csi-node-driver-registrar - tag: v2.9.1 + tag: v2.10.0 plugin: image: repository: quay.io/cephcsi/cephcsi - tag: v3.10.1 + tag: v3.11.0 serviceAccounts: nodeplugin: @@ -113,4 +113,4 @@ cephconf: |- storage_init: image: repository: docker.io/openstackhelm/ceph-config-helper - tag: ubuntu_focal_18.2.0-1-20231013 + tag: ubuntu_jammy_18.2.2-1-20240312