Skip to content

Commit 11a9684

Browse files
authored
docs: Fix language and links in the properties files. (#15)
* Fix language and links on properties files * Update assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties * Add {prod-short} definition
1 parent d640df4 commit 11a9684

File tree

2 files changed

+34
-36
lines changed

2 files changed

+34
-36
lines changed

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

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#
1212

1313
# {orch-name}: Kubernetes or OpenShift
14+
# {prod-short}: Eclipse Che
1415

1516
### {prod-short} server
1617

@@ -143,15 +144,15 @@ che.workspace.activity_cleanup_scheduler_initial_delay_s=60
143144

144145

145146
# Delay before first workspace idleness check job started to avoid
146-
# mass suspend if ws master was unavailable for period close to
147+
# mass suspend if {prod-short} server was unavailable for period close to
147148
# inactivity timeout.
148149
che.workspace.activity_check_scheduler_delay_s=180
149150

150151

151-
# Time period to delay the first execution of temporary workspaces cleanup job.
152+
# Time to delay the first execution of temporary workspaces cleanup job.
152153
che.workspace.cleanup_temporary_initial_delay_min=5
153154

154-
# Time period delay between the termination of one execution and the commencement
155+
# Time to delay between the termination of one execution and the commencement
155156
# of the next execution of temporary workspaces cleanup job
156157
che.workspace.cleanup_temporary_period_min=180
157158

@@ -332,7 +333,7 @@ che.infra.kubernetes.service_account_name=NULL
332333
# This property deprecates `che.infra.kubernetes.cluster_role_name`.
333334
che.infra.kubernetes.workspace_sa_cluster_roles=NULL
334335

335-
# Defines time frame that limits the Kubernetes workspace start time
336+
# Defines wait time that limits the Kubernetes workspace start time.
336337
che.infra.kubernetes.workspace_start_timeout_min=8
337338

338339
# Defines the timeout in minutes that limits the period for which Kubernetes Ingress become ready
@@ -371,7 +372,7 @@ che.infra.kubernetes.pvc.strategy=common
371372
# Necessary in some versions of {orch-name} as workspace subpath volume mounts are created with root permissions,
372373
# and therefore cannot be modified by workspaces running as a user (presents an error importing projects into a workspace in {prod-short}).
373374
# The default is `true`, but should be set to `false` if the version of {orch-name} creates subdirectories with user permissions.
374-
# Relevant issue: https://github.com/kubernetes/kubernetes/issues/41638
375+
# See: link:https://github.com/kubernetes/kubernetes/issues/41638[subPath in volumeMount is not writable for non-root users #41638]
375376
# the {prod-short} Operator that this property has effect only if the `common` PVC strategy used.
376377
che.infra.kubernetes.pvc.precreate_subpaths=true
377378

@@ -385,8 +386,7 @@ che.infra.kubernetes.pvc.name=claim-che-workspace
385386
che.infra.kubernetes.pvc.storage_class_name=
386387

387388
# Defines the size of Persistent Volume Claim of {prod-short} workspace.
388-
# Format described here:
389-
# https://docs.openshift.com/container-platform/latest/dev_guide/compute_resources.html#dev-compute-resources
389+
# See: link:https://docs.openshift.com/container-platform/4.4/storage/understanding-persistent-storage.html[Understanding persistent storage]
390390
che.infra.kubernetes.pvc.quantity=10Gi
391391

392392
# Pod that is launched when performing persistent volume claim maintenance jobs on OpenShift
@@ -401,8 +401,7 @@ che.infra.kubernetes.pvc.jobs.memorylimit=250Mi
401401
# Defines Persistent Volume Claim access mode.
402402
# the {prod-short} Operator that for common PVC strategy changing of access mode affects the number of simultaneously running workspaces.
403403
# If the OpenShift instance running {prod-short} is using Persistent Volumes with RWX access mode, then a limit of running workspaces at the same time is bounded only by {prod-short} limits configuration: RAM, CPU, and so on.
404-
# Detailed information about access mode is described here:
405-
# https://docs.openshift.com/container-platform/latest/architecture/additional_concepts/storage.html#pv-access-modes
404+
# See: link:https://docs.openshift.com/container-platform/4.4/storage/understanding-persistent-storage.html[Understanding persistent storage]
406405
che.infra.kubernetes.pvc.access_mode=ReadWriteOnce
407406

408407
# Defines if {prod-short} Server should wait workspaces Persistent Volume Claims to become bound after creating.
@@ -434,17 +433,17 @@ che.infra.kubernetes.pvc.wait_bound=true
434433
# to `%s` (see the `che.infra.kubernetes.ingress.path.rewrite_transform` property).
435434
#
436435
# See the Nginx ingress controller documentation for the explanation of how the ingress controller uses
437-
# the regular expression present in the ingress path and how it achieves the URL rewriting.
436+
# the regular expression available in the ingress path and how it achieves the URL rewriting.
438437
che.infra.kubernetes.ingress.annotations_json=NULL
439438

440-
# Defines a "recipe" on how to declare the path of the ingress that should expose a server.
441-
# The "%s" represents the base public URL of the server and is guaranteed to end with a forward slash. This property
442-
# must be a valid input to the String.format() method and contain exactly one reference to "%s".
439+
# Defines a recipe on how to declare the path of the ingress that should expose a server.
440+
# The `%s` represents the base public URL of the server and is guaranteed to end with a forward slash. This property
441+
# must be a valid input to the `String.format()` method and contain exactly one reference to `%s`.
443442
#
444443
# See the description of the `che.infra.kubernetes.ingress.annotations_json` property to see how these two
445444
# properties interplay when specifying the ingress annotations and path.
446445
#
447-
# If not defined, this property defaults to "%s" (without the quotes) which means that the path is not transformed in
446+
# If not defined, this property defaults to `%s` (without the quotes) which means that the path is not transformed in
448447
# any way for use with the ingress controller.
449448
che.infra.kubernetes.ingress.path_transform=NULL
450449

@@ -722,8 +721,8 @@ che.infra.kubernetes.async.storage.image=quay.io/eclipse/che-workspace-data-sync
722721
che.workspace.pod.node_selector=NULL
723722

724723
# Optionally configures tolerations for workspace Pod. Format is a string representing a JSON Array of taint tolerations,
725-
# or `NULL` to disable it. The objects contained in the array have to follow this
726-
# link:https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#toleration-v1-core[spec].
724+
# or `NULL` to disable it. The objects contained in the array have to follow the
725+
# link:https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#toleration-v1-core[toleration v1 core specifications].
727726
# Example: `[{"effect":"NoExecute","key":"aNodeTaint","operator":"Equal","value":"aValue"}]`
728727
che.workspace.pod.tolerations_json=NULL
729728

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

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
# getByKey, getByNameSpace, stopWorkspaces, and getResourcesInformation.
1919
# These are not given to admins by default and these permissions allow
2020
# admins gain visibility to any workspace along with naming themselves
21-
# with admin privileges to those workspaces.
21+
# with administrator privileges to those workspaces.
2222
che.system.super_privileged_mode=false
2323

24-
# Grant system permission for 'che.admin.name' user. If the user already exists it'll happen on
24+
# Grant system permission for `che.admin.name` user. If the user already exists it'll happen on
2525
# component startup, if not - during the first login when user is persisted in the database.
2626
che.system.admin_name=admin
2727

@@ -36,13 +36,13 @@ che.limits.workspace.env.ram=16gb
3636
# The length of time in milliseconds that a user is idle with their workspace when the system will
3737
# suspend the workspace and then stopping it. Idleness is the
3838
# length of time that the user has not interacted with the workspace, meaning that
39-
# one of our agents has not received interaction. Leaving a browser window open
39+
# one of the agents has not received interaction. Leaving a browser window open
4040
# counts toward idleness.
4141
che.limits.workspace.idle.timeout=1800000
4242

4343
# The length of time in milliseconds that a workspace will run, regardless of activity, before
44-
# the system will suspend it. Set this property if you want to automatically stop
45-
# workspaces after a period of time. The default is zero, meaning that there is no
44+
# the system will suspend it. Set this property if you want to automatically stop
45+
# workspaces after a period of time. The default is zero, meaning that there is no
4646
# run timeout.
4747
che.limits.workspace.run.timeout=0
4848

@@ -85,13 +85,12 @@ che.limits.organization.workspaces.run.count=-1
8585

8686
### Multi-user-specific OpenShift infrastructure configuration
8787

88-
# Alias of the Openshift identity provider registered in Keycloak,
88+
# Alias of the OpenShift identity provider registered in Keycloak,
8989
# that should be used to create workspace OpenShift resources in
90-
# Openshift namespaces owned by the current Che user.
90+
# OpenShift namespaces owned by the current Che user.
9191
# Should be set to NULL if `che.infra.openshift.project`
9292
# is set to a non-empty value.
93-
# For more information see the following documentation:
94-
# https://www.keycloak.org/docs/3.3/server_admin/topics/identity-broker/social/openshift.html
93+
# See: link:https://www.keycloak.org/docs/latest/server_admin/#openshift-4[OpenShift identity provider]
9594
che.infra.openshift.oauth_identity_provider=NULL
9695

9796
### Keycloak configuration
@@ -109,22 +108,22 @@ che.keycloak.auth_internal_server_url=NULL
109108
# is used
110109
che.keycloak.realm=che
111110

112-
# Keycloak client id in che.keycloak.realm that is used by dashboard, ide and cli to authenticate users
111+
# Keycloak client identifier in `che.keycloak.realm` to authenticate users in the dashboard, the IDE, and the CLI.
113112
che.keycloak.client_id=che-public
114113

115-
# URL to access OSO oauth tokens
114+
# URL to access OSO OAuth tokens
116115
che.keycloak.oso.endpoint=NULL
117116

118-
# URL to access Github oauth tokens
117+
# URL to access Github OAuth tokens
119118
che.keycloak.github.endpoint=NULL
120119

121-
# The number of seconds to tolerate for clock skew when verifying exp or nbf claims.
120+
# The number of seconds to tolerate for clock skew when verifying `exp` or `nbf` claims.
122121
che.keycloak.allowed_clock_skew_sec=3
123122

124123
# Use the OIDC optional `nonce` feature to increase security.
125124
che.keycloak.use_nonce=true
126125

127-
# URL to the Keycloak Javascript adapter we want to use.
126+
# URL to the Keycloak Javascript adapter to use.
128127
# if set to NULL, then the default used value is
129128
# `${che.keycloak.auth_server_url}/js/keycloak.js`,
130129
# or `<che-server>/api/keycloak/OIDCKeycloak.js`
@@ -133,7 +132,7 @@ che.keycloak.js_adapter_url=NULL
133132

134133
# Base URL of an alternate OIDC provider that provides
135134
# a discovery endpoint as detailed in the following specification
136-
# https://openid.net/specs/openid-connect-discovery-1_0.html#ProviderConfig
135+
# link:https://openid.net/specs/openid-connect-discovery-1_0.html#ProviderConfig[Obtaining OpenID Provider Configuration Information]
137136
che.keycloak.oidc_provider=NULL
138137

139138
# Set to true when using an alternate OIDC provider that
@@ -149,27 +148,27 @@ che.keycloak.username_claim=NULL
149148
# Configuration of OAuth Authentication Service that can be used in "embedded" or "delegated" mode.
150149
# If set to "embedded", then the service work as a wrapper to Che's OAuthAuthenticator ( as in Single User mode).
151150
# If set to "delegated", then the service will use Keycloak IdentityProvider mechanism.
152-
# Runtime Exception wii be thrown, in case if this property is not set properly.
151+
# Runtime Exception `wii` be thrown, in case if this property is not set properly.
153152
che.oauth.service_mode=delegated
154153

155154
# Configuration for enabling removing user from Keycloak server on removing user from Che database.
156155
# By default it's disabled. Can be enabled in some special cases when deleting a user in Che database
157156
# should execute removing related-user from Keycloak.
158-
# For correct work need to set admin username ${che.keycloak.admin_username} and password
157+
# For correct work need to set administrator username ${che.keycloak.admin_username} and password
159158
# ${che.keycloak.admin_password}.
160159
che.keycloak.cascade_user_removal_enabled=false
161160

162-
# Keycloak admin username. Will be used for deleting user from Keycloak on removing user
161+
# Keycloak administrator username. Will be used for deleting user from Keycloak on removing user
163162
# from Che database. Make sense only in case ${che.keycloak.cascade_user_removal_enabled}
164163
# set to 'true'
165164
che.keycloak.admin_username=NULL
166165

167-
# Keycloak admin password. Will be used for deleting user from Keycloak on removing user
166+
# Keycloak administrator password. Will be used for deleting user from Keycloak on removing user
168167
# from Che database. Make sense only in case ${che.keycloak.cascade_user_removal_enabled}
169168
# set to 'true'
170169
che.keycloak.admin_password=NULL
171170

172-
# User name adjustment configuration. Che needs to use the usernames as part of K8s object names and labels and
171+
# User name adjustment configuration. Che needs to use the usernames as part of Kubernetes object names and labels and
173172
# therefore has stricter requirements on their format than the identity providers usually
174173
# allow (it needs them to be DNS-compliant). The adjustment is represented by comma-separated key-value pairs.
175174
# These are sequentially used as arguments to the String.replaceAll function on the original username.

0 commit comments

Comments
 (0)