starlingx/platform-armada-app
Code Issues Proposed changes

Update ceph-csi helm charts to v3.10.1

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

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.6.2
- https://github.com/kubernetes-csi/external-attacher/releases/tag/v4.4.2
- https://github.com/kubernetes-csi/external-snapshotter/releases/tag/v6.3.2
- https://github.com/kubernetes-csi/node-driver-registrar/releases/tag/v2.9.1
- https://github.com/kubernetes-csi/external-resizer/releases/tag/v1.9.2

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

* Tests were performed on SX/DX/Standard/Storage with K8s
  1.24, 1.25, 1.26 and 1.27

Story: 2010688
Task: 49420

Change-Id: I5d4b6d3583be0f60f5a15c5ace49951959bdd027
Signed-off-by: Hediberto Cavalcante da Silva <hediberto.cavalcantedasilva@windriver.com>
Signed-off-by: Gabriel de Araújo Cabral <gabriel.cabral@windriver.com>
This commit is contained in:
Hediberto Cavalcante da Silva 2024-01-05 17:52:28 -03:00 committed by Gabriel de Araújo Cabral
parent 829555e0d9
commit fbee8e217a
20 changed files with 187 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
#
# Copyright (c) 2019 Wind River Systems, Inc.
# Copyright (c) 2019, 2024 Wind River Systems, Inc.
#
# SPDX-License-Identifier: Apache-2.0
#
@ -7,4 +7,4 @@ apiVersion: v1
appVersion: "1.0"
description: Ceph RBD pool replication monitor chart
name: ceph-pools-audit
version: 0.1.0
version: 0.1.1

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

@ -1,5 +1,5 @@
#
# Copyright (c) 2019-2023 Wind River Systems, Inc.
# Copyright (c) 2019-2024 Wind River Systems, Inc.
#
# SPDX-License-Identifier: Apache-2.0
#
@ -26,7 +26,7 @@ conf:
images:
tags:
ceph_config_helper: docker.io/openstackhelm/ceph-config-helper:ubuntu_focal_17.2.6-1-20230508
ceph_config_helper: docker.io/openstackhelm/ceph-config-helper:ubuntu_focal_18.2.0-1-20231013
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 (0.1-1) unstable; urgency=medium
* Update of ceph-config-helper image.
-- Hediberto Cavalcante da Silva <hediberto.cavalcantedasilva@windriver.com> Thu, 4 Jan 2024 14:54:00 +0000
ceph-pools-audit-helm (0.1-0) unstable; urgency=medium
* Initial release.

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

@ -1,3 +1,9 @@
platform-helm (3.10-1) unstable; urgency=medium
* New upstream release.
-- Hediberto Cavalcante da Silva <hediberto.cavalcantedasilva@windriver.com> Thu, 4 Jan 2024 14:54:00 +0000
platform-helm (3.9-0) unstable; urgency=medium
* New upstream release.

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

@ -1,31 +1,30 @@
From 7354d955c397c661d0b1c73b35b770948c8adb5c Mon Sep 17 00:00:00 2001
From: Gabriel de Araújo Cabral <gabriel.cabral@windriver.com>
Date: Thu, 20 Jul 2023 15:51:06 -0300
From a3dc71e29e28a608936c20220d29c1ab1c0ded60 Mon Sep 17 00:00:00 2001
From: Hediberto Cavalcante da Silva <hediberto.cavalcantedasilva@windriver.com>
Date: Thu, 4 Jan 2024 14:54:20 -0300
Subject: [PATCH] ceph-csi-cephfs: replace appVersion/version
Signed-off-by: Hediberto Cavalcante da Silva <hediberto.cavalcantedasilva@windriver.com>
Signed-off-by: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
Signed-off-by: Gabriel de Araújo Cabral <gabriel.cabral@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 46d38df97..16cd12eb2 100644
index 46d38df..a1dd211 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.9.0
+appVersion: 3.10.1
description: "Container Storage Interface (CSI) driver,
provisioner, snapshotter and resizer for Ceph cephfs"
name: ceph-csi-cephfs
-version: 3-canary
+version: 3.9.0
+version: 3.10.1
keywords:
- ceph
- cephfs
--
2.25.1
2.34.1

