sshkube 0.2.4__tar.gz → 0.3.0__tar.gz

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

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

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

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

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

@@ -60,6 +60,16 @@ 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, *, netloc, pid, port):
@@ -168,7 +178,10 @@ def start_server(*, server, force):
 def _start_server(*, server, force):
   pid = PidFile.read()
   if pid:
-    if pid.netloc != server or 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
@@ -187,6 +200,8 @@ 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)
+    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()
@@ -262,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: