starlingx/platform-armada-app
Code Issues Proposed changes
platform-armada-app/platform-helm/debian/deb_folder/patches/0011-ceph-csi-rbd-update-storageclass.patch
Gabriel de Araújo Cabral 313c3b1d1d Add SnapshotClass Creation for CephFS/RBD via Helm Override 
This commit  introduces the capability to create a snapshot
class using helm overrides within "cephfs-provisioner"
and "rbd-provisioner" charts.

By default, upon applying platform-integ-apps the
'snapshotClass.create' field is set to 'false' in both charts,
creating the snapshot class(es) after being changed to 'true' via
helm overrides and the app reapplied.

This enhancement depends on the changes from the review below,
where in each installation the CRDs and the snapshot-controller
will be created by default when running bootstrap playbook.
This way, each CSI app will be able to implement this functionality
as support for PVC snapshots will be default during installations.

* This is a new review after the revert of:
https://review.opendev.org/c/starlingx/platform-armada-app/+/902722

Test Plan:
 PASS: Build a new app package with the code changes
 PASS: Successfully execute upload, apply, remove, and delete
       operations for 'platform-integ-apps' on both AIO-SX and
       AIO-DX environments.
 PASS: Upon initial application apply and update, check with
       'helm get values' that the 'snapshotClass.create' field
       is set to 'false' in both the cephFS and RBD charts.
       Additionally, confirm on K8s that the snapshotClasses are not
       created, as expected
 PASS: Use 'system helm-override-update' to change the
       'snapshotClass.create' field to 'true' in both charts.
       Reapply the app and validate on K8s that the snapshotClasses
       are indeed created.
 PASS: After creating the SnapshotClass, take a VolumeSnapshot
       from an existing PVC, proceed with K8s upgrade (K8s 1.25,
       1.26, and 1.27) with CRDs and snapshot controller update,
       take a VolumeSnapshot from another PVC and verify that
       all VolumeSnapshots are correct
 PASS: With an old version of the application, create user overrides
       for 'classes', then update to the application with the
       current changes and verify that the user overrides for
       'classes' have been transferred to 'storageClasses'

Partial-Bug: 2045897

Depends-on: https://review.opendev.org/c/starlingx/ansible-playbooks/+/904360

Change-Id: I6e2fe2009d4cce3e351142359c1f36465cf03ee3
Signed-off-by: Gabriel de Araújo Cabral <gabriel.cabral@windriver.com>
Signed-off-by: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
2024-01-08 12:45:54 -03:00

195 lines
8.2 KiB
Diff
Raw Blame History

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
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(-)
diff --git a/charts/ceph-csi-rbd/templates/storageclass.yaml b/charts/ceph-csi-rbd/templates/storageclass.yaml
index a559456aa..b53c3dc6c 100644
--- a/charts/ceph-csi-rbd/templates/storageclass.yaml
+++ b/charts/ceph-csi-rbd/templates/storageclass.yaml
@@ -1,82 +1,106 @@
{{- if .Values.storageClass.create -}}
+{{- $cephCsiDefault := .Values.storageClass }}
+{{- $defaults := .Values.classdefaults }}
+{{- range $sc := .Values.storageClasses }}
apiVersion: storage.k8s.io/v1
kind: StorageClass
metadata:
- name: {{ .Values.storageClass.name }}
-{{- if .Values.storageClass.annotations }}
+ name: {{ $sc.name }}
annotations:
-{{ toYaml .Values.storageClass.annotations | indent 4 }}
-{{- end }}
+ {{- if eq $defaults.storageClass $sc.name }}
+ "storageclass.kubernetes.io/is-default-class": "true"
+ {{- end }}
+{{ toYaml $cephCsiDefault.annotations | indent 4 }}
labels:
- app: {{ include "ceph-csi-rbd.name" . }}
- chart: {{ include "ceph-csi-rbd.chart" . }}
- release: {{ .Release.Name }}
- heritage: {{ .Release.Service }}
- {{- with .Values.commonLabels }}{{ toYaml . | trim | nindent 4 }}{{- end }}
-provisioner: {{ .Values.driverName }}
+ app: {{ include "ceph-csi-rbd.name" $ }}
+ chart: {{ include "ceph-csi-rbd.chart" $ }}
+ release: {{ $.Release.Name }}
+ heritage: {{ $.Release.Service }}
+ {{- with $.Values.commonLabels }}{{ toYaml . | trim | nindent 4 }}{{- end }}
+provisioner: {{ $.Values.driverName }}
parameters:
- clusterID: {{ .Values.storageClass.clusterID }}
- pool: {{ .Values.storageClass.pool }}
- imageFeatures: {{ .Values.storageClass.imageFeatures }}
-{{- if .Values.storageClass.tryOtherMounters }}
- tryOtherMounters: {{ .Values.storageClass.tryOtherMounters | quote}}
-{{- end }}
-{{- if .Values.storageClass.mounter }}
- mounter: {{ .Values.storageClass.mounter }}
-{{- end }}
-{{- if .Values.storageClass.cephLogDir }}
- cephLogDir: {{ .Values.storageClass.cephLogDir }}
-{{- end }}
-{{- if .Values.storageClass.cephLogStrategy }}
- cephLogStrategy: {{ .Values.storageClass.cephLogStrategy }}
-{{- end }}
-{{- if .Values.storageClass.dataPool }}
- dataPool: {{ .Values.storageClass.dataPool }}
-{{- end }}
-{{- if .Values.storageClass.volumeNamePrefix }}
- volumeNamePrefix: "{{ .Values.storageClass.volumeNamePrefix }}"
-{{- end }}
-{{- if .Values.storageClass.encrypted }}
- encrypted: "{{ .Values.storageClass.encrypted }}"
-{{- end }}
-{{- if .Values.storageClass.encryptionKMSID }}
- encryptionKMSID: {{ .Values.storageClass.encryptionKMSID }}
-{{- end }}
-{{- if .Values.storageClass.topologyConstrainedPools }}
+{{- with (first $.Values.csiConfig) }}
+ clusterID: {{ or $sc.clusterID .clusterID }}
+{{- end}}
+ pool: {{ $sc.pool_name }}
+ imageFeatures: {{ or $sc.imageFeatures $cephCsiDefault.imageFeatures }}
+{{- if $sc.tryOtherMounters }}
+ tryOtherMounters: {{ $sc.tryOtherMounters | quote}}
+{{- else if $cephCsiDefault.tryOtherMounters }}
+ tryOtherMounters: {{ $cephCsiDefault.tryOtherMounters | quote}}
+{{- end }}
+{{- if $sc.mounter }}
+ mounter: {{ $sc.mounter }}
+{{- else if $cephCsiDefault.mounter }}
+ mounter: {{ $cephCsiDefault.mounter }}
+{{- end }}
+{{- if $sc.cephLogDir }}
+ cephLogDir: {{ $sc.cephLogDir }}
+{{- else if $cephCsiDefault.cephLogDir }}
+ cephLogDir: {{ $cephCsiDefault.cephLogDir }}
+{{- end }}
+{{- if $sc.cephLogStrategy }}
+ cephLogStrategy: {{ $sc.cephLogStrategy }}
+{{- else if $cephCsiDefault.cephLogStrategy }}
+ cephLogStrategy: {{ $cephCsiDefault.cephLogStrategy }}
+{{- end }}
+{{- if $sc.dataPool }}
+ dataPool: {{ $sc.dataPool }}
+{{- else if $cephCsiDefault.dataPool }}
+ dataPool: {{ $cephCsiDefault.dataPool }}
+{{- end }}
+{{- if $sc.volumeNamePrefix }}
+ volumeNamePrefix: "{{ $sc.volumeNamePrefix }}"
+{{- else if $cephCsiDefault.volumeNamePrefix }}
+ volumeNamePrefix: "{{ $cephCsiDefault.volumeNamePrefix }}"
+{{- end }}
+{{- if $sc.encrypted }}
+ encrypted: "{{ $sc.encrypted }}"
+{{- else if $cephCsiDefault.encrypted }}
+ encrypted: "{{ $cephCsiDefault.encrypted }}"
+{{- end }}
+{{- if $sc.encryptionKMSID }}
+ encryptionKMSID: {{ $sc.encryptionKMSID }}
+{{- else if $cephCsiDefault.encryptionKMSID }}
+ encryptionKMSID: {{ $cephCsiDefault.encryptionKMSID }}
+{{- end }}
+{{- if $sc.topologyConstrainedPools }}
topologyConstrainedPools:
- {{ toYaml .Values.storageClass.topologyConstrainedPools | indent 4 -}}
-{{- end }}
-{{- if .Values.storageClass.mapOptions }}
- mapOptions: {{ .Values.storageClass.mapOptions }}
-{{- end }}
-{{- if .Values.storageClass.unmapOptions }}
- unmapOptions: {{ .Values.storageClass.unmapOptions }}
-{{- 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 }}
-{{ else }}
- csi.storage.k8s.io/provisioner-secret-namespace: {{ .Release.Namespace }}
-{{- end }}
- csi.storage.k8s.io/controller-expand-secret-name: {{ .Values.storageClass.controllerExpandSecret }}
-{{- if .Values.storageClass.controllerExpandSecretNamespace }}
- csi.storage.k8s.io/controller-expand-secret-namespace: {{ .Values.storageClass.controllerExpandSecretNamespace }}
-{{ else }}
- csi.storage.k8s.io/controller-expand-secret-namespace: {{ .Release.Namespace }}
-{{- end }}
- csi.storage.k8s.io/node-stage-secret-name: {{ .Values.storageClass.nodeStageSecret }}
-{{- if .Values.storageClass.nodeStageSecretNamespace }}
- csi.storage.k8s.io/node-stage-secret-namespace: {{ .Values.storageClass.nodeStageSecretNamespace }}
-{{ else }}
- csi.storage.k8s.io/node-stage-secret-namespace: {{ .Release.Namespace }}
-{{- end }}
- csi.storage.k8s.io/fstype: {{ .Values.storageClass.fstype }}
-reclaimPolicy: {{ .Values.storageClass.reclaimPolicy }}
-allowVolumeExpansion: {{ .Values.storageClass.allowVolumeExpansion }}
-{{- if .Values.storageClass.mountOptions }}
+ {{ toYaml $sc.topologyConstrainedPools | indent 4 -}}
+{{- else if $cephCsiDefault.topologyConstrainedPools }}
+ topologyConstrainedPools:
+ {{ toYaml $cephCsiDefault.topologyConstrainedPools | indent 4 -}}
+{{- end }}
+{{- if $sc.mapOptions }}
+ mapOptions: {{ $sc.mapOptions }}
+{{- else if $cephCsiDefault.mapOptions }}
+ mapOptions: {{ $cephCsiDefault.mapOptions }}
+{{- end }}
+{{- if $sc.unmapOptions }}
+ unmapOptions: {{ $sc.unmapOptions }}
+{{- else if $cephCsiDefault.unmapOptions }}
+ unmapOptions: {{ $cephCsiDefault.unmapOptions }}
+{{- 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 }}
+ csi.storage.k8s.io/controller-expand-secret-namespace: {{ or $sc.controllerExpandSecretNamespace $.Release.Namespace }}
+ csi.storage.k8s.io/node-stage-secret-name: {{ or $sc.nodeStageSecret $defaults.adminSecretName }}
+ csi.storage.k8s.io/node-stage-secret-namespace: {{ or $sc.nodeStageSecretNamespace $.Release.Namespace }}
+ csi.storage.k8s.io/fstype: {{ or $sc.fstype $cephCsiDefault.fstype }}
+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 }}
+ - {{ . }}
+ {{- end }}
+{{- end }}
+---
{{- end }}
{{- end -}}
--
2.25.1
View Git Blame Copy Permalink