Merge "Fix py3 amphora-agent cert-rotation type bug" into stable/stein

This commit is contained in:
Zuul 2020-06-11 18:25:46 +00:00 committed by Gerrit Code Review
commit 174a34c74b
2 changed files with 12 additions and 1 deletions

View File

@ -30,7 +30,7 @@ def upload_server_cert():
flags = os.O_WRONLY | os.O_CREAT | os.O_TRUNC flags = os.O_WRONLY | os.O_CREAT | os.O_TRUNC
# mode 00600 # mode 00600
mode = stat.S_IRUSR | stat.S_IWUSR mode = stat.S_IRUSR | stat.S_IWUSR
with os.fdopen(os.open(file_path, flags, mode), 'w') as crt_file: with os.fdopen(os.open(file_path, flags, mode), 'wb') as crt_file:
b = stream.read(BUFFER) b = stream.read(BUFFER)
while b: while b:
crt_file.write(b) crt_file.write(b)

View File

@ -0,0 +1,11 @@
---
upgrade:
- |
Any amphorae running a py3 based image must be recycled or else they will
eventually fail on certificate rotation.
fixes:
- |
Resolved broken certificate upload on py3 based amphora images. On a
housekeeping certificate rotation event, the amphora would clear out its
server certificate and return a 500, putting the amphora in ERROR status
and breaking further communication. See upgrade notes.