fix: linters

Signed-off-by: Tadas Sutkaitis <[email protected]>

Author: fitbeard

magnum_cluster_api/helm.py

@@ -112,7 +112,9 @@ def __call__(self):
 class TemplateReleaseCommand(ReleaseCommand):
     COMMAND = ["template"]
 
-    def __init__(self, namespace, release_name, chart_ref, values={}, include_crds=True):
+    def __init__(
+        self, namespace, release_name, chart_ref, values={}, include_crds=True
+    ):
         super().__init__(namespace, release_name)
         self.chart_ref = chart_ref
         self.values = values
@@ -140,10 +142,11 @@ def __call__(self, *helm_args, repository=None, replacements=[]):
             #              until  https://github.com/helm/helm/issues/10737 is fixed.
             for doc in yaml.safe_load_all(data):
                 # NOTE(fitbeard): Skip empty documents that can occur with YAML separators:
-                #                 helm template test . --include-crds --set controller.volumeSnapshotClasses[0].name=test \
+                #                 helm template test . --include-crds \
+                #                 --set controller.volumeSnapshotClasses[0].name=test \
                 #                 --set controller.volumeSnapshotClasses[0].driver=test.driver | head -20
                 #                 ---
-                #                 # Source: snapshot-controller-csi/crds/groupsnapshot.storage.k8s.io_volumegroupsnapshotclasses.yaml
+                #                 # Source: snapshot-controller-csi/crds/xxx.storage.k8s.io_xxxsnapshotclasses.yaml
                 #                 ---
                 #                 apiVersion: apiextensions.k8s.io/v1
                 if doc is None:
@@ -161,7 +164,11 @@ def __call__(self, *helm_args, repository=None, replacements=[]):
                                 container["image"], repository
                             )
 
-                if doc["kind"] not in ("ClusterRole", "ClusterRoleBinding", "CustomResourceDefinition"):
+                if doc["kind"] not in (
+                    "ClusterRole",
+                    "ClusterRoleBinding",
+                    "CustomResourceDefinition",
+                ):
                     doc["metadata"]["namespace"] = self.namespace
                 docs.append(doc)
             return yaml.safe_dump_all(docs, default_flow_style=False)

magnum_cluster_api/resources.py

@@ -365,41 +365,45 @@ def get_object(self) -> dict:
                 }
 
         # Add snapshot controller CSI chart if either Cinder CSI or Manila CSI is enabled
-        if (cinder.is_enabled(self.cluster) or manila.is_enabled(self.cluster)):
-            
+        if cinder.is_enabled(self.cluster) or manila.is_enabled(self.cluster):
+
             # Build volume snapshot classes based on enabled CSI drivers
             volume_snapshot_classes = []
-            
+
             # Add Cinder CSI volume snapshot class if enabled
             if cinder.is_enabled(self.cluster):
-                volume_snapshot_classes.append({
-                    "name": "block-snapshot",
-                    "annotations": {
-                        "snapshot.storage.kubernetes.io/is-default-class": "true"
-                    },
-                    "driver": "cinder.csi.openstack.org",
-                    "deletionPolicy": "Delete"
-                })
-            
+                volume_snapshot_classes.append(
+                    {
+                        "name": "block-snapshot",
+                        "annotations": {
+                            "snapshot.storage.kubernetes.io/is-default-class": "true"
+                        },
+                        "driver": "cinder.csi.openstack.org",
+                        "deletionPolicy": "Delete",
+                    }
+                )
+
             # Add Manila CSI volume snapshot class if enabled
             if manila.is_enabled(self.cluster):
-                volume_snapshot_classes.append({
-                    "name": "share-snapshot",
-                    "annotations": {
-                        "snapshot.storage.kubernetes.io/is-default-class": "true"
-                    },
-                    "driver": "manila.csi.openstack.org",
-                    "deletionPolicy": "Delete"
-                })
+                volume_snapshot_classes.append(
+                    {
+                        "name": "share-snapshot",
+                        "annotations": {
+                            "snapshot.storage.kubernetes.io/is-default-class": "true"
+                        },
+                        "driver": "manila.csi.openstack.org",
+                        "deletionPolicy": "Delete",
+                    }
+                )
 
             controller_values = {
                 "fullnameOverride": "snapshot-controller",
-                "volumeSnapshotClasses": volume_snapshot_classes
+                "volumeSnapshotClasses": volume_snapshot_classes,
             }
 
             # Override image repository if custom registry is configured
             if repository:  # repository is the container_infra_prefix
-                repository_clean = repository.rstrip('/')
+                repository_clean = repository.rstrip("/")
                 # When using a custom registry, the image is named 'csi-snapshot-controller'
                 controller_values["image"] = {
                     "repository": f"{repository_clean}/csi-snapshot-controller"
@@ -418,9 +422,7 @@ def get_object(self) -> dict:
                             ),
                             "snapshot-controller-csi/",
                         ),
-                        values={
-                            "controller": controller_values
-                        },
+                        values={"controller": controller_values},
                     )(repository=repository)
                 },
             }

tools/sync-snapshot-controller-csi-crds

@@ -36,7 +36,12 @@ def main():
     # Set target directory relative to script location
     script_dir = os.path.dirname(os.path.realpath(__file__))
     base_dir = os.path.join(
-        script_dir, "..", "magnum_cluster_api", "charts", "snapshot-controller-csi", "crds"
+        script_dir,
+        "..",
+        "magnum_cluster_api",
+        "charts",
+        "snapshot-controller-csi",
+        "crds",
     )
 
     tag = SNAPSHOT_CONTROLLER_CSI_TAG