starlingx/platform-armada-app
Code Issues Proposed changes

Remove RBD lifecycle and additionalNamespaces override

Browse Source 
The additionalNamespaces override was created so that a secret
could be created for rbd and cephfs to be provisioned in
namespaces different from platform-integ-apps (kube-system).
However, this is no longer necessary, as StorageClass itself
manages this, therefore it needs to be removed.

Furthermore, the RBD lifecycle had been created with a similar
purpose, which was to copy the RBD secret to each app namespace
that used ceph. With the changes in [1], the RBD lifecycle will
no longer therefore it must also be removed from the app.

[1]: https://review.opendev.org/c/starlingx/config/+/971179

Test Plan:
- PASS: Build the application package.
- PASS: Remove the secrets 'ceph-pool-kube-cephfs-data'
  and 'ceph-pool-kube-rbd' from the app namespace.
- PASS: Apply the app

Story: 2011595
Task: 53558

Change-Id: I66b437e7a5bc09ff1c39034d81227e9afcef3150
Signed-off-by: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
This commit is contained in:
Erickson Silva de Oliveira
2025-12-16 09:18:25 -03:00
parent 5e5cc9e829
commit 8982812508
9 changed files with 57 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files
helm-charts/upstream/platform-helm/debian/all/deb_folder/patches/0002-ceph-csi-cephfs-add-default-fields-to-values.yaml.patch
+9 -14
View File
@@ -1,18 +1,19 @@
From d37f39b7d2c2f34272a2f23bdbf5d97131286054 Mon Sep 17 00:00:00 2001
From: Heitor Farhat <heitor.farhat@windriver.com>
Date: Tue, 2 Sep 2025 10:06:49 -0300
From b4a5b8ddfb1b16d8290a4fe2429c59a40de5e0bd Mon Sep 17 00:00:00 2001
From: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
Date: Thu, 27 Nov 2025 16:29:35 -0300
Subject: [PATCH] ceph-csi-cephfs: add default fields to values.yaml
This patch adds fields and values necessary for the proper use
of the cephfs chart in the system.
Signed-off-by: Heitor Farhat <heitor.farhat@windriver.com>
Signed-off-by: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
---
charts/ceph-csi-cephfs/values.yaml | 43 ++++++++++++++++++++++++++++--
1 file changed, 41 insertions(+), 2 deletions(-)
charts/ceph-csi-cephfs/values.yaml | 37 ++++++++++++++++++++++++++++--
1 file changed, 35 insertions(+), 2 deletions(-)
diff --git a/charts/ceph-csi-cephfs/values.yaml b/charts/ceph-csi-cephfs/values.yaml
index 9174ee7..69b11c8 100644
index 9174ee7..82249c2 100644
--- a/charts/ceph-csi-cephfs/values.yaml
+++ b/charts/ceph-csi-cephfs/values.yaml
@@ -307,10 +307,10 @@ provisioner:
@@ -28,7 +29,7 @@ index 9174ee7..69b11c8 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
@@ -392,6 +392,27 @@ storageClass:
@@ -392,6 +392,21 @@ storageClass:
# mountOptions:
# - discard
@@ -44,19 +45,13 @@ index 9174ee7..69b11c8 100644
+ crush_rule_name: storage_tier_ruleset
+ # Pool chunk size / PG_NUM
+ chunk_size: 8
+ # Additional namespace to allow storage class access (other than where
+ # installed)
+ additionalNamespaces:
+ - default
+ - kube-public
+ # Ceph pools name
+ metadata_pool: kube-cephfs-metadata
+
+
volumeSnapshotClass:
# Specifies whether the VolumeSnapshotClass should be created
create: false
@@ -511,6 +532,24 @@ externallyManagedConfigmap: false
@@ -511,6 +526,24 @@ externallyManagedConfigmap: false
cephConfConfigMapName: ceph-config
# Name of the configmap used for encryption kms configuration
kmsConfigMapName: ceph-csi-encryption-kms-config
helm-charts/upstream/platform-helm/debian/all/deb_folder/patches/0003-ceph-csi-cephfs-add-storage-init.yaml.patch
+7 -57
View File
@@ -1,23 +1,23 @@
From b0f74d567f5004058564f24261eed00207af023c Mon Sep 17 00:00:00 2001
From d29975e7ebb5e2e28cdd986382295a47b09910d4 Mon Sep 17 00:00:00 2001
From: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
Date: Thu, 27 Feb 2025 20:21:59 -0300
Date: Thu, 27 Nov 2025 16:30:41 -0300
Subject: [PATCH] ceph-csi-cephfs: add storage-init.yaml
Signed-off-by: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
---
.../templates/storage-init.yaml | 396 ++++++++++++++++++
1 file changed, 396 insertions(+)
.../templates/storage-init.yaml | 346 ++++++++++++++++++
1 file changed, 346 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 0000000..9538cf5
index 0000000..35f69aa
--- /dev/null
+++ b/charts/ceph-csi-cephfs/templates/storage-init.yaml
@@ -0,0 +1,396 @@
@@ -0,0 +1,346 @@
+{{/*
+#
+# Copyright (c) 2020-2024 Wind River Systems, Inc.
+# Copyright (c) 2020-2025 Wind River Systems, Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
@@ -235,56 +235,8 @@ index 0000000..9538cf5
+ else
+ echo "Secret ${CEPH_USER_SECRET} for namespace ${NAMESPACE} already exists"
+ fi
+
+ echo -e "\n================================================="
+ echo "Creating secrets for additional namespaces"
+ echo "================================================="
+ # Support creating namespaces and Ceph user secrets for additional
+ # namespaces other than that which the provisioner is installed. This
+ # allows the provisioner to set up and provide PVs for multiple
+ # applications across many namespaces.
+ if [ -n "${ADDITIONAL_NAMESPACES}" ]; then
+ for ns in $(
+ IFS=,
+ echo ${ADDITIONAL_NAMESPACES}
+ ); do
+ kubectl get namespace "${ns}" &>/dev/null
+ if [ $? -ne 0 ]; then
+ kubectl create namespace "${ns}"
+ RETURN_CODE=$?
+ if [ ${RETURN_CODE} -ne 0 ]; then
+ echo "Error creating namespace ${ns} but continuing anyway (return code: ${RETURN_CODE})"
+ continue
+ fi
+ fi
+
+ # check if the secret exists or is an old pattern, if not create a new one.
+ kubectl describe secret -n "${ns}" "${CEPH_USER_SECRET}" 2>/dev/null | grep -qE "^userID"
+ if [ $? -ne 0 ]; then
+ kubectl get secret -n "${ns}" "${CEPH_USER_SECRET}" &>/dev/null
+ if [ $? -eq 0 ]; then
+ echo "- Deleting old ${CEPH_USER_SECRET} secret for namespace ${ns}:"
+ kubectl delete secret -n "${ns}" "${CEPH_USER_SECRET}"
+ RETURN_CODE=$?
+ if [ ${RETURN_CODE} -ne 0 ]; then
+ echo "Error deleting secret ${CEPH_USER_SECRET} for namespace ${ns} (return code: ${RETURN_CODE})"
+ exit ${RETURN_CODE}
+ fi
+ fi
+ echo "- Creating secret ${CEPH_USER_SECRET} for namespace ${ns}:"
+ kubectl create secret generic -n "${ns}" "${CEPH_USER_SECRET}" --type="kubernetes.io/cephfs" --from-literal=userKey="${KEYRING}" --from-literal=userID="${USER_ID}" --from-literal=adminKey="${KEYRING}" --from-literal=adminID="${ADMIN_ID}"
+ RETURN_CODE=$?
+ if [ ${RETURN_CODE} -ne 0 ]; then
+ echo "Error creating secret ${CEPH_USER_SECRET} for namespace ${ns} but continuing anyway (return code: ${RETURN_CODE})"
+ fi
+ else
+ echo "Secret ${CEPH_USER_SECRET} for namespace ${ns} already exists"
+ fi
+ done
+ fi
+ fi
+
+
+ echo -e "\n================================================="
+ echo "Setting pool configuration"
+ echo "================================================="
@@ -374,8 +326,6 @@ index 0000000..9538cf5
+ env:
+ - name: NAMESPACE
+ value: {{ $.Values.classdefaults.cephFSNamespace }}
+ - name: ADDITIONAL_NAMESPACES
+ value: {{ join "," $sc.additionalNamespaces | quote }}
+ - name: CEPH_USER_SECRET
+ value: {{ $sc.userSecretName }}
+ - name: USER_ID
helm-charts/upstream/platform-helm/debian/all/deb_folder/patches/0007-ceph-csi-rbd-add-default-fields-to-values.yaml.patch
+9 -13
View File
@@ -1,18 +1,19 @@
From 0db2bdf58f2d614a1240e9592b77524dad73e598 Mon Sep 17 00:00:00 2001
From: Heitor Farhat <heitor.farhat@windriver.com>
Date: Tue, 2 Sep 2025 10:42:36 -0300
From 9c182af656810c748605f004da8451f5f6c2dfce Mon Sep 17 00:00:00 2001
From: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
Date: Thu, 27 Nov 2025 16:31:05 -0300
Subject: [PATCH] ceph-csi-rbd: add default fields to values.yaml
This patch adds fields and values necessary for the proper use
of the rbd chart in the system.
Signed-off-by: Heitor Farhat <heitor.farhat@windriver.com>
Signed-off-by: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
---
charts/ceph-csi-rbd/values.yaml | 42 +++++++++++++++++++++++++++++++--
1 file changed, 40 insertions(+), 2 deletions(-)
charts/ceph-csi-rbd/values.yaml | 37 +++++++++++++++++++++++++++++++--
1 file changed, 35 insertions(+), 2 deletions(-)
diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml
index 2593b97..1fb94a9 100644
index 2593b97..2147ac6 100644
--- a/charts/ceph-csi-rbd/values.yaml
+++ b/charts/ceph-csi-rbd/values.yaml
@@ -337,10 +337,10 @@ topology:
@@ -28,7 +29,7 @@ index 2593b97..1fb94a9 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
@@ -526,6 +526,24 @@ storageClass:
@@ -526,6 +526,19 @@ storageClass:
# mountOptions:
# - discard
@@ -44,16 +45,11 @@ index 2593b97..1fb94a9 100644
+ crush_rule_name: storage_tier_ruleset
+ # Pool chunk size / PG_NUM
+ chunk_size: 8
+ # Additional namespace to allow storage class access (other than where
+ # installed)
+ additionalNamespaces:
+ - default
+ - kube-public
+
volumeSnapshotClass:
# Specifies whether the VolumeSnapshotClass should be created
create: false
@@ -650,6 +668,26 @@ externallyManagedConfigmap: false
@@ -650,6 +663,26 @@ externallyManagedConfigmap: false
cephConfConfigMapName: ceph-config
# Name of the configmap used for encryption kms configuration
kmsConfigMapName: ceph-csi-encryption-kms-config
helm-charts/upstream/platform-helm/debian/all/deb_folder/patches/0008-ceph-csi-rbd-add-storage-init.yaml.patch
+7 -53
View File
@@ -1,23 +1,23 @@
From e3f7a30bdc7a46657dabb64dc3914c20220d183f Mon Sep 17 00:00:00 2001
From a4f5fa52509bfc15a48a9f1edb615058060508c7 Mon Sep 17 00:00:00 2001
From: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
Date: Thu, 27 Feb 2025 20:23:37 -0300
Date: Thu, 27 Nov 2025 16:32:31 -0300
Subject: [PATCH] ceph-csi-rbd: add storage-init.yaml
Signed-off-by: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
---
.../ceph-csi-rbd/templates/storage-init.yaml | 404 ++++++++++++++++++
1 file changed, 404 insertions(+)
.../ceph-csi-rbd/templates/storage-init.yaml | 358 ++++++++++++++++++
1 file changed, 358 insertions(+)
create mode 100644 charts/ceph-csi-rbd/templates/storage-init.yaml
diff --git a/charts/ceph-csi-rbd/templates/storage-init.yaml b/charts/ceph-csi-rbd/templates/storage-init.yaml
new file mode 100644
index 0000000..cd91bfe
index 0000000..144b3d5
--- /dev/null
+++ b/charts/ceph-csi-rbd/templates/storage-init.yaml
@@ -0,0 +1,404 @@
@@ -0,0 +1,358 @@
+{{/*
+#
+# Copyright (c) 2020-2023 Wind River Systems, Inc.
+# Copyright (c) 2020-2023,2025 Wind River Systems, Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
@@ -269,50 +269,6 @@ index 0000000..cd91bfe
+ else
+ echo "Secret ${CEPH_USER_SECRET} for namespace ${NAMESPACE} already exists"
+ fi
+
+ echo -e "\n================================================="
+ echo "Creating secrets for additional namespaces"
+ echo "================================================="
+ # Support creating namespaces and Ceph user secrets for additional
+ # namespaces other than that which the provisioner is installed. This
+ # allows the provisioner to set up and provide PVs for multiple
+ # applications across many namespaces.
+ if [ -n "${ADDITIONAL_NAMESPACES}" ]; then
+ for ns in $(IFS=,; echo ${ADDITIONAL_NAMESPACES}); do
+ kubectl get namespace "${ns}" &>/dev/null
+ if [ $? -ne 0 ]; then
+ kubectl create namespace "${ns}"
+ RETURN_CODE=$?
+ if [ ${RETURN_CODE} -ne 0 ]; then
+ echo "Error creating namespace ${ns} but continuing anyway (return code: ${RETURN_CODE})"
+ continue
+ fi
+ fi
+
+ # check if the secret exists or is an old pattern, if not create a new one.
+ kubectl describe secret -n "${ns}" "${CEPH_USER_SECRET}" 2>/dev/null | grep -qE "^userID"
+ if [ $? -ne 0 ]; then
+ kubectl get secret -n "${ns}" "${CEPH_USER_SECRET}" &>/dev/null
+ if [ $? -eq 0 ]; then
+ echo "- Deleting old ${CEPH_USER_SECRET} secret for namespace ${ns}:"
+ kubectl delete secret -n "${ns}" "${CEPH_USER_SECRET}"
+ RETURN_CODE=$?
+ if [ ${RETURN_CODE} -ne 0 ]; then
+ echo "Error deleting secret ${CEPH_USER_SECRET} for namespace ${ns} (return code: ${RETURN_CODE})"
+ exit ${RETURN_CODE}
+ fi
+ fi
+ echo "- Creating secret ${CEPH_USER_SECRET} for namespace ${ns}:"
+ kubectl create secret generic -n "${ns}" "${CEPH_USER_SECRET}" --type="kubernetes.io/rbd" --from-literal=userKey="${KEYRING}" --from-literal=userID="${USER_ID}"
+ RETURN_CODE=$?
+ if [ ${RETURN_CODE} -ne 0 ]; then
+ echo "Error creating secret ${CEPH_USER_SECRET} for namespace ${ns} but continuing anyway (return code: ${RETURN_CODE})"
+ fi
+ else
+ echo "Secret ${CEPH_USER_SECRET} for namespace ${ns} already exists"
+ fi
+ done
+ fi
+ fi
+
+ if [ -n "${USER_ID}" ]; then
@@ -385,8 +341,6 @@ index 0000000..cd91bfe
+ env:
+ - name: NAMESPACE
+ value: {{ $.Release.Namespace }}
+ - name: ADDITIONAL_NAMESPACES
+ value: {{ join "," $sc.additionalNamespaces | quote }}
+ - name: CEPH_ADMIN_SECRET
+ value: {{ $.Values.classdefaults.adminSecretName }}
+ - name: CEPH_USER_SECRET
helm-charts/upstream/platform-helm/debian/all/deb_folder/patches/0014-ceph-csi-cephfs-fix-snapshotclass-names.patch
+10 -10
View File
@@ -1,6 +1,6 @@
From 3501d2231e1ceffa7a4e1cc3cfaaa2836b3fa87d Mon Sep 17 00:00:00 2001
From: Heitor Farhat <heitor.farhat@windriver.com>
Date: Thu, 4 Sep 2025 11:05:33 -0300
From 756415cca036cc140b4696127e061bc4f1945b6a Mon Sep 17 00:00:00 2001
From: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
Date: Thu, 27 Nov 2025 16:34:46 -0300
Subject: [PATCH] ceph-csi-cephfs: fix snapshotclass names
In cephcsi 3.15.0 the snapshotclass.yaml file already exists
@@ -10,13 +10,14 @@ We need to fix those names for backwards compatibility
on upgrade and rollback.
Signed-off-by: Heitor Farhat <heitor.farhat@windriver.com>
Signed-off-by: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
---
.../templates/snapshotclass.yaml | 22 +++++++++----------
charts/ceph-csi-cephfs/values.yaml | 7 +++---
2 files changed, 14 insertions(+), 15 deletions(-)
charts/ceph-csi-cephfs/values.yaml | 6 ++---
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/charts/ceph-csi-cephfs/templates/snapshotclass.yaml b/charts/ceph-csi-cephfs/templates/snapshotclass.yaml
index e603397..65cd33b 100644
index e603397..6ea6ca4 100644
--- a/charts/ceph-csi-cephfs/templates/snapshotclass.yaml
+++ b/charts/ceph-csi-cephfs/templates/snapshotclass.yaml
@@ -1,11 +1,11 @@
@@ -59,20 +60,19 @@ index e603397..65cd33b 100644
+deletionPolicy: {{ .Values.snapshotClass.deletionPolicy }}
{{- end -}}
diff --git a/charts/ceph-csi-cephfs/values.yaml b/charts/ceph-csi-cephfs/values.yaml
index 25059f4..f1c3bc8 100644
index 82249c2..8675bfc 100644
--- a/charts/ceph-csi-cephfs/values.yaml
+++ b/charts/ceph-csi-cephfs/values.yaml
@@ -416,8 +416,7 @@ storageClass:
@@ -407,7 +407,7 @@ storageClass:
# Ceph pools name
metadata_pool: kube-cephfs-metadata
-
-volumeSnapshotClass:
+snapshotClass:
# Specifies whether the VolumeSnapshotClass should be created
create: false
name: csi-cephfsplugin-snapclass
@@ -443,10 +442,10 @@ volumeSnapshotClass:
@@ -433,10 +433,10 @@ volumeSnapshotClass:
snapshotNamePrefix: ""
# The secrets have to contain user and/or Ceph admin credentials.
helm-charts/upstream/platform-helm/debian/all/deb_folder/patches/0015-ceph-csi-rbd-fix-snapshotclass-names.patch
+10 -9
View File
@@ -1,6 +1,6 @@
From 9dd14b53a9250bec70cf7f961b7a3979df204e79 Mon Sep 17 00:00:00 2001
From: Heitor Farhat <heitor.farhat@windriver.com>
Date: Thu, 4 Sep 2025 11:16:27 -0300
From 88fe7e27ae5999e7cfbdebc4704416189b47d0b9 Mon Sep 17 00:00:00 2001
From: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
Date: Thu, 27 Nov 2025 16:36:47 -0300
Subject: [PATCH] ceph-csi-rbd: fix snapshotclass names
In cephcsi 3.15.0 the snapshotclass.yaml file already exists
@@ -10,13 +10,14 @@ We need to fix those names for backwards compatibility
on upgrade and rollback.
Signed-off-by: Heitor Farhat <heitor.farhat@windriver.com>
Signed-off-by: Erickson Silva de Oliveira <Erickson.SilvadeOliveira@windriver.com>
---
.../ceph-csi-rbd/templates/snapshotclass.yaml | 22 +++++++++----------
charts/ceph-csi-rbd/values.yaml | 6 ++---
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/charts/ceph-csi-rbd/templates/snapshotclass.yaml b/charts/ceph-csi-rbd/templates/snapshotclass.yaml
index 4456b0e..7d176e9 100644
index 4456b0e..c168f11 100644
--- a/charts/ceph-csi-rbd/templates/snapshotclass.yaml
+++ b/charts/ceph-csi-rbd/templates/snapshotclass.yaml
@@ -1,11 +1,11 @@
@@ -59,19 +60,19 @@ index 4456b0e..7d176e9 100644
+deletionPolicy: {{ .Values.snapshotClass.deletionPolicy }}
{{- end -}}
diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml
index 5ed1af9..22a8a3f 100644
index 2147ac6..4c765ea 100644
--- a/charts/ceph-csi-rbd/values.yaml
+++ b/charts/ceph-csi-rbd/values.yaml
@@ -548,7 +548,7 @@ storageClass:
- default
- kube-public
@@ -539,7 +539,7 @@ storageClass:
# Pool chunk size / PG_NUM
chunk_size: 8
-volumeSnapshotClass:
+snapshotClass:
# Specifies whether the VolumeSnapshotClass should be created
create: false
name: csi-rbdplugin-snapclass
@@ -574,10 +574,10 @@ volumeSnapshotClass:
@@ -565,10 +565,10 @@ volumeSnapshotClass:
snapshotNamePrefix: ""
# The secrets have to contain user and/or Ceph admin credentials.
python3-k8sapp-platform/k8sapp_platform/k8sapp_platform/helm/ceph_fs_provisioner.py
+1 -2
View File
@@ -1,5 +1,5 @@
#
# Copyright (c) 2020-2025 Wind River Systems, Inc.
# Copyright (c) 2020-2026 Wind River Systems, Inc.
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -178,7 +178,6 @@ class CephFSProvisionerHelm(base.FluxCDBaseHelm):
"replication": int(bk.capabilities.get("replication")),
"min_replication": int(bk.capabilities.get("min_replication")),
"crush_rule_name": rule_name,
"additionalNamespaces": ['default', 'kube-public']
}
storage_classes.append(storage_class)
python3-k8sapp-platform/k8sapp_platform/k8sapp_platform/helm/rbd_provisioner.py
+1 -2
View File
@@ -1,5 +1,5 @@
#
# Copyright (c) 2020-2025 Wind River Systems, Inc.
# Copyright (c) 2020-2026 Wind River Systems, Inc.
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -92,7 +92,6 @@ class RbdProvisionerHelm(base.FluxCDBaseHelm):
"replication": int(bk.capabilities.get("replication")),
"min_replication": int(bk.capabilities.get("min_replication")),
"crush_rule_name": rule_name,
"additionalNamespaces": ['default', 'kube-public']
}
storage_classes.append(storage_class)
python3-k8sapp-platform/k8sapp_platform/k8sapp_platform/lifecycle/lifecycle_platform.py
+3 -12
View File
@@ -1,5 +1,5 @@
#
# Copyright (c) 2021-2025 Wind River Systems, Inc.
# Copyright (c) 2021-2026 Wind River Systems, Inc.
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -50,17 +50,6 @@ class PlatformAppLifecycleOperator(base.AppLifecycleOperator):
hook_info.relative_timing == LifecycleConstants.APP_LIFECYCLE_TIMING_PRE:
return self.pre_apply_check(app_op, conductor_obj)
# Rbd
elif hook_info.lifecycle_type == LifecycleConstants.APP_LIFECYCLE_TYPE_RBD:
if hook_info.operation == constants.APP_APPLY_OP and \
hook_info.relative_timing == LifecycleConstants.APP_LIFECYCLE_TIMING_PRE:
return lifecycle_utils.create_rbd_provisioner_secrets(app_op, app, hook_info)
elif hook_info.operation == constants.APP_REMOVE_OP and \
hook_info.relative_timing == LifecycleConstants.APP_LIFECYCLE_TIMING_POST:
return lifecycle_utils.delete_rbd_provisioner_secrets(app_op, app, hook_info)
elif hook_info.operation == constants.APP_RECOVER_OP:
return self.delete_csi_drivers(app)
# Resources
elif hook_info.lifecycle_type == LifecycleConstants.APP_LIFECYCLE_TYPE_RESOURCE:
if hook_info.operation == constants.APP_APPLY_OP and \
@@ -75,6 +64,8 @@ class PlatformAppLifecycleOperator(base.AppLifecycleOperator):
elif hook_info.operation == constants.APP_DOWNGRADE_OP and \
hook_info.relative_timing == LifecycleConstants.APP_LIFECYCLE_TIMING_PRE:
return self.pre_downgrade(app, hook_info)
elif hook_info.operation == constants.APP_RECOVER_OP:
return self.delete_csi_drivers(app)
# Use the default behaviour for other hooks
super(PlatformAppLifecycleOperator, self).app_lifecycle_actions(context, conductor_obj, app_op, app, hook_info)