Cleanup unused properties

assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties

@@ -80,9 +80,6 @@ che.workspace.maven_server_java_options=-XX:MaxRAM=128m -XX:MaxRAMFraction=1 -XX
 # Folder that will be a volume mount from your host into your workspace.
 che.workspace.volume=
 
-# If your workspace creates SSH connections, their timeouts are managed by this property.
-che.workspace.ssh_connection_timeout_ms=10000
-
 # The location of the Web terminal used within the browser.
 # This is copied into the workspace and runs within the workspace.
 # Suffix helps differentiate archive for different architectures/OSes
@@ -102,20 +99,8 @@ che.workspace.agent.dev=${che.home}/lib/ws-agent.tar.gz
 # Hosts listed here will be added to /etc/hosts of each workspace.
 che.workspace.hosts=NULL
 
-### AGENTS
-# When the Che server launches a new workspace, Che pings a mini Che server running inside of the
-# workspace runtime. We call this mini-Che an "agent". The Che server knows that the workspace
-# is ready for user when the agent returns a valid response.
-che.workspace.agent.dev.max_start_time_ms=180000
-che.workspace.agent.dev.ping_delay_ms=2000
-che.workspace.agent.dev.ping_conn_timeout_ms=2000
-che.workspace.agent.dev.ping_timeout_error_msg=Timeout. The Che server is unable to ping your workspace. This implies a network configuration issue, workspace boot failure, or an unusually slow workspace boot.
-
 che.installer.registry.remote=NULL
 
-che.agent.dev.max_start_time_ms=120000
-che.agent.dev.ping_delay_ms=2000
-
 # Idle Timeout
 #     The system will suspend the workspace if the end user is idle for
 #     this amount of time. Idleness is determined by the length of time that a user has
@@ -218,40 +203,6 @@ che.docker.ip=NULL
 # This is unusual, but happens for example in Docker for Mac when containers are in a VM.
 che.docker.ip.external=NULL
 
-# The server evaluation strategy to be used to determine servers exposed by workspaces.
-# Options:
-#   - 'default':      internal address is address of docker host and ephemeral port are used
-#   - 'docker-local': internal address is address of container within docker network, and exposed ports
-#                     are used.
-#   - 'custom': The evaluation strategy may be customized through a template property.
-#   - 'docker-local-custom':  internal address is set as in docker-local strategy, external address is composed
-#                     as in the custom strategy with the 'template' and the 'external.protocol' properties.
-
-# The 'docker-local' strategy may be useful if a firewall prevents communication between che-server and
-# workspace containers, but will prevent communication when che-server and workspace containers are not
-# on the same Docker network.
-# The 'docker-local-custom' strategy may be useful when Che and the workspace servers need to be exposed on the
-# same single TCP port.
-che.docker.server_evaluation_strategy=default
-
-
-# Here are macros available for the custom server evaluation strategy
-# serverName: server reference exposing the port (like tomcat8, ws-agent, etc)
-# machineName: name of the machine of the workspace. (like devMachine)
-# workspaceId: id of the workspace
-# internalIp: IP of the internal address of che (che.docker.ip property)
-# externalIP: IP of the external address of che
-# externalAddresss : external address of che (che.docker.ip.external or if null che.docker.ip)
-# chePort : Che listening port number of workspace master
-# wildcardNipDomain : get external address transformed into a nip.io DNS sub-domain
-# wildcardXipDomain : get external address transformed into a xip.io DNS sub-domain
-# user : name of the current user 
-# workspacesRoutingSuffix: explicit routing suffix for workspace agents (see property che.workspaces.routing-suffix) 
-che.docker.server_evaluation_strategy.custom.template=<serverName>.<machineName>.<workspaceId>.<wildcardNipDomain>:<chePort>
-
-# Protocol to use for http access (for example it can be set to https)
-che.docker.server_evaluation_strategy.custom.external.protocol=http
-
 # Provides a Docker network where Che server is running.
 # Workspace containers created by Che will be added to this Docker network.
 # Communications between the Che server and container occur over this network.

dockerfiles/init/manifests/che.env

@@ -209,20 +209,6 @@
 #     Che will use the volume mount of unix:///var/run/docker.sock.
 #DOCKER_HOST=tcp://localhost:2375
 
-# Workspace Address Resolution Strategy
-#     The strategy to determine how workspace servers users launch will be exposed. 
-#     If the Che server and your workspaces are on different networks that flow through a
-#     firewall, those firewalls can prevent communications between Che and workspaces.
-#     The default strategy exposes workspaces with the IP of Docker and ephemeral ports.
-#     A Docker local strategy uses internal Docker network IP addresses and exposed ports.
-#
-#     Options:
-#       - 'default':      internal address is DOCKER_HOST with ephemeral ports
-#       - 'docker-local': internal address is Docker network container address with
-#                         exposed ports (not ephemeral)
-#     on the same Docker network.
-#CHE_DOCKER_SERVER__EVALUATION__STRATEGY=docker-local
-
 # Docker IP Address
 #     The IP address of the Docker daemon that is running on your host. The Che server
 #     uses this IP address to establish a connection to your workspaces when they
@@ -256,14 +242,7 @@
 # With single-port, each service running in a workspace and exposing ports has its own hostname.
 # Example : workspace agent will have a hostname like : ws-agent.workspace-id....domain.name
 # By default the domain name will use nip.io which allow to provide wildcard DNS without any
-# user configuration. The strategy used for the hosts is using the template provided by the
-# CHE_DOCKER_SERVER__EVALUATION__STRATEGY_CUSTOM_TEMPLATE property with default value
-#  <serverName>.<machineName>.<workspaceId>.<wildcardNipDomain>:<chePort>
-# If you've your own domain and then DNS server, you may want to add wildcard DNS entry
-# matching a pattern. For example updating the property to the value
-#  <serverName>.<machineName>.<workspaceId>.che.foobar.com:<chePort>
-# will require a wildcard *.che.foobar.com entry in DNS server resolving to the IP of the che server.
-# More details on the values provided by the template can be found on documentation.
+# user configuration.
 CHE_SINGLE_PORT=false
 
 

dockerfiles/init/modules/che/templates/che.env.erb

@@ -78,6 +78,5 @@ CHE_WORKSPACE_HTTP__PROXY__JAVA__OPTIONS=<% if ! @http_proxy_for_che_workspaces.
 
 # Enable single port options
 <% if scope.lookupvar('che::che_single_port') == "true" -%>
-CHE_DOCKER_SERVER__EVALUATION__STRATEGY=custom
 CHE_PLUGIN_TRAEFIK_ENABLED=true
 <% end -%>