Continue to label manifests

charmed-kubernetes · Mar 1, 2025 · 1a54ea8 · 1a54ea8
1 parent 6d8fe47
commit 1a54ea8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/manifests_base.py b/src/manifests_base.py
@@ -266,7 +266,7 @@ def adjust_container_specs(self, obj: AnyResource) -> None:
 
         for c in obj.spec.template.spec.containers:
             for idx in range(len(c.args)):
-                if original_dn in c.args[idx]:
+                if original_dn in c.args[idx] and updated_dn not in c.args[idx]:
                     c.args[idx] = c.args[idx].replace(original_dn, updated_dn)
                 if "/var/lib/kubelet" in c.args[idx]:
                     c.args[idx] = c.args[idx].replace("/var/lib/kubelet", kubelet_dir)

diff --git a/src/manifests_cephfs.py b/src/manifests_cephfs.py
@@ -9,7 +9,7 @@
 from lightkube.codecs import AnyResource
 from lightkube.resources.core_v1 import Secret
 from lightkube.resources.storage_v1 import StorageClass
-from ops.manifests import Addition, ConfigRegistry
+from ops.manifests import Addition, ConfigRegistry, ManifestLabel
 from ops.manifests.manipulations import Subtraction
 
 from manifests_base import (
@@ -252,6 +252,7 @@ def __init__(self, charm: "CephCsiCharm"):
                 ConfigureLivenessPrometheus(
                     self, "Service", "csi-metrics-cephfsplugin", "cephfsplugin"
                 ),
+                ManifestLabel(self),
             ],
         )
         self.charm = charm

diff --git a/src/manifests_rbd.py b/src/manifests_rbd.py
@@ -8,7 +8,7 @@
 from lightkube.codecs import AnyResource
 from lightkube.resources.core_v1 import Secret
 from lightkube.resources.storage_v1 import StorageClass
-from ops.manifests import Addition, ConfigRegistry
+from ops.manifests import Addition, ConfigRegistry, ManifestLabel
 
 from manifests_base import (
     AdjustNamespace,
@@ -134,8 +134,8 @@ def __init__(self, charm: "CephCsiCharm"):
                 CephStorageClass(self, "ceph-xfs"),  # creates ceph-xfs
                 CephStorageClass(self, "ceph-ext4"),  # creates ceph-ext4
                 RbacAdjustments(self),
-                AdjustNamespace(self),
                 CSIDriverAdjustments(self, self.DRIVER_NAME),
+                AdjustNamespace(self),
                 ConfigureLivenessPrometheus(
                     self, "Deployment", "csi-rbdplugin-provisioner", "rbdplugin-provisioner"
                 ),
@@ -144,6 +144,7 @@ def __init__(self, charm: "CephCsiCharm"):
                 ),
                 ConfigureLivenessPrometheus(self, "DaemonSet", "csi-rbdplugin", "rbdplugin"),
                 ConfigureLivenessPrometheus(self, "Service", "csi-metrics-rbdplugin", "rbdplugin"),
+                ManifestLabel(self),
             ],
         )
         self.charm = charm