use encode_text

bin/cloud-init

@@ -428,7 +428,7 @@ def atomic_write_json(path, data):
     try:
         tf = tempfile.NamedTemporaryFile(dir=os.path.dirname(path),
                                          delete=False)
-        tf.write((json.dumps(data, indent=1) + "\n").encode())
+        tf.write(util.encode_text(json.dumps(data, indent=1) + "\n"))
         tf.close()
         os.rename(tf.name, path)
     except Exception as e:

cloudinit/config/cc_bootcmd.py

@@ -36,7 +36,7 @@ def handle(name, cfg, cloud, log, _args):
     with util.ExtendedTemporaryFile(suffix=".sh") as tmpf:
         try:
             content = util.shellify(cfg["bootcmd"])
-            tmpf.write(content)
+            tmpf.write(util.encode_text(content))
             tmpf.flush()
         except:
             util.logexc(log, "Failed to shellify bootcmd")