35
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,32 @@
From 6b76ae958683ae297701994daaa5d5136bd3890a Mon Sep 17 00:00:00 2001
From: Gabriel de Araújo Cabral <gabriel.cabral@windriver.com>
Date: Thu, 20 Jul 2023 15:57:27 -0300
From c85077bed399ab34fe2da87311247fe766fee094 Mon Sep 17 00:00:00 2001
From: Hediberto Cavalcante da Silva <hediberto.cavalcantedasilva@windriver.com>
Date: Thu, 4 Jan 2024 14:59:12 -0300
Subject: [PATCH] ceph-csi-cephfs: add default fields to values.yaml
Signed-off-by: Hediberto Cavalcante da Silva <hediberto.cavalcantedasilva@windriver.com>
Signed-off-by: Felipe Sanches Zanoni <Felipe.SanchesZanoni@windriver.com>
Signed-off-by: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
Signed-off-by: Gabriel de Araújo Cabral <gabriel.cabral@windriver.com>
---
charts/ceph-csi-cephfs/values.yaml | 35 ++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
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 05f48e4c3..7c85abd7d 100644
index fd681c1..24c0a30 100644
--- a/charts/ceph-csi-cephfs/values.yaml
+++ b/charts/ceph-csi-cephfs/values.yaml
@@ -284,6 +284,24 @@ storageClass:
@@ -222,10 +222,10 @@ provisioner:
affinity: {}
-# readAffinity:
+readAffinity:
# Enable read affinity for CephFS subvolumes. Recommended to
# set to true if running kernel 5.8 or newer.
-# 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
@@ -295,6 +295,24 @@ storageClass:
# mountOptions:
# - discard
@ -40,7 +51,7 @@ index 05f48e4c3..7c85abd7d 100644
secret:
# Specifies whether the secret should be created
create: false
@@ -331,3 +349,20 @@ configMapName: ceph-csi-config
@@ -346,3 +364,20 @@ configMapName: ceph-csi-config
externallyManagedConfigmap: false
# Name of the configmap used for ceph.conf
cephConfConfigMapName: ceph-config
@ -60,6 +71,6 @@ index 05f48e4c3..7c85abd7d 100644
+storage_init:
+ image:
+ repository: docker.io/openstackhelm/ceph-config-helper
+ tag: ubuntu_focal_17.2.6-1-20230508
+ tag: ubuntu_focal_18.2.0-1-20231013
--
2.25.1
2.34.1

39
helm-charts/upstream/platform-helm/debian/deb_folder/patches/0003-ceph-csi-cephfs-add-storage-init.yaml.patch
View File

