Skip to content

feat(ocp4_workload_showroom): support both terminals and add ocp-terminal alias - #77

Merged
andrew-jones merged 2 commits into
mainfrom
feat/terminal-type-both-and-ocp-terminal
Aug 6, 2026
Merged

feat(ocp4_workload_showroom): support both terminals and add ocp-terminal alias#77
andrew-jones merged 2 commits into
mainfrom
feat/terminal-type-both-and-ocp-terminal

Conversation

@andrew-jones

@andrew-jones andrew-jones commented Aug 5, 2026

Copy link
Copy Markdown
Collaborator

Summary

  • Add both as a valid value for ocp4_workload_showroom_terminal_type so that ocp-terminal (ttyd sandbox) and wetty (SSH to bastion) can run simultaneously in the same showroom pod
  • Add ocp-terminal as the preferred name for the ttyd terminal type (the old showroom value was confusing since "showroom" is also the platform name)
  • showroom continues to work as a deprecated alias -- zero impact on existing configs
  • Update default terminal image to pinned tag quay.io/rhpds/openshift-showroom-terminal-ocp:4.20-2026-08-05

Backward Compatibility

All existing terminal_type values produce identical results:

terminal_type ocp-terminal wetty
showroom (deprecated) enabled disabled
ocp-terminal (new) enabled disabled
wetty disabled enabled
both (new) enabled enabled
"" / none disabled disabled

Verified against ~85 agnosticv configs that set this variable.

Test plan

  • Deploy with terminal_type: showroom -- verify ocp-terminal runs, wetty does not (backward compat)
  • Deploy with terminal_type: ocp-terminal -- same behavior as showroom
  • Deploy with terminal_type: wetty -- verify wetty runs, ocp-terminal does not
  • Deploy with terminal_type: both -- verify both containers run and are accessible at /terminal and /wetty
  • Deploy with terminal_type: "" -- verify neither runs

Made with Cursor

andrew-jones and others added 2 commits August 5, 2026 16:02
…p-terminal

Add `both` as a valid value for `ocp4_workload_showroom_terminal_type`
so that ocp-terminal (ttyd sandbox) and wetty (SSH to bastion) can run
simultaneously in the same showroom pod.

Also add `ocp-terminal` as the preferred name (replacing the confusing
`showroom` alias which conflicts with the platform name). The old
`showroom` value continues to work for backward compatibility.

Update default terminal image to pinned tag
`quay.io/rhpds/openshift-showroom-terminal-ocp:4.20-2026-08-05`.

Co-authored-by: Cursor <cursoragent@cursor.com>
@andrew-jones
andrew-jones merged commit 71f62c4 into main Aug 6, 2026
1 check passed
@andrew-jones
andrew-jones deleted the feat/terminal-type-both-and-ocp-terminal branch August 6, 2026 04:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants