chore(module): do not create secrets in a terminating namespace (#394)

Change pod label folow to "app.kubernetes.io/managed-by": "cdi-controller-internal-virtualization" Fix kind of namespace snapshot --------- Signed-off-by: Nikita korolev <nikita.korolev@flant.com>
deckhouse · Sep 25, 2024 · 6681991 · 6681991
1 parent 536f82d
commit 6681991
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/hooks/lib/hooks/manage_tenant_secrets.py b/hooks/lib/hooks/manage_tenant_secrets.py
@@ -77,7 +77,7 @@ def generate_config(self) -> dict:
                 {
                     "name": self.NAMESPACE_SNAPSHOT_NAME,
                     "apiVersion": "v1",
-                    "kind": "Secret",
+                    "kind": "Namespace",
                     "includeSnapshotsFrom": [
                         self.POD_SNAPSHOT_NAME,
                         self.SECRETS_SNAPSHOT_NAME,
@@ -86,7 +86,7 @@ def generate_config(self) -> dict:
                     "jqFilter": '{"name": .metadata.name, "isTerminating": any(.metadata; .deletionTimestamp != null)}',
                     "queue": self.queue,
                     "keepFullObjectsInMemory": False
-                }
+                },
             ]
         }
 
@@ -111,7 +111,9 @@ def r(ctx: hook.Context) -> None:
             for ns in ctx.snapshots.get(self.NAMESPACE_SNAPSHOT_NAME, []):
                 if ns["filterResult"]["isTerminating"]:
                     pod_namespaces.discard(ns["filterResult"]["name"])
+
             data, secret_type, secrets_by_ns = "", "", {}
+
             for s in secrets:
                 if s["filterResult"]["namespace"] == self.source_namespace:
                     data = s["filterResult"]["data"]

diff --git a/hooks/manage_tenant_secrets_for_cdi.py b/hooks/manage_tenant_secrets_for_cdi.py
@@ -25,7 +25,7 @@ def main():
                                    module_name=common.MODULE_NAME,
                                    pod_labels_to_follow={
                                        "app": "containerized-data-importer",
-                                       "app.kubernetes.io/managed-by": "cdi-controller"
+                                       "app.kubernetes.io/managed-by": "cdi-controller-internal-virtualization"
                                    },
                                    destination_secret_labels={
                                        "heritage": "deckhouse",