Skip to content

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

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
andrew-jones merged 2 commits into from
Aug 6, 2026
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a95684
feat(ocp4_workload_showroom): support both terminals and rename to oc…
andrew-jones Aug 5, 2026
b98bcbc
feat(terminal): use rolling tag for ocp terminal image
andrew-jones Aug 6, 2026
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
16 changes: 9 additions & 7 deletions roles/ocp4_workload_showroom/defaults/main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,15 @@ ocp4_workload_showroom_content_git_repo_ref: main
# Which Antora Playbook to use in the content repo
ocp4_workload_showroom_content_antora_playbook: site.yml

# Which terminal to deploy:
# - wetty: deploy the wetty terminal image. You can then set
# ocp4_workload_showroom_wetty_ssh_bastion_login to true
# to automatically ssh to a bastion
# - showroom: deploy the showroom terminal image
# Which terminal(s) to deploy:
# - ocp-terminal: deploy the ocp-terminal image (ttyd sandbox with oc CLI)
# - wetty: deploy the wetty terminal image (SSH to bastion).
# Set ocp4_workload_showroom_wetty_ssh_bastion_login to true
# to automatically ssh to a bastion.
# - both: deploy both ocp-terminal and wetty
# - showroom: (deprecated alias for ocp-terminal, kept for backward compatibility)
# - "": No terminal deployed
ocp4_workload_showroom_terminal_type: showroom
ocp4_workload_showroom_terminal_type: ocp-terminal

# Requests and limits for the terminal pod (same vars for either showroom or wetty)
ocp4_workload_showroom_terminal_requests_cpu: 50m
Expand Down Expand Up @@ -58,7 +60,7 @@ ocp4_workload_showroom_antora_enable_dev_mode: false
# - quay.io/rhpds/openshift-showroom-terminal-ocp:latest
# - quay.io/rhpds/openshift-showroom-terminal-rosa:latest
# - quay.io/rhpds/openshift-showroom-terminal-aro:latest
ocp4_workload_showroom_terminal_image: quay.io/rhpds/openshift-showroom-terminal-ocp:latest
ocp4_workload_showroom_terminal_image: quay.io/rhpds/openshift-showroom-terminal-ocp:4.20

# Wetty Image
ocp4_workload_showroom_wetty_image: quay.io/rhpds/wetty:v3.2.1
Expand Down
4 changes: 2 additions & 2 deletions roles/ocp4_workload_showroom/tasks/deploy_showroom.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
| default(showroom_openshift_apps_domain, true)
| default('', true) }}
terminal:
setup: "{{ (true if ocp4_workload_showroom_terminal_type == 'showroom' else false) | bool | string | lower }}"
setup: "{{ (ocp4_workload_showroom_terminal_type in ['showroom', 'ocp-terminal', 'both']) | string | lower }}"
image: "{{ ocp4_workload_showroom_terminal_image }}"
resources:
requests:
Expand All @@ -66,7 +66,7 @@
pvcSize: "{{ ocp4_workload_showroom_terminal_storage_pvc_size }}"
storageClass: "{{ ocp4_workload_showroom_terminal_storage_class }}"
wetty:
setup: "{{ (true if ocp4_workload_showroom_terminal_type == 'wetty' else false) | bool | string | lower }}"
setup: "{{ (ocp4_workload_showroom_terminal_type in ['wetty', 'both']) | string | lower }}"
image: "{{ ocp4_workload_showroom_wetty_image }}"
resources:
requests:
Expand Down
Loading