Skip to content

Commit 04f0e53

Browse files
authored
Merge branch 'master' into add_missing_revision_params_in_bundle_add_charms
2 parents c8648b1 + 2c30901 commit 04f0e53

1 file changed

Lines changed: 9 additions & 2 deletions

File tree

juju/client/proxy/kubernetes/proxy.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
# Copyright 2023 Canonical Ltd.
22
# Licensed under the Apache V2, see LICENCE file for details.
3-
3+
import os
44
import tempfile
5+
import logging
56

67
from juju.client.proxy.proxy import Proxy, ProxyNotConnectedError
78
from kubernetes import client
89
from kubernetes.stream import portforward
910

11+
log = logging.getLogger('juju.client.connection')
12+
1013

1114
class KubernetesProxy(Proxy):
1215
def __init__(
@@ -33,7 +36,7 @@ def __init__(
3336
raise ValueError("Invalid port number: {}".format(remote_port))
3437

3538
if ca_cert:
36-
self.temp_ca_file = tempfile.NamedTemporaryFile()
39+
self.temp_ca_file = tempfile.NamedTemporaryFile(delete=False)
3740
self.temp_ca_file.write(bytes(ca_cert, 'utf-8'))
3841
self.temp_ca_file.flush()
3942
config.ssl_ca_cert = self.temp_ca_file.name
@@ -60,6 +63,10 @@ def connect(self):
6063

6164
def __del__(self):
6265
self.close()
66+
try:
67+
os.unlink(self.temp_ca_file.name)
68+
except FileNotFoundError:
69+
log.debug(f"file {self.temp_ca_file.name} not found")
6370

6471
def close(self):
6572
try:

0 commit comments

Comments
 (0)