From ec29ec1ac2bd58e33d3aae0583e061f547e922ec Mon Sep 17 00:00:00 2001 From: Ruslan Khizhnyak Date: Wed, 15 Nov 2023 11:46:49 +0300 Subject: [PATCH] helm: add extraDeploy option To deploy additional manifests with the release. Signed-off-by: Ruslan Khizhnyak --- charts/ceph-csi-cephfs/templates/extra-deploy.yaml | 4 ++++ charts/ceph-csi-cephfs/values.yaml | 3 +++ charts/ceph-csi-rbd/templates/extra-deploy.yaml | 4 ++++ charts/ceph-csi-rbd/values.yaml | 3 +++ docs/deploy-cephfs.md | 1 + docs/deploy-rbd.md | 1 + 6 files changed, 16 insertions(+) create mode 100644 charts/ceph-csi-cephfs/templates/extra-deploy.yaml create mode 100644 charts/ceph-csi-rbd/templates/extra-deploy.yaml diff --git a/charts/ceph-csi-cephfs/templates/extra-deploy.yaml b/charts/ceph-csi-cephfs/templates/extra-deploy.yaml new file mode 100644 index 00000000000..cb8b3c8a5be --- /dev/null +++ b/charts/ceph-csi-cephfs/templates/extra-deploy.yaml @@ -0,0 +1,4 @@ +{{- range .Values.extraDeploy }} +--- + {{- tpl ( . | toYaml) $ }} +{{- end }} diff --git a/charts/ceph-csi-cephfs/values.yaml b/charts/ceph-csi-cephfs/values.yaml index 96336e4d47a..0d893eb9e8e 100644 --- a/charts/ceph-csi-cephfs/values.yaml +++ b/charts/ceph-csi-cephfs/values.yaml @@ -323,6 +323,9 @@ cephconf: | # see https://github.com/ceph/ceph-csi/issues/1928 fuse_big_writes = true +# Array of extra objects to deploy with the release +extraDeploy: [] + ######################################################### # Variables for 'internal' use please use with caution! # ######################################################### diff --git a/charts/ceph-csi-rbd/templates/extra-deploy.yaml b/charts/ceph-csi-rbd/templates/extra-deploy.yaml new file mode 100644 index 00000000000..cb8b3c8a5be --- /dev/null +++ b/charts/ceph-csi-rbd/templates/extra-deploy.yaml @@ -0,0 +1,4 @@ +{{- range .Values.extraDeploy }} +--- + {{- tpl ( . | toYaml) $ }} +{{- end }} diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml index bed0f1ea04b..f8c3ae073b9 100644 --- a/charts/ceph-csi-rbd/values.yaml +++ b/charts/ceph-csi-rbd/values.yaml @@ -501,6 +501,9 @@ cephconf: | auth_service_required = cephx auth_client_required = cephx +# Array of extra objects to deploy with the release +extraDeploy: [] + ######################################################### # Variables for 'internal' use please use with caution! # ######################################################### diff --git a/docs/deploy-cephfs.md b/docs/deploy-cephfs.md index ddb3f40f30f..89f1495ca76 100644 --- a/docs/deploy-cephfs.md +++ b/docs/deploy-cephfs.md @@ -77,6 +77,7 @@ you're running it inside a k8s cluster and find the config itself). | `csi.storage.k8s.io/provisioner-secret-namespace`, `csi.storage.k8s.io/node-stage-secret-namespace` | for Kubernetes | Namespaces of the above Secret objects | | `encrypted` | no | disabled by default, use `"true"` to enable fscrypt encryption on PVC and `"false"` to disable it. **Do not change for existing storageclasses** | | `encryptionKMSID` | no | required if encryption is enabled and a kms is used to store passphrases | +| `extraDeploy` | no | array of extra objects to deploy with the release | **NOTE:** An accompanying CSI configuration file, needs to be provided to the running pods. Refer to [Creating CSI configuration](../examples/README.md#creating-csi-configuration) diff --git a/docs/deploy-rbd.md b/docs/deploy-rbd.md index de76d5a1ab1..7a8512a5f2c 100644 --- a/docs/deploy-rbd.md +++ b/docs/deploy-rbd.md @@ -72,6 +72,7 @@ make image-cephcsi | `stripeUnit` | no | stripe unit in bytes | | `stripeCount` | no | objects to stripe over before looping | | `objectSize` | no | object size in bytes | +| `extraDeploy` | no | array of extra objects to deploy with the release | **NOTE:** An accompanying CSI configuration file, needs to be provided to the running pods. Refer to [Creating CSI configuration](../examples/README.md#creating-csi-configuration)