julian/scale-catalog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #269 from truecharts/hotpatch

Browse Source 
feat: Add 22.12 Hot Patch 2
This commit is contained in:
Kjeld Schouten-Lebbing 2022-12-26 19:19:06 +01:00 committed by GitHub
commit 81e29fd4db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hotpatch/2212/HP2.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git plugins/kubernetes_linux/backup.py plugins/kubernetes_linux/backup.py
index d8a48d45f89..365cd1718b4 100644
--- plugins/kubernetes_linux/backup.py
+++ plugins/kubernetes_linux/backup.py
@@ -61,7 +61,8 @@ def backup_chart_releases(self, job, backup_name):
['metadata.namespace', '=', chart_release['namespace']]
]
)
- 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(secrets, key=lambda d: d['metadata']['name'] and d.get('data')):
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))

2
includes/patch.sh
View File

@ -3,6 +3,8 @@
patchv22120(){
echo "Applying 22.12 HotPatch 1"
( wget -q -P /tmp https://github.com/truecharts/truetool/raw/main/hotpatch/2212/HP1.patch && echo "download completed" || echo "download failed" ) && ( patch -N -s -p0 -d /usr/lib/python3/dist-packages/middlewared/ < /tmp/HP1.patch && service middlewared restart && echo "waiting 20 seconds for middleware restart..." && sleep 20 && echo "patch completed" || echo "patch failed or skipped, not critical" ) && rm -rf /tmp/HP1.patch
echo "Applying 22.12 HotPatch 2"
( wget -q -P /tmp https://github.com/truecharts/truetool/raw/main/hotpatch/2212/HP2.patch && echo "download completed" || echo "download failed" ) && ( patch -N -s -p0 -d /usr/lib/python3/dist-packages/middlewared/ < /tmp/HP2.patch && service middlewared restart && echo "waiting 20 seconds for middleware restart..." && sleep 20 && echo "patch completed" || echo "patch failed or skipped, not critical" ) && rm -rf /tmp/HP2.patch
}
export -f patchv22120