@ -1,26 +1,24 @@
From 356ddba07d33e333d332415d9858f4c6354a0d85 Mon Sep 17 00:00:00 2001
From: Gabriel de Araújo Cabral <gabriel.cabral@windriver.com>
Date: Wed, 6 Dec 2023 14:16:19 -0300
From f380234343cbb6cb65ad54574099ca5adbca9cb4 Mon Sep 17 00:00:00 2001
From: Hediberto Cavalcante da Silva <hediberto.cavalcantedasilva@windriver.com>
Date: Thu, 4 Jan 2024 15:02:15 -0300
Subject: [PATCH] ceph-csi-cephfs: add storage-init.yaml
Signed-off-by: Hediberto Cavalcante da Silva <hediberto.cavalcantedasilva@windriver.com>
Signed-off-by: Felipe Sanches Zanoni <Felipe.SanchesZanoni@windriver.com>
Signed-off-by: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
Signed-off-by: Gabriel de Araújo Cabral <gabriel.cabral@windriver.com>
---
.../templates/storage-init.yaml | 369 ++++++++++++++++++
1 file changed, 369 insertions(+)
.../templates/storage-init.yaml | 386 ++++++++++++++++++
1 file changed, 386 insertions(+)
create mode 100644 charts/ceph-csi-cephfs/templates/storage-init.yaml
diff --git a/charts/ceph-csi-cephfs/templates/storage-init.yaml b/charts/ceph-csi-cephfs/templates/storage-init.yaml
new file mode 100644
index 000000000..97052d7a9
index 0000000..3ffa153
--- /dev/null
+++ b/charts/ceph-csi-cephfs/templates/storage-init.yaml
@@ -0,0 +1,369 @@
@@ -0,0 +1,386 @@
+{{/*
+#
+# Copyright (c) 2020-2023 Wind River Systems, Inc.
+# Copyright (c) 2020-2024 Wind River Systems, Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
@ -121,7 +119,7 @@ index 000000000..97052d7a9
+ #! /bin/bash
+
+ #
+ # Copyright (c) 2020-2023 Wind River Systems, Inc.
+ # Copyright (c) 2020-2024 Wind River Systems, Inc.
+ #
+ # SPDX-License-Identifier: Apache-2.0
+ #
@ -306,6 +304,23 @@ index 000000000..97052d7a9
+ echo "Filesystem ${FS_NAME} already exists"
+ fi
+
+ # subvolumeGroup is no longer created automatically in v3.10.1
+ # See: https://github.com/ceph/ceph-csi/issues/4185
+ echo -e "\n================================================="
+ echo "Creating subvolumeGroup csi"
+ echo "================================================="
+
+ # There is no need to check if the subvolumegroup already exists.
+ # The following create command does not duplicate the subvolumegroup.
+ ceph fs subvolumegroup create ${FS_NAME} csi
+ RETURN_CODE=$?
+ if [ ${RETURN_CODE} -ne 0 ]; then
+ echo -e "Error creating subvolumegroup csi (return code: ${RETURN_CODE})"
+ exit ${RETURN_CODE}
+ else
+ echo "subvolumeGroup csi for ${FS_NAME} created"
+ fi
+
+ echo -e "\n================================================="
+ echo "ceph -s"
+ echo "================================================="
@ -388,4 +403,4 @@ index 000000000..97052d7a9
+{{ toYaml . | indent 8 }}
+{{- end}}
--
2.25.1
2.34.1

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

@ -1,31 +1,30 @@
From e172ca0f9fb802f5802da16cc86465cd6d3e85ce Mon Sep 17 00:00:00 2001
From: Gabriel de Araújo Cabral <gabriel.cabral@windriver.com>
Date: Thu, 20 Jul 2023 21:04:20 -0300
From e0cbd82d3dbfb606c27d266d700bf71390da3104 Mon Sep 17 00:00:00 2001
From: Hediberto Cavalcante da Silva <hediberto.cavalcantedasilva@windriver.com>
Date: Thu, 4 Jan 2024 15:12:02 -0300
Subject: [PATCH] ceph-csi-rbd: replace appVersion/version
Signed-off-by: Hediberto Cavalcante da Silva <hediberto.cavalcantedasilva@windriver.com>
Signed-off-by: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
Signed-off-by: Gabriel de Araújo Cabral <gabriel.cabral@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 5ab42a106..36b91c605 100644
index 5ab42a1..11ad868 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.9.0
+appVersion: 3.10.1
description: "Container Storage Interface (CSI) driver,
provisioner, snapshotter, resizer and attacher for Ceph RBD"
name: ceph-csi-rbd
-version: 3-canary
+version: 3.9.0
+version: 3.10.1
keywords:
- ceph
- rbd
--
2.25.1
2.34.1

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

@ -1,21 +1,32 @@
From 76f0e0e2fd42e9c541163059674b242f4f007a7d Mon Sep 17 00:00:00 2001
From: Gabriel de Araújo Cabral <gabriel.cabral@windriver.com>
Date: Fri, 21 Jul 2023 08:15:53 -0300
From 664018df5a965c4a2d38f84824c80567c9941d62 Mon Sep 17 00:00:00 2001
From: Hediberto Cavalcante da Silva <hediberto.cavalcantedasilva@windriver.com>
Date: Thu, 4 Jan 2024 15:47:27 -0300
Subject: [PATCH] ceph-csi-rbd: add default fields to values.yaml
Signed-off-by: Hediberto Cavalcante da Silva <hediberto.cavalcantedasilva@windriver.com>
Signed-off-by: Felipe Sanches Zanoni <Felipe.SanchesZanoni@windriver.com>
Signed-off-by: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
Signed-off-by: Gabriel de Araújo Cabral <gabriel.cabral@windriver.com>
---
charts/ceph-csi-rbd/values.yaml | 36 +++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
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 2b2a03541..c33d5f2a6 100644
index 0d75418..b5f2f5a 100644
--- a/charts/ceph-csi-rbd/values.yaml
+++ b/charts/ceph-csi-rbd/values.yaml
@@ -429,6 +429,22 @@ storageClass:
@@ -284,10 +284,10 @@ topology:
- failure-domain/region
- failure-domain/zone
-# readAffinity:
+readAffinity:
# Enable read affinity for RBD volumes. Recommended to
# set to true if running kernel 5.8 or newer.
-# 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
@@ -472,6 +472,22 @@ storageClass:
# mountOptions:
# - discard
@ -38,7 +49,7 @@ index 2b2a03541..c33d5f2a6 100644
# Mount the host /etc/selinux inside pods to support
# selinux-enabled filesystems
selinuxMount: true
@@ -481,3 +497,23 @@ externallyManagedConfigmap: false
@@ -528,3 +544,23 @@ externallyManagedConfigmap: false
cephConfConfigMapName: ceph-config
# Name of the configmap used for encryption kms configuration
kmsConfigMapName: ceph-csi-encryption-kms-config
@ -61,6 +72,6 @@ index 2b2a03541..c33d5f2a6 100644
+storage_init:
+ image:
+ repository: docker.io/openstackhelm/ceph-config-helper
+ tag: ubuntu_focal_17.2.6-1-20230508
+ tag: ubuntu_focal_18.2.0-1-20231013
--
2.25.1
2.34.1

67
helm-charts/upstream/platform-helm/debian/deb_folder/patches/0011-ceph-csi-rbd-update-storageclass.patch
View File

@ -1,20 +1,19 @@
From d4ecc92cf187225ab4cdb882370647cb5b5d0d3b Mon Sep 17 00:00:00 2001
From: Gabriel de Araújo Cabral <gabriel.cabral@windriver.com>
Date: Wed, 6 Dec 2023 14:22:19 -0300
From a4a5246c189c3ee43901bbc57427e8427c4146e7 Mon Sep 17 00:00:00 2001
From: Hediberto Cavalcante da Silva <hediberto.cavalcantedasilva@windriver.com>
Date: Thu, 4 Jan 2024 16:06:44 -0300
Subject: [PATCH] ceph-csi-rbd: update storageclass
Signed-off-by: Hediberto Cavalcante da Silva <hediberto.cavalcantedasilva@windriver.com>
Signed-off-by: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
Signed-off-by: Gabriel de Araújo Cabral <gabriel.cabral@windriver.com>
---
.../ceph-csi-rbd/templates/storageclass.yaml | 162 ++++++++++--------
1 file changed, 93 insertions(+), 69 deletions(-)
.../ceph-csi-rbd/templates/storageclass.yaml | 194 ++++++++++--------
1 file changed, 113 insertions(+), 81 deletions(-)
diff --git a/charts/ceph-csi-rbd/templates/storageclass.yaml b/charts/ceph-csi-rbd/templates/storageclass.yaml
index a559456aa..b53c3dc6c 100644
index 459a6ea..ab489d1 100644
--- a/charts/ceph-csi-rbd/templates/storageclass.yaml
+++ b/charts/ceph-csi-rbd/templates/storageclass.yaml
@@ -1,82 +1,106 @@
@@ -1,94 +1,126 @@
{{- if .Values.storageClass.create -}}
+{{- $cephCsiDefault := .Values.storageClass }}
+{{- $defaults := .Values.classdefaults }}
@ -52,6 +51,9 @@ index a559456aa..b53c3dc6c 100644
-{{- if .Values.storageClass.tryOtherMounters }}
- tryOtherMounters: {{ .Values.storageClass.tryOtherMounters | quote}}
-{{- end }}
-{{- if .Values.storageClass.mkfsOptions }}
- mkfsOptions: {{ .Values.storageClass.mkfsOptions }}
-{{- end }}
-{{- if .Values.storageClass.mounter }}
- mounter: {{ .Values.storageClass.mounter }}
-{{- end }}
@ -84,6 +86,11 @@ index a559456aa..b53c3dc6c 100644
+{{- else if $cephCsiDefault.tryOtherMounters }}
+ tryOtherMounters: {{ $cephCsiDefault.tryOtherMounters | quote}}
+{{- end }}
+{{- if $sc.mkfsOptions }}
+ mkfsOptions: {{ $sc.mkfsOptions }}
+{{- else if $cephCsiDefault.mkfsOptions }}
+ mkfsOptions: {{ $cephCsiDefault.mkfsOptions }}
+{{- end }}
+{{- if $sc.mounter }}
+ mounter: {{ $sc.mounter }}
+{{- else if $cephCsiDefault.mounter }}
@ -129,6 +136,15 @@ index a559456aa..b53c3dc6c 100644
-{{- if .Values.storageClass.unmapOptions }}
- unmapOptions: {{ .Values.storageClass.unmapOptions }}
-{{- end }}
-{{- if .Values.storageClass.stripeUnit }}
- stripeUnit: {{ .Values.storageClass.stripeUnit | quote }}
-{{- end }}
-{{- if .Values.storageClass.stripeCount }}
- stripeCount: {{ .Values.storageClass.stripeCount | quote }}
-{{- end }}
-{{- if .Values.storageClass.objectSize }}
- objectSize: {{ .Values.storageClass.objectSize | quote }}
-{{- end }}
- csi.storage.k8s.io/provisioner-secret-name: {{ .Values.storageClass.provisionerSecret }}
-{{- if .Values.storageClass.provisionerSecretNamespace }}
- csi.storage.k8s.io/provisioner-secret-namespace: {{ .Values.storageClass.provisionerSecretNamespace }}
@ -166,6 +182,21 @@ index a559456aa..b53c3dc6c 100644
+{{- else if $cephCsiDefault.unmapOptions }}
+ unmapOptions: {{ $cephCsiDefault.unmapOptions }}
+{{- end }}
+{{- if $sc.stripeUnit }}
+ stripeUnit: {{ $sc.stripeUnit | quote }}
+{{- else if $cephCsiDefault.stripeUnit }}
+ stripeUnit: {{ $cephCsiDefault.stripeUnit | quote }}
+{{- end }}
+{{- if $sc.stripeCount }}
+ stripeCount: {{ $sc.stripeCount | quote }}
+{{- else if $cephCsiDefault.stripeCount }}
+ stripeCount: {{ $cephCsiDefault.stripeCount | quote }}
+{{- end }}
+{{- if $sc.objectSize }}
+ objectSize: {{ $sc.objectSize | quote }}
+{{- else if $cephCsiDefault.objectSize }}
+ objectSize: {{ $cephCsiDefault.objectSize | quote }}
+{{- end }}
+ csi.storage.k8s.io/provisioner-secret-name: {{ or $sc.provisionerSecret $defaults.adminSecretName }}
+ csi.storage.k8s.io/provisioner-secret-namespace: {{ or $sc.provisionerSecretNamespace $.Release.Namespace }}
+ csi.storage.k8s.io/controller-expand-secret-name: {{ or $sc.controllerExpandSecret $defaults.adminSecretName }}
@ -176,19 +207,19 @@ index a559456aa..b53c3dc6c 100644
+reclaimPolicy: {{ or $sc.reclaimPolicy $cephCsiDefault.reclaimPolicy }}
+allowVolumeExpansion: {{ or $sc.allowVolumeExpansion $cephCsiDefault.allowVolumeExpansion }}
+{{- if $sc.mountOptions }}
mountOptions:
- {{- range .Values.storageClass.mountOptions }}
+ {{- range $sc.mountOptions }}
- {{ . }}
{{- end }}
+{{- else if $cephCsiDefault.mountOptions }}
+mountOptions:
+ {{- range $cephCsiDefault.mountOptions }}
+ {{- range $sc.mountOptions }}
+ - {{ . }}
+ {{- end }}
+{{- end }}
+---
+{{- else if $cephCsiDefault.mountOptions }}
mountOptions:
- {{- range .Values.storageClass.mountOptions }}
+ {{- range $cephCsiDefault.mountOptions }}
- {{ . }}
{{- end }}
{{- end }}
+---
+{{- end }}
{{- end -}}
--
2.25.1
2.34.1

2
helm-charts/upstream/platform-helm/debian/deb_folder/rules
View File

@ -3,7 +3,7 @@
export DEB_VERSION = $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
export PATCH_VERSION = $(shell echo $(DEB_VERSION) | cut -f 4 -d '.')
export CHART_BASE_VERSION = "3.9.0"
export CHART_BASE_VERSION = $(shell echo $(DEB_VERSION) | sed 's/-/./' | cut -d '.' -f 1-3)
export CHART_VERSION = $(CHART_BASE_VERSION)+STX.$(PATCH_VERSION)
export ROOT = debian/tmp

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

@ -1,10 +1,10 @@
---
debname: platform-helm
debver: 3.9-0
debver: 3.10-1
dl_path:
name: ceph-csi-3.9.0.tar.gz
url: https://github.com/ceph/ceph-csi/archive/v3.9.0.tar.gz
md5sum: 6dda3029add28c51e05365dd0056cd00
name: ceph-csi-3.10.1.tar.gz
url: https://github.com/ceph/ceph-csi/archive/v3.10.1.tar.gz
sha256sum: 1733d0435aa5a59d94b68dda5bf24013ba995c475e6b48d6e06830d5ab491dd8
src_files:
- platform-helm/files/Makefile
revision:

7
python3-k8sapp-platform/k8sapp_platform/k8sapp_platform/helm/ceph_fs_provisioner.py
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2020-2023 Wind River Systems, Inc.
# Copyright (c) 2020-2024 Wind River Systems, Inc.
#
# SPDX-License-Identifier: Apache-2.0
#
@ -206,7 +206,10 @@ class CephFSProvisionerHelm(base.FluxCDBaseHelm):
csi_config = [{
"clusterID": cluster_id,
"monitors": [monitor for monitor in monitors]
"monitors": [monitor for monitor in monitors],
"cephFS": {
"subvolumeGroup": "csi"
}
}]
overrides = {

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

@ -1,3 +1,9 @@
stx-platform-helm (1.3-0) unstable; urgency=medium
* New upstream release.
-- Hediberto Cavalcante da Silva <hediberto.cavalcantedasilva@windriver.com> Thu, 4 Jan 2024 14:54:00 +0000
stx-platform-helm (1.2-0) unstable; urgency=medium
* New upstream release.

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

@ -1,6 +1,6 @@
---
debname: stx-platform-helm
debver: 1.2-0
debver: 1.3-0
src_path: stx-platform-helm
revision:
dist: $STX_DIST

2
stx-platform-helm/stx-platform-helm/fluxcd-manifests/ceph-pools-audit/helmrelease.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2022 Wind River Systems, Inc.
# Copyright (c) 2022, 2024 Wind River Systems, Inc.
#
# SPDX-License-Identifier: Apache-2.0
#

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

@ -1,5 +1,5 @@
#
# Copyright (c) 2022-2023 Wind River Systems, Inc.
# Copyright (c) 2022-2024 Wind River Systems, Inc.
#
# SPDX-License-Identifier: Apache-2.0
#
@ -31,15 +31,15 @@ provisioner:
provisioner:
image:
repository: registry.k8s.io/sig-storage/csi-provisioner
tag: v3.5.0
tag: v3.6.2
resizer:
image:
repository: registry.k8s.io/sig-storage/csi-resizer
tag: v1.8.0
tag: v1.9.2
snapshotter:
image:
repository: registry.k8s.io/sig-storage/csi-snapshotter
tag: v6.2.2
tag: v6.3.2
nodeplugin:
name: cephfs-nodeplugin
@ -55,11 +55,11 @@ nodeplugin:
registrar:
image:
repository: registry.k8s.io/sig-storage/csi-node-driver-registrar
tag: v2.8.0
tag: v2.9.1
plugin:
image:
repository: quay.io/cephcsi/cephcsi
tag: v3.9.0
tag: v3.10.1
serviceAccounts:
nodeplugin:
@ -112,4 +112,4 @@ cephconf: |-
storage_init:
image:
repository: docker.io/openstackhelm/ceph-config-helper
tag: ubuntu_focal_17.2.6-1-20230508
tag: ubuntu_focal_18.2.0-1-20231013

2
stx-platform-helm/stx-platform-helm/fluxcd-manifests/cephfs-provisioner/helmrelease.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2022-2023 Wind River Systems, Inc.
# Copyright (c) 2022-2024 Wind River Systems, Inc.
#
# SPDX-License-Identifier: Apache-2.0
#

2
stx-platform-helm/stx-platform-helm/fluxcd-manifests/rbd-provisioner/helmrelease.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2022-2023 Wind River Systems, Inc.
# Copyright (c) 2022-2024 Wind River Systems, Inc.
#
# SPDX-License-Identifier: Apache-2.0
#

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

@ -1,5 +1,5 @@
#
# Copyright (c) 2022-2023 Wind River Systems, Inc.
# Copyright (c) 2022-2024 Wind River Systems, Inc.
#
# SPDX-License-Identifier: Apache-2.0
#
@ -31,21 +31,21 @@ provisioner:
provisioner:
image:
repository: registry.k8s.io/sig-storage/csi-provisioner
tag: v3.5.0
tag: v3.6.2
attacher:
name: attacher
image:
repository: registry.k8s.io/sig-storage/csi-attacher
tag: v4.3.0
tag: v4.4.2
resizer:
name: resizer
image:
repository: registry.k8s.io/sig-storage/csi-resizer
tag: v1.8.0
tag: v1.9.2
snapshotter:
image:
repository: registry.k8s.io/sig-storage/csi-snapshotter
tag: v6.2.2
tag: v6.3.2
nodeplugin:
name: rbd-nodeplugin
@ -61,11 +61,11 @@ nodeplugin:
registrar:
image:
repository: registry.k8s.io/sig-storage/csi-node-driver-registrar
tag: v2.8.0
tag: v2.9.1
plugin:
image:
repository: quay.io/cephcsi/cephcsi
tag: v3.9.0
tag: v3.10.1
serviceAccounts:
nodeplugin:
@ -113,4 +113,4 @@ cephconf: |-
storage_init:
image:
repository: docker.io/openstackhelm/ceph-config-helper
tag: ubuntu_focal_17.2.6-1-20230508
tag: ubuntu_focal_18.2.0-1-20231013