From e96eb3315cc3b6cf957c5115442b2745441f213a Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber@redhat.com>
Date: Fri, 6 Feb 2026 09:59:25 -0500
Subject: [PATCH] Add support for UBI 8 in che-code-sshd editor definition.

- The che-code-sshd image is now a multi-stage image that supports UBI
  8,9 and 10 with appropriate library defined at /sshd-staging/ubi8/ &
  /sshd-staging/ubi9/
- The che-code-sshd-page container is now only responsible for copying
  those resources into the /sshd/ volume mount and setting up the
  landing page with connection instructions, using sshd.init script
- Remove 'Tech-Preview' tag

Signed-off-by: Roland Grunberg <rgrunber@redhat.com>
---
 editors-definitions/che-code-sshd-insiders.yaml | 10 +++++++---
 editors-definitions/che-code-sshd-next.yaml     |  9 ++++++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/editors-definitions/che-code-sshd-insiders.yaml b/editors-definitions/che-code-sshd-insiders.yaml
index f1c892437..0d3baaea5 100644
--- a/editors-definitions/che-code-sshd-insiders.yaml
+++ b/editors-definitions/che-code-sshd-insiders.yaml
@@ -16,7 +16,6 @@ metadata:
   displayName: Visual Studio Code (desktop) (SSH)
   description: Visual Studio Code server for Eclipse Che over SSH - insiders
   tags:
-    - Tech-Preview
     - ssh
     - CLI
     - vscode
@@ -84,7 +83,9 @@ commands:
 events:
   postStart:
     - start-sshd
+
 components:
+
   - name: che-code-sshd-page
     container:
       image: quay.io/che-incubator/che-code-sshd:insiders
@@ -95,7 +96,7 @@ components:
       command:
         - sh
         - -c
-        - "cp /usr/sbin/sshd /usr/bin/ssh-keygen /usr/bin/tar /usr/bin/gzip /usr/bin/which /usr/lib64/libnss_wrapper.so /usr/lib64/libpam.so.0 /usr/lib64/libeconf.so.0 /usr/lib64/libcrypt.so.2 /etc/ssh/sshd_config /sshd.start /sshd/ & while [ ! -e /sshd/username ]; do sleep 1s; done; pushd /opt/www/ && exec node /opt/www/server.js"
+        - "/sshd-staging/sshd.init"
       endpoints:
         - name: che-code-sshd
           attributes:
@@ -112,9 +113,10 @@ components:
     attributes:
       app.kubernetes.io/component: che-code-sshd-page
       app.kubernetes.io/part-of: che-code-server.eclipse.org
+
   - name: che-code-sshd
     container:
-      image: quay.io/che-incubator/che-code-sshd:insiders
+      image: registry.access.redhat.com/ubi9-minimal:9.7
       memoryLimit: 4096Mi
       memoryRequest: 256Mi
       cpuLimit: 1000m
@@ -126,5 +128,7 @@ components:
       app.kubernetes.io/component: che-code-sshd
       app.kubernetes.io/part-of: che-code-server.eclipse.org
       controller.devfile.io/container-contribution: true
+
   - name: sshd-folder
     volume: {}
+
diff --git a/editors-definitions/che-code-sshd-next.yaml b/editors-definitions/che-code-sshd-next.yaml
index e4f9f8095..904c5def6 100644
--- a/editors-definitions/che-code-sshd-next.yaml
+++ b/editors-definitions/che-code-sshd-next.yaml
@@ -19,7 +19,6 @@ metadata:
     - ssh
     - CLI
     - vscode
-    - Tech-Preview
   attributes:
     arch:
       - x86_64
@@ -84,7 +83,9 @@ commands:
 events:
   postStart:
     - start-sshd
+
 components:
+
   - name: che-code-sshd-page
     container:
       image: quay.io/che-incubator/che-code-sshd:next
@@ -95,7 +96,7 @@ components:
       command:
         - sh
         - -c
-        - "cp /usr/sbin/sshd /usr/bin/ssh-keygen /usr/bin/tar /usr/bin/gzip /usr/bin/which /usr/lib64/libnss_wrapper.so /usr/lib64/libpam.so.0 /usr/lib64/libeconf.so.0 /usr/lib64/libcrypt.so.2 /etc/ssh/sshd_config /sshd.start /sshd/ & while [ ! -e /sshd/username ]; do sleep 1s; done; pushd /opt/www/ && exec node /opt/www/server.js"
+        - "/sshd-staging/sshd.init"
       endpoints:
         - name: che-code-sshd
           attributes:
@@ -112,9 +113,10 @@ components:
     attributes:
       app.kubernetes.io/component: che-code-sshd-page
       app.kubernetes.io/part-of: che-code-server.eclipse.org
+
   - name: che-code-sshd
     container:
-      image: quay.io/che-incubator/che-code-sshd:next
+      image: registry.access.redhat.com/ubi9-minimal:9.7
       memoryLimit: 4096Mi
       memoryRequest: 256Mi
       cpuLimit: 1000m
@@ -126,6 +128,7 @@ components:
       app.kubernetes.io/component: che-code-sshd
       app.kubernetes.io/part-of: che-code-server.eclipse.org
       controller.devfile.io/container-contribution: true
+
   - name: sshd-folder
     volume: {}