Merge pull request #913 from jiridanek/jd_refactor_sync

[main] Reapply "RHOAIENG-17306, RHOAIENG-17307, RHOAIENG-17308: feat(workbenches): tolerate IPv6 environments in codeserver, jupyterlab and rstudio"

Author: openshift-merge-bot[bot]

codeserver/ubi9-python-3.11/nginx/api/kernels/access.cgi

@@ -3,7 +3,7 @@ echo "Status: 200"
 echo "Content-type: application/json"
 echo
 # Query the heartbeat endpoint
-HEALTHZ=$(curl -s http://127.0.0.1:8888/codeserver/healthz)
+HEALTHZ=$(curl -s http://localhost:8888/codeserver/healthz)
 # Extract last_activity | remove milliseconds
 LAST_ACTIVITY_EPOCH=$(echo $HEALTHZ | grep -Po 'lastHeartbeat":\K.*?(?=})' | awk '{ print substr( $0, 1, length($0)-3 ) }')
 # Convert to ISO8601 date format

codeserver/ubi9-python-3.11/nginx/httpconf/http.conf

@@ -37,3 +37,12 @@ map $http_x_forwarded_proto $custom_scheme {
         default $scheme;
         https https;
 }
+
+###############
+# Dual-stack causes nginx to enable the "If a domain name resolves to several addresses, all of them will be used in a round-robin fashion." behavior
+# https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_next_upstream_tries
+###############
+upstream workbench_server {
+    server localhost:8787 max_fails=0;
+}
+###############

codeserver/ubi9-python-3.11/nginx/root/opt/app-root/nginxconf.sed

@@ -1,9 +1,6 @@
 # Change port
 /listen/s%80%8888 default_server%
 
-# Remove listening on IPv6
-/\[::\]/d
-
 # One worker only
 /worker_processes/s%auto%1%
 

codeserver/ubi9-python-3.11/nginx/serverconf/proxy.conf.template

@@ -45,7 +45,7 @@ location = /codeserver {
 
 location /codeserver/ {
     # Standard code-server/NGINX configuration
-    proxy_pass http://127.0.0.1:8787/;
+    proxy_pass http://workbench_server/;
     proxy_http_version 1.1;
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection $connection_upgrade;

codeserver/ubi9-python-3.11/nginx/serverconf/proxy.conf.template_nbprefix

@@ -59,8 +59,9 @@ location = / {
 location /codeserver/ {
     rewrite ^/codeserver/(.*)$ /$1 break;
     # Standard RStudio/NGINX configuration
-    proxy_pass http://127.0.0.1:8787;
+    proxy_pass http://workbench_server/;
     proxy_http_version 1.1;
+
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection $connection_upgrade;
     proxy_read_timeout 20d;

codeserver/ubi9-python-3.11/run-code-server.sh

@@ -110,10 +110,20 @@ if [ ! -d "$logs_dir" ]; then
   mkdir -p "$logs_dir"
 fi
 
+# IPv6 support
+echo "Checking IPv6 support..."
+if [ -f /proc/net/if_inet6 ]; then
+    BIND_ADDR="[::]:8787"  # IPv6/dual-stack
+    echo "IPv6 detected: binding to all interfaces (IPv4 + IPv6)"
+else
+    BIND_ADDR="0.0.0.0:8787"  # IPv4 only
+    echo "IPv6 not detected: falling back to IPv4 only"
+fi
+
 # Start server
 start_process /usr/bin/code-server \
-  --bind-addr 0.0.0.0:8787 \
-  --disable-telemetry \
-  --auth none \
-  --disable-update-check \
-  /opt/app-root/src
+    --bind-addr "${BIND_ADDR}" \
+    --disable-telemetry \
+    --auth none \
+    --disable-update-check \
+    /opt/app-root/src

jupyter/minimal/ubi9-python-3.11/start-notebook.sh

@@ -35,6 +35,6 @@ fi
 
 # Start the JupyterLab notebook
 start_process jupyter lab ${NOTEBOOK_PROGRAM_ARGS} \
-    --ServerApp.ip=0.0.0.0 \
+    --ServerApp.ip="" \
     --ServerApp.allow_origin="*" \
     --ServerApp.open_browser=False

rstudio/c9s-python-3.11/nginx/httpconf/http.conf

@@ -37,3 +37,12 @@ map $http_x_forwarded_proto $custom_scheme {
         default $scheme;
         https https;
 }
+
+###############
+# Dual-stack causes nginx to enable the "If a domain name resolves to several addresses, all of them will be used in a round-robin fashion." behavior
+# https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_next_upstream_tries
+###############
+upstream workbench_server {
+    server localhost:8787 max_fails=0;
+}
+###############

rstudio/c9s-python-3.11/nginx/serverconf/proxy.conf.template

@@ -50,7 +50,7 @@ location = /rstudio {
 location /rstudio/ {
     rewrite ^/rstudio/(.*)$ /$1 break;
     # Standard RStudio/NGINX configuration
-    proxy_pass http://127.0.0.1:8787;
+    proxy_pass http://workbench_server/;
     proxy_http_version 1.1;
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection $connection_upgrade;

rstudio/c9s-python-3.11/nginx/serverconf/proxy.conf.template_nbprefix

@@ -77,7 +77,7 @@ location = / {
 location /rstudio/ {
     rewrite ^/rstudio/(.*)$ /$1 break;
     # Standard RStudio/NGINX configuration
-    proxy_pass http://127.0.0.1:8787;
+    proxy_pass http://workbench_server/;
     proxy_http_version 1.1;
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection $connection_upgrade;