From a832208a8589ee3394b35c4a7a885e873ae2b73a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20de=20Ara=C3=BAjo=20Cabral?= Date: Thu, 27 Jul 2023 11:10:36 -0300 Subject: [PATCH] Update ceph-csi helm charts to v3.9.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update RBD/CephFS provisioners to v3.9.0 based on https://github.com/ceph/ceph-csi/releases/tag/v3.9.0 We use the latest 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/v3.5.0 - https://github.com/kubernetes-csi/external-attacher/releases/tag/v4.3.0 - https://github.com/kubernetes-csi/external-snapshotter/releases/tag/v6.2.2 - https://github.com/kubernetes-csi/node-driver-registrar/releases/tag/v2.8.0 - https://github.com/kubernetes-csi/external-resizer/releases/tag/v1.8.0 Test Plan: PASS: SX/DX/Storage app upload/apply/remove/delete/update PASS: Create pvc using storageclass general (rbd) on SX/DX/Storage PASS: Create pod using RBD pvc on SX/DX/Storage PASS: Resize RBD pvc on SX/DX/Storage PASS: Create RBD volume snapshot on SX/DX/Storage PASS: Create pvc using storageclass cephfs on SX/DX/Storage PASS: Create pod using cephfs pvc on SX/DX/Storage PASS: Resize cephfs pvc on SX/DX/Storage PASS: Create cephfs volume snapshot on SX/DX/Storage * Tests were performed with K8s 1.24, 1.25 and 1.26 Story: 2010688 Task: 48477 Change-Id: I44d9a58c866ee901a343c6bf46eb3682a723953b Signed-off-by: Gabriel de Araújo Cabral --- platform-helm/debian/deb_folder/changelog | 6 +++++ ...si-cephfs-replace-appVersion-version.patch | 13 +++++----- ...fs-add-default-fields-to-values.yaml.patch | 15 ++++++------ ...h-csi-rbd-replace-appVersion-version.patch | 13 +++++----- ...bd-add-default-fields-to-values.yaml.patch | 15 ++++++------ platform-helm/debian/meta_data.yaml | 8 +++---- stx-platform-helm/debian/deb_folder/changelog | 6 +++++ stx-platform-helm/debian/meta_data.yaml | 2 +- .../cephfs-provisioner-static-overrides.yaml | 22 ++++++++--------- .../cephfs-provisioner/helmrelease.yaml | 2 +- .../rbd-provisioner/helmrelease.yaml | 2 +- .../rbd-provisioner-static-overrides.yaml | 24 +++++++++---------- .../helm-charts/ceph-pools-audit/values.yaml | 2 +- 13 files changed, 72 insertions(+), 58 deletions(-) diff --git a/platform-helm/debian/deb_folder/changelog b/platform-helm/debian/deb_folder/changelog index 21b40a4..78db296 100644 --- a/platform-helm/debian/deb_folder/changelog +++ b/platform-helm/debian/deb_folder/changelog @@ -1,3 +1,9 @@ +platform-helm (3.9-0) unstable; urgency=medium + + * New upstream release. + +-- Gabriel de Araújo Cabral Fri, 21 Jul 2023 08:30:00 +0000 + platform-helm (3.8-0) unstable; urgency=medium * New upstream release. diff --git a/platform-helm/debian/deb_folder/patches/0001-ceph-csi-cephfs-replace-appVersion-version.patch b/platform-helm/debian/deb_folder/patches/0001-ceph-csi-cephfs-replace-appVersion-version.patch index c408d65..012a3c4 100644 --- a/platform-helm/debian/deb_folder/patches/0001-ceph-csi-cephfs-replace-appVersion-version.patch +++ b/platform-helm/debian/deb_folder/patches/0001-ceph-csi-cephfs-replace-appVersion-version.patch @@ -1,28 +1,29 @@ -From d074298e621a0611d1ba6973fdf1f22595df84ed Mon Sep 17 00:00:00 2001 -From: Erickson Silva de Oliveira -Date: Mon, 20 Mar 2023 16:17:14 -0300 +From 7354d955c397c661d0b1c73b35b770948c8adb5c Mon Sep 17 00:00:00 2001 +From: Gabriel de Araújo Cabral +Date: Thu, 20 Jul 2023 15:51:06 -0300 Subject: [PATCH] ceph-csi-cephfs: replace appVersion/version Signed-off-by: Hediberto Cavalcante da Silva Signed-off-by: Erickson Silva de Oliveira +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 46d38df97..f6f89c92d 100644 +index 46d38df97..16cd12eb2 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.8.0 ++appVersion: 3.9.0 description: "Container Storage Interface (CSI) driver, provisioner, snapshotter and resizer for Ceph cephfs" name: ceph-csi-cephfs -version: 3-canary -+version: 3.8.0 ++version: 3.9.0 keywords: - ceph - cephfs diff --git a/platform-helm/debian/deb_folder/patches/0002-ceph-csi-cephfs-add-default-fields-to-values.yaml.patch b/platform-helm/debian/deb_folder/patches/0002-ceph-csi-cephfs-add-default-fields-to-values.yaml.patch index 8c857a3..127dff6 100644 --- a/platform-helm/debian/deb_folder/patches/0002-ceph-csi-cephfs-add-default-fields-to-values.yaml.patch +++ b/platform-helm/debian/deb_folder/patches/0002-ceph-csi-cephfs-add-default-fields-to-values.yaml.patch @@ -1,20 +1,21 @@ -From 5bbeeaa51fa344a5eda63c7bfd917d08718f5979 Mon Sep 17 00:00:00 2001 -From: Erickson Silva de Oliveira -Date: Mon, 24 Apr 2023 16:28:18 -0300 +From 6b76ae958683ae297701994daaa5d5136bd3890a Mon Sep 17 00:00:00 2001 +From: Gabriel de Araújo Cabral +Date: Thu, 20 Jul 2023 15:57:27 -0300 Subject: [PATCH] ceph-csi-cephfs: add default fields to values.yaml Signed-off-by: Hediberto Cavalcante da Silva Signed-off-by: Felipe Sanches Zanoni Signed-off-by: Erickson Silva de Oliveira +Signed-off-by: Gabriel de Araújo Cabral --- charts/ceph-csi-cephfs/values.yaml | 35 ++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/charts/ceph-csi-cephfs/values.yaml b/charts/ceph-csi-cephfs/values.yaml -index 2e483fda4..f688b2585 100644 +index 05f48e4c3..7c85abd7d 100644 --- a/charts/ceph-csi-cephfs/values.yaml +++ b/charts/ceph-csi-cephfs/values.yaml -@@ -274,6 +274,24 @@ storageClass: +@@ -284,6 +284,24 @@ storageClass: # mountOptions: # - discard @@ -39,7 +40,7 @@ index 2e483fda4..f688b2585 100644 secret: # Specifies whether the secret should be created create: false -@@ -321,3 +339,20 @@ configMapName: ceph-csi-config +@@ -331,3 +349,20 @@ configMapName: ceph-csi-config externallyManagedConfigmap: false # Name of the configmap used for ceph.conf cephConfConfigMapName: ceph-config @@ -59,6 +60,6 @@ index 2e483fda4..f688b2585 100644 +storage_init: + image: + repository: docker.io/openstackhelm/ceph-config-helper -+ tag: ubuntu_focal-20230424 ++ tag: ubuntu_focal_17.2.6-1-20230508 -- 2.25.1 diff --git a/platform-helm/debian/deb_folder/patches/0006-ceph-csi-rbd-replace-appVersion-version.patch b/platform-helm/debian/deb_folder/patches/0006-ceph-csi-rbd-replace-appVersion-version.patch index fbaa05d..2c9c7ce 100644 --- a/platform-helm/debian/deb_folder/patches/0006-ceph-csi-rbd-replace-appVersion-version.patch +++ b/platform-helm/debian/deb_folder/patches/0006-ceph-csi-rbd-replace-appVersion-version.patch @@ -1,28 +1,29 @@ -From e7ef42866c92299c0eab127721e3cf304a8168c6 Mon Sep 17 00:00:00 2001 -From: Erickson Silva de Oliveira -Date: Mon, 20 Mar 2023 16:20:09 -0300 +From e172ca0f9fb802f5802da16cc86465cd6d3e85ce Mon Sep 17 00:00:00 2001 +From: Gabriel de Araújo Cabral +Date: Thu, 20 Jul 2023 21:04:20 -0300 Subject: [PATCH] ceph-csi-rbd: replace appVersion/version Signed-off-by: Hediberto Cavalcante da Silva Signed-off-by: Erickson Silva de Oliveira +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 5ab42a106..f4538734e 100644 +index 5ab42a106..36b91c605 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.8.0 ++appVersion: 3.9.0 description: "Container Storage Interface (CSI) driver, provisioner, snapshotter, resizer and attacher for Ceph RBD" name: ceph-csi-rbd -version: 3-canary -+version: 3.8.0 ++version: 3.9.0 keywords: - ceph - rbd diff --git a/platform-helm/debian/deb_folder/patches/0007-ceph-csi-rbd-add-default-fields-to-values.yaml.patch b/platform-helm/debian/deb_folder/patches/0007-ceph-csi-rbd-add-default-fields-to-values.yaml.patch index edf510c..eeb59cc 100644 --- a/platform-helm/debian/deb_folder/patches/0007-ceph-csi-rbd-add-default-fields-to-values.yaml.patch +++ b/platform-helm/debian/deb_folder/patches/0007-ceph-csi-rbd-add-default-fields-to-values.yaml.patch @@ -1,20 +1,21 @@ -From cb5f1ad019e4e186c6db8986c6dd12a44ad8e60f Mon Sep 17 00:00:00 2001 -From: Erickson Silva de Oliveira -Date: Mon, 24 Apr 2023 17:11:36 -0300 +From 76f0e0e2fd42e9c541163059674b242f4f007a7d Mon Sep 17 00:00:00 2001 +From: Gabriel de Araújo Cabral +Date: Fri, 21 Jul 2023 08:15:53 -0300 Subject: [PATCH] ceph-csi-rbd: add default fields to values.yaml Signed-off-by: Hediberto Cavalcante da Silva Signed-off-by: Felipe Sanches Zanoni Signed-off-by: Erickson Silva de Oliveira +Signed-off-by: Gabriel de Araújo Cabral --- charts/ceph-csi-rbd/values.yaml | 36 +++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml -index 45f4a9073..d74652be1 100644 +index 2b2a03541..c33d5f2a6 100644 --- a/charts/ceph-csi-rbd/values.yaml +++ b/charts/ceph-csi-rbd/values.yaml -@@ -419,6 +419,22 @@ storageClass: +@@ -429,6 +429,22 @@ storageClass: # mountOptions: # - discard @@ -37,7 +38,7 @@ index 45f4a9073..d74652be1 100644 # Mount the host /etc/selinux inside pods to support # selinux-enabled filesystems selinuxMount: true -@@ -471,3 +487,23 @@ externallyManagedConfigmap: false +@@ -481,3 +497,23 @@ externallyManagedConfigmap: false cephConfConfigMapName: ceph-config # Name of the configmap used for encryption kms configuration kmsConfigMapName: ceph-csi-encryption-kms-config @@ -60,6 +61,6 @@ index 45f4a9073..d74652be1 100644 +storage_init: + image: + repository: docker.io/openstackhelm/ceph-config-helper -+ tag: ubuntu_focal-20230424 ++ tag: ubuntu_focal_17.2.6-1-20230508 -- 2.25.1 diff --git a/platform-helm/debian/meta_data.yaml b/platform-helm/debian/meta_data.yaml index a869d9e..125d3ad 100644 --- a/platform-helm/debian/meta_data.yaml +++ b/platform-helm/debian/meta_data.yaml @@ -1,10 +1,10 @@ --- debname: platform-helm -debver: 3.8-0 +debver: 3.9-0 dl_path: - name: ceph-csi-3.8.0.tar.gz - url: https://github.com/ceph/ceph-csi/archive/v3.8.0.tar.gz - md5sum: f4100ceca0fe60150cf07cbdfbe68c61 + name: ceph-csi-3.9.0.tar.gz + url: https://github.com/ceph/ceph-csi/archive/v3.9.0.tar.gz + md5sum: 6dda3029add28c51e05365dd0056cd00 src_files: - platform-helm/files/Makefile revision: diff --git a/stx-platform-helm/debian/deb_folder/changelog b/stx-platform-helm/debian/deb_folder/changelog index 120da6b..9d11bae 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.2-0) unstable; urgency=medium + + * New upstream release. + +-- Gabriel de Araújo Cabral Fri, 21 Jul 2023 08:40:00 +0000 + stx-platform-helm (1.1-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 20f14aa..9f669eb 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.1-0 +debver: 1.2-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 aa9bfc5..6627683 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 @@ -30,16 +30,16 @@ provisioner: enabled: false provisioner: image: - repository: k8s.gcr.io/sig-storage/csi-provisioner - tag: v3.4.1 + repository: registry.k8s.io/sig-storage/csi-provisioner + tag: v3.5.0 resizer: image: - repository: k8s.gcr.io/sig-storage/csi-resizer - tag: v1.7.0 + repository: registry.k8s.io/sig-storage/csi-resizer + tag: v1.8.0 snapshotter: image: - repository: k8s.gcr.io/sig-storage/csi-snapshotter - tag: v6.2.1 + repository: registry.k8s.io/sig-storage/csi-snapshotter + tag: v6.2.2 nodeplugin: name: cephfs-nodeplugin @@ -54,12 +54,12 @@ nodeplugin: enabled: false registrar: image: - repository: k8s.gcr.io/sig-storage/csi-node-driver-registrar - tag: v2.6.3 + repository: registry.k8s.io/sig-storage/csi-node-driver-registrar + tag: v2.8.0 plugin: image: repository: quay.io/cephcsi/cephcsi - tag: v3.8.0 + tag: v3.9.0 serviceAccounts: nodeplugin: @@ -82,8 +82,6 @@ storageClass: "helm.sh/hook": "post-upgrade, post-install", "helm.sh/hook-delete-policy": "before-hook-creation" } - mountOptions: - - debug topology: enabled: false @@ -108,4 +106,4 @@ cephconf: |- storage_init: image: repository: docker.io/openstackhelm/ceph-config-helper - tag: ubuntu_focal-20230424 + tag: ubuntu_focal_17.2.6-1-20230508 diff --git a/stx-platform-helm/stx-platform-helm/fluxcd-manifests/cephfs-provisioner/helmrelease.yaml b/stx-platform-helm/stx-platform-helm/fluxcd-manifests/cephfs-provisioner/helmrelease.yaml index 629e3e6..df26bef 100644 --- a/stx-platform-helm/stx-platform-helm/fluxcd-manifests/cephfs-provisioner/helmrelease.yaml +++ b/stx-platform-helm/stx-platform-helm/fluxcd-manifests/cephfs-provisioner/helmrelease.yaml @@ -15,7 +15,7 @@ spec: chart: spec: chart: ceph-csi-cephfs - version: 3.8.0 + version: 3.9.0 sourceRef: kind: HelmRepository name: stx-platform diff --git a/stx-platform-helm/stx-platform-helm/fluxcd-manifests/rbd-provisioner/helmrelease.yaml b/stx-platform-helm/stx-platform-helm/fluxcd-manifests/rbd-provisioner/helmrelease.yaml index 41ae56a..f7667d2 100644 --- a/stx-platform-helm/stx-platform-helm/fluxcd-manifests/rbd-provisioner/helmrelease.yaml +++ b/stx-platform-helm/stx-platform-helm/fluxcd-manifests/rbd-provisioner/helmrelease.yaml @@ -15,7 +15,7 @@ spec: chart: spec: chart: ceph-csi-rbd - version: 3.8.0 + version: 3.9.0 sourceRef: kind: HelmRepository name: stx-platform 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 c0da9f1..52ba7c6 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 @@ -30,22 +30,22 @@ provisioner: enabled: false provisioner: image: - repository: k8s.gcr.io/sig-storage/csi-provisioner - tag: v3.4.1 + repository: registry.k8s.io/sig-storage/csi-provisioner + tag: v3.5.0 attacher: name: attacher image: - repository: k8s.gcr.io/sig-storage/csi-attacher - tag: v4.2.0 + repository: registry.k8s.io/sig-storage/csi-attacher + tag: v4.3.0 resizer: name: resizer image: - repository: k8s.gcr.io/sig-storage/csi-resizer - tag: v1.7.0 + repository: registry.k8s.io/sig-storage/csi-resizer + tag: v1.8.0 snapshotter: image: - repository: k8s.gcr.io/sig-storage/csi-snapshotter - tag: v6.2.1 + repository: registry.k8s.io/sig-storage/csi-snapshotter + tag: v6.2.2 nodeplugin: name: rbd-nodeplugin @@ -60,12 +60,12 @@ nodeplugin: enabled: false registrar: image: - repository: k8s.gcr.io/sig-storage/csi-node-driver-registrar - tag: v2.6.3 + repository: registry.k8s.io/sig-storage/csi-node-driver-registrar + tag: v2.8.0 plugin: image: repository: quay.io/cephcsi/cephcsi - tag: v3.8.0 + tag: v3.9.0 serviceAccounts: nodeplugin: @@ -107,4 +107,4 @@ cephconf: |- storage_init: image: repository: docker.io/openstackhelm/ceph-config-helper - tag: ubuntu_focal-20230424 + tag: ubuntu_focal_17.2.6-1-20230508 diff --git a/stx-platform-helm/stx-platform-helm/helm-charts/ceph-pools-audit/values.yaml b/stx-platform-helm/stx-platform-helm/helm-charts/ceph-pools-audit/values.yaml index 0a5c6de..2f788cb 100644 --- a/stx-platform-helm/stx-platform-helm/helm-charts/ceph-pools-audit/values.yaml +++ b/stx-platform-helm/stx-platform-helm/helm-charts/ceph-pools-audit/values.yaml @@ -26,7 +26,7 @@ conf: images: tags: - ceph_config_helper: docker.io/openstackhelm/ceph-config-helper:ubuntu_focal-20230424 + ceph_config_helper: docker.io/openstackhelm/ceph-config-helper:ubuntu_focal_17.2.6-1-20230508 pullPolicy: "IfNotPresent" local_registry: active: false