sshkube 0.2.3__tar.gz → 0.3.0__tar.gz

{sshkube-0.2.3 → sshkube-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: sshkube
-Version: 0.2.3
+Version: 0.3.0
 Summary: Access kubernetes clusters over ssh
 Author: Daniel J. B. Clarke
 Author-email: u8sand@gmail.com

{sshkube-0.2.3 → sshkube-0.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sshkube"
-version = "0.2.3"
+version = "0.3.0"
 description = "Access kubernetes clusters over ssh"
 authors = [
     {name = "Daniel J. B. Clarke",email = "u8sand@gmail.com"}

{sshkube-0.2.3 → sshkube-0.3.0}/sshkube/__main__.py

@@ -60,17 +60,32 @@ def wait_for_port(port, timeout=1, backoff=1, retries=3):
       sock.close()
   raise RuntimeError(f"Proxy server didn't start!")
 
+def kubectl_livez(port, timeout=1):
+  import ssl, urllib.request, urllib.error
+  try:
+    with urllib.request.urlopen(f"https://127.0.0.1:{port}/livez", timeout=timeout, context=ssl._create_unverified_context()) as res:
+      return res.getcode()
+  except urllib.error.HTTPError as e:
+    return e.getcode()
+  except:
+    return 600
+
 class PidFile:
   pidfile = workdir/'pid'
-  def __init__(self, *, pid, port):
+  def __init__(self, *, netloc, pid, port):
+    self.netloc = netloc
     self.pid = pid
     self.port = port
 
   @staticmethod
   def read():
     if PidFile.pidfile.exists():
-      pid, _, port = PidFile.pidfile.read_text().partition(':')
-      pidfile = PidFile(pid=int(pid), port=int(port))
+      pid, _, netloc_port = PidFile.pidfile.read_text().partition(':')
+      netloc, _, port = netloc_port.partition(':')
+      if not _:
+        port = netloc
+        netloc = ''
+      pidfile = PidFile(netloc=netloc, pid=int(pid), port=int(port))
       if pidfile.running:
         return pidfile
       else:
@@ -79,7 +94,7 @@ class PidFile:
   def write(self):
     if PidFile.pidfile.exists(): raise RuntimeError('PID file already exists')
     PidFile.pidfile.parent.mkdir(parents=True, exist_ok=True)
-    PidFile.pidfile.write_text(f"{self.pid}:{self.port}")
+    PidFile.pidfile.write_text(f"{self.pid}:{self.netloc}:{self.port}")
 
   @property
   def running(self):
@@ -163,7 +178,10 @@ def start_server(*, server, force):
 def _start_server(*, server, force):
   pid = PidFile.read()
   if pid:
-    if force:
+    if force or pid.netloc != server:
+      _kill_server()
+    elif kubectl_livez(pid.port) >= 500:
+      # permission denied error is also fine if connection is broken we get a 600
       _kill_server()
     else:
       return
@@ -182,7 +200,9 @@ def _start_server(*, server, force):
   proc = Popen(make_ssh_cmd(server=server, flags=[f"-NL{port}:{k8s_server_parsed.netloc}"]), start_new_session=True)
   try:
     wait_for_port(port)
-    PidFile(pid=proc.pid, port=port).write()
+    if kubectl_livez(port) >= 500:
+      raise click.UsageError('Kubernetes not available')
+    PidFile(netloc=server, pid=proc.pid, port=port).write()
   except RuntimeError as e:
     proc.kill()
     raise click.UsageError('Proxy server failed to start..') from e
@@ -212,11 +232,9 @@ def _init(*, server):
   '''
   Usage: eval "$(sshkube init)"
   '''
+  _start_server(server=server, force=False)
   pid = PidFile.read()
-  if pid is None:
-    _start_server(server=server, force=False)
-    pid = PidFile.read()
-    assert pid is not None
+  assert pid is not None
   #
   if sys.platform == 'win32':
     print(
@@ -243,10 +261,9 @@ def _run(*, server, args):
   Usage: sshkube run kubectl help
   '''
   pid = PidFile.read()
-  if pid is None:
-    _start_server(server=server, force=False)
-    pid = PidFile.read()
-    assert pid is not None
+  _start_server(server=server, force=False)
+  pid = PidFile.read()
+  assert pid is not None
   #
   subprocess.run(args, env=dict(
     os.environ,
@@ -260,11 +277,7 @@ def openssl(*, server, verify):
   _openssl(server=server, verify=verify)
 
 def _openssl(*, server, verify):
-  import shutil
-  socat = shutil.which('socat')
-  if socat:
-    subprocess.run([socat, '-', f"openssl:{server}:443,verify={verify}"])
-  elif sys.platform == 'win32':
+  if sys.platform == 'win32':
     import winloop
     winloop.run(_async_openssl(server=server, verify=verify))
   else: