Skip to content

feat: add support for commands in various exec routines #8406

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
agoose77 merged 1 commit into from
May 27, 2026
Merged

feat: add support for commands in various exec routines #8406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions deployer/dev_commands/exec/aws/aws_app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,15 +158,15 @@ def shell(
)


@aws.command()
@aws.command(context_settings={"allow_extra_args": True})
def sso_shell(
ctx: typer.Context,
profile: str = typer.Argument(..., help="Name of AWS SSO profile to login into"),
account_name: str = typer.Argument(
"",
help="The name of the account under SSO that you want to login into",
),
role: str = typer.Argument("", help="What role to assume"),
cmd: str = typer.Argument("", help="Command to execute inside the shell"),
):
"""
Exec into a shell with appropriate AWS credentials for an account under SSO
Expand Down Expand Up @@ -204,7 +204,7 @@ def needs_sso_login():
# Verify if the cached token has expired
expires_at = datetime.fromisoformat(expires_at_str)
return datetime.now(expires_at.tzinfo) >= expires_at
except:
except Exception:
return True

# Get the access token from th cached file
Expand Down Expand Up @@ -266,8 +266,8 @@ def needs_sso_login():
)

args = [os.environ["SHELL"], "-l"]
if cmd:
args.extend(["-c", "cmd"])
if ctx.args:
args.extend(("-c", " ".join(ctx.args)))

subprocess.check_call(args, env=env)

Expand Down
67 changes: 36 additions & 31 deletions deployer/dev_commands/exec/infra_components.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@
UBUNTU_IMAGE = "ubuntu:22.04"


@exec_app.command()
@exec_app.command(context_settings={"allow_extra_args": True})
def root_homes(
ctx: typer.Context,
cluster_name: str = typer.Argument(..., help="Name of cluster to operate on"),
hub_name: str = typer.Argument(..., help="Name of hub to operate on"),
persist: bool = typer.Option(
Expand Down Expand Up @@ -205,6 +206,8 @@ def root_homes(
"/bin/bash",
"-l",
]
if ctx.args:
exec_cmd.extend(("-c", " ".join(ctx.args)))

with tempfile.NamedTemporaryFile(mode="w", suffix=".json") as tmpf:
# Dump the pod spec to a temporary file
Expand Down Expand Up @@ -269,8 +272,9 @@ def root_homes(
subprocess.check_call(["kubectl", "delete", "pv", pv_name])


@exec_app.command()
@exec_app.command(context_settings={"allow_extra_args": True})
def homes(
ctx: typer.Context,
cluster_name: str = typer.Argument(..., help="Name of cluster to operate on"),
hub_name: str = typer.Argument(..., help="Name of hub to operate on"),
):
Expand All @@ -280,44 +284,35 @@ def homes(
# Name pod to include hub name so it is displayed as part of the default prompt
# This makes sure we don't end up deleting the wrong thing
pod_name = f"{cluster_name}-{hub_name}-shell"
pod = {
"apiVersion": "v1",
"kind": "Pod",
"spec": {
"terminationGracePeriodSeconds": 1,
"automountServiceAccountToken": False,
"volumes": [
# This PVC is created by basehub
overrides = [
{
"op": "add",
"path": "/spec/containers/0/volumeMounts",
"value": [{"name": "home", "mountPath": "/home"}],
},
{
"op": "add",
"path": "/spec/volumes",
"value": [
{"name": "home", "persistentVolumeClaim": {"claimName": "home-nfs"}}
],
"containers": [
{
"name": pod_name,
# Use ubuntu image so we get better gnu rm
"image": UBUNTU_IMAGE,
"stdin": True,
"stdinOnce": True,
"tty": True,
"volumeMounts": [
{
"name": "home",
"mountPath": "/home",
}
],
}
],
},
}

]
cmd = [
"kubectl",
"-n",
hub_name,
"run",
"--rm", # Deletes the pod when the process completes, successfully or otherwise
"-it", # Give us a shell!
"--override-type",

@agoose77 agoose77 May 27, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I switched to JSON Patch here, because the pod merge was not behaving properly w.r.t args / command

"json",
"--overrides",
json.dumps(pod),
json.dumps(overrides),
"--grace-period",
"1",
"--restart",
"Never",
"--image",
# Use ubuntu image so we get GNU rm and other tools
# Should match what we have in our pod definition
Expand All @@ -327,14 +322,18 @@ def homes(
"/bin/bash",
"-l",
]
if ctx.args:
cmd.extend(("-c", " ".join(ctx.args)))

cluster = Cluster.from_name(cluster_name)

with cluster.auth():
subprocess.check_call(cmd)


@exec_app.command()
@exec_app.command(context_settings={"allow_extra_args": True})
def hub(
ctx: typer.Context,
cluster_name: str = typer.Argument(..., help="Name of cluster to operate on"),
hub_name: str = typer.Argument(..., help="Name of hub to operate on"),
):
Expand Down Expand Up @@ -373,11 +372,15 @@ def hub(
"/bin/bash",
"-l",
]
if ctx.args:
cmd.extend(("-c", " ".join(ctx.args)))

subprocess.check_call(cmd)


@exec_app.command()
@exec_app.command(context_settings={"allow_extra_args": True})
def home_nfs_server(
ctx: typer.Context,
cluster_name: str = typer.Argument(..., help="Name of cluster to operate on"),
hub_name: str = typer.Argument(..., help="Name of hub to operate on"),
):
Expand Down Expand Up @@ -416,6 +419,8 @@ def home_nfs_server(
"/bin/bash",
"-l",
]
if ctx.args:
cmd.extend(("-c", " ".join(ctx.args)))
subprocess.check_call(cmd)


Expand Down