Fixup debug ephemeral
This commit is contained in:
parent
b132f553ea
commit
b97c87c6db
1 changed files with 20 additions and 13 deletions
|
|
@ -29,14 +29,17 @@ def slug():
|
||||||
|
|
||||||
|
|
||||||
def get_default_target(namespace, pod):
|
def get_default_target(namespace, pod):
|
||||||
pod = json.loads(
|
kubectl = subprocess.run(
|
||||||
subprocess.run(
|
|
||||||
["kubectl", "get", "pod", "--namespace", namespace, pod, "-o", "json"],
|
["kubectl", "get", "pod", "--namespace", namespace, pod, "-o", "json"],
|
||||||
check=True,
|
stdout=subprocess.PIPE,
|
||||||
capture_output=True,
|
stderr=subprocess.STDOUT,
|
||||||
encoding="utf-8",
|
encoding="utf-8",
|
||||||
).stdout
|
|
||||||
)
|
)
|
||||||
|
if kubectl.returncode != 0:
|
||||||
|
print(f"Unable to find job: {kubectl.stdout}")
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
pod = json.loads(kubectl.stdout)
|
||||||
|
|
||||||
annotation_default = (
|
annotation_default = (
|
||||||
pod.get("metadata", {})
|
pod.get("metadata", {})
|
||||||
|
|
@ -62,14 +65,14 @@ def get_pod_container_state(namespace, pod, container):
|
||||||
statuses = pod.get("status", {}).get("ephemeralContainerStatuses", [])
|
statuses = pod.get("status", {}).get("ephemeralContainerStatuses", [])
|
||||||
for status in statuses:
|
for status in statuses:
|
||||||
if status.get("name", None) != container:
|
if status.get("name", None) != container:
|
||||||
state_keys = list(status.get("state", {"waiting": {}}).keys())
|
state_keys = list(status.get("state", {}).keys())
|
||||||
if len(state_keys) == 0:
|
if len(state_keys) == 0:
|
||||||
return "waiting"
|
return "no keys"
|
||||||
if len(state_keys) > 1:
|
if len(state_keys) > 1:
|
||||||
return "INTERNAL ERROR"
|
return "internal error"
|
||||||
return state_keys[0]
|
return state_keys[0]
|
||||||
|
|
||||||
return None
|
return f"not found in pod {pod}"
|
||||||
|
|
||||||
|
|
||||||
def create_debugger_container(namespace, pod, target, image):
|
def create_debugger_container(namespace, pod, target, image):
|
||||||
|
|
@ -83,7 +86,9 @@ def create_debugger_container(namespace, pod, target, image):
|
||||||
service_line = proxy.stdout.readline().decode("utf-8").strip()
|
service_line = proxy.stdout.readline().decode("utf-8").strip()
|
||||||
PREFIX = "Starting to serve on 127.0.0.1:"
|
PREFIX = "Starting to serve on 127.0.0.1:"
|
||||||
if not service_line.startswith(PREFIX):
|
if not service_line.startswith(PREFIX):
|
||||||
raise Exception("Cannot get the port from the kubectl proxy")
|
print(f"Cannot get the port from the kubectl proxy: {service_line}")
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
port = service_line[len(PREFIX) :]
|
port = service_line[len(PREFIX) :]
|
||||||
|
|
||||||
# Pod must exist, yay!
|
# Pod must exist, yay!
|
||||||
|
|
@ -128,7 +133,8 @@ def create_debugger_container(namespace, pod, target, image):
|
||||||
stderr=subprocess.STDOUT,
|
stderr=subprocess.STDOUT,
|
||||||
)
|
)
|
||||||
if curl.returncode != 0:
|
if curl.returncode != 0:
|
||||||
raise Exception(f"curl failed with code {curl.returncode}:\n{curl.stdout}")
|
print(f"curl failed with code {curl.returncode}: {curl.stdout}")
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
return container_name
|
return container_name
|
||||||
|
|
||||||
|
|
@ -152,6 +158,7 @@ def attach_debugger(namespace, pod, target, image):
|
||||||
# Wait for the dang container to be ready.
|
# Wait for the dang container to be ready.
|
||||||
for i in range(3000):
|
for i in range(3000):
|
||||||
state = get_pod_container_state(namespace, pod, container)
|
state = get_pod_container_state(namespace, pod, container)
|
||||||
|
print(f"{container}: {state}")
|
||||||
if state == "running":
|
if state == "running":
|
||||||
break
|
break
|
||||||
time.sleep(0.100) # 100ms
|
time.sleep(0.100) # 100ms
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue