From c48acc8d1600d7d12794105f1fc2cffe458c6279 Mon Sep 17 00:00:00 2001 From: Kjeld Schouten-Lebbing Date: Tue, 27 Dec 2022 11:37:54 +0100 Subject: [PATCH] fix the second hotpatch --- hotpatch/2212/HP2.patch | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/hotpatch/2212/HP2.patch b/hotpatch/2212/HP2.patch index ccb75456..30357c93 100644 --- a/hotpatch/2212/HP2.patch +++ b/hotpatch/2212/HP2.patch @@ -1,13 +1,14 @@ diff --git plugins/kubernetes_linux/backup.py plugins/kubernetes_linux/backup.py index 365cd1718b4..1046a64c2a5 100644 +index d8a48d45f89..365cd1718b4 100644 --- plugins/kubernetes_linux/backup.py +++ plugins/kubernetes_linux/backup.py -@@ -62,7 +62,7 @@ def backup_chart_releases(self, job, backup_name): +@@ -61,7 +61,8 @@ def backup_chart_releases(self, job, backup_name): + ['metadata.namespace', '=', chart_release['namespace']] ] ) - # We ignore this keeping in line with helm behaviour where the secret malformed is ignored by helm -- for secret in sorted(secrets, key=lambda d: d['metadata']['name'] and d.get('data')): +- for secret in sorted(secrets, key=lambda d: d['metadata']['name']): ++ # We ignore this keeping in line with helm behaviour where the secret malformed is ignored by helm + for secret in sorted(filter(lambda d: d.get('data'), secrets), key=lambda d: d['metadata']['name']): with open(os.path.join(secrets_dir, secret['metadata']['name']), 'w') as f: f.write(self.middleware.call_sync('k8s.secret.export_to_yaml_internal', secret)) -