Skip to content

Commit fa739e1

Browse files
committed
Update docs
1 parent df2c210 commit fa739e1

File tree

4 files changed

+34
-34
lines changed

4 files changed

+34
-34
lines changed

docs/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
- [Deployment (with examples)](deployment/)
44
- [Behavior in combination with ShinyProxy](shinyproxy.md)
5-
- [Prometheus monitoring](prometheus.md)
5+
- [Prometheus monitoring](prometheus.md)

docs/deployment/README.md

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ and dependencies of the operator.
1313
servers.
1414
- **ShinyProxy**: the ShinyProxy servers, these host the Shiny apps. You do not
1515
need to create these servers manually, since these are created by the
16-
operator. Instead you define which servers to create and the operator creates
16+
operator. Instead, you define which servers to create, and the operator creates
1717
all necessary Kubernetes resources, without affecting any existing server or
1818
causing downtime.
1919
- **Redis**: Redis is used by ShinyProxy (not by the operator) to implement
2020
session persistence. This ensures that when a ShinyProxy server is replaced,
2121
the user is still logged in. This provides a smooth transition when the
2222
operator replaces a ShinyProxy server.
23-
- **Skipper**: Skipper is used as an ingress controller. Currently this is the
23+
- **Skipper**: Skipper is used as an ingress controller. Currently, this is the
2424
only ingress controller supported by the operator. The reason is that the
2525
ingress controller is responsible for routing users to the correct ShinyProxy
2626
server. Skipper is the only ingress controller we found suitable for this
@@ -31,7 +31,7 @@ and dependencies of the operator.
3131

3232
## Tutorial using minikube
3333

34-
This section provides an step-by-step tutorial on the basic deployment of the
34+
This section provides a step-by-step tutorial on the basic deployment of the
3535
ShinyProxy operator on minikube.
3636

3737
1. This tutorial requires that you install some tools:
@@ -92,22 +92,22 @@ ShinyProxy operator on minikube.
9292
it.
9393
10. Try the other examples:
9494

95-
```bash
96-
kubectl delete namespace/shinyproxy
97-
kubectl delete namespace/shinyproxy-operator # may fail
98-
kubectl delete namespace/shinyproxy-dept2 # may fail
99-
kubectl delete namespace/my-namespace # may fail
100-
kubectl delete namespace/redis # may fail
101-
kubectl delete namespace/skipper # may fail
102-
kubectl delete -n default ingress/ngingx-to-skipper-ingress # may fail
103-
kubectl delete -n skipper ingress/ngingx-to-skipper-ingress # may fail
104-
cd directory_of_example
105-
kustomize build . | k apply -f -
106-
```
95+
```bash
96+
kubectl delete namespace/shinyproxy
97+
kubectl delete namespace/shinyproxy-operator # may fail
98+
kubectl delete namespace/shinyproxy-dept2 # may fail
99+
kubectl delete namespace/my-namespace # may fail
100+
kubectl delete namespace/redis # may fail
101+
kubectl delete namespace/skipper # may fail
102+
kubectl delete -n default ingress/ngingx-to-skipper-ingress # may fail
103+
kubectl delete -n skipper ingress/ngingx-to-skipper-ingress # may fail
104+
cd directory_of_example
105+
kustomize build . | k apply -f -
106+
```
107107

108108
## Overview of examples
109109

110-
The Operator is designed to be flexible and fit many type of deployments. This repository includes examples for many kind of deployments:
110+
The Operator is designed to be flexible and fit many type of deployments. This repository includes examples for many kinds of deployments:
111111

112112
- *1-namespaced-hpa*:
113113
- Operator-mode: `namespaced`
@@ -118,7 +118,7 @@ The Operator is designed to be flexible and fit many type of deployments. This r
118118
- ShinyProxy-namespace: `shinyproxy`
119119
- URLs: `https://shinyproxy-demo.local`
120120

121-
This is a very simple deployment of the operator, were everything runs in the same namespace.
121+
This is a very simple deployment of the operator, where everything runs in the same namespace.
122122

123123
- *2-namespaced-ds*:
124124
- Operator-mode: `namespaced`
@@ -129,8 +129,8 @@ The Operator is designed to be flexible and fit many type of deployments. This r
129129
- ShinyProxy-namespace: `shinyproxy`
130130
- URLs: `https://shinyproxy-demo.local`
131131

132-
This deployment is very similar to the previous one, except that it runs Skipper using a `DaemonSet` instead of an automatically scaling `Deployment`. Using the `DaemonSet` ensures that every Kubernetes nodes contains a Skipper pod. This is useful when you want an predictable amount of Skipper pods. In the previous example, the cluster automatically scales the amount of Skipper pods according to the load of these pods. When properly configured, this ensures that Skipper has enough resources to
133-
do its work, while not waisting resources.
132+
This deployment is very similar to the previous one, except that it runs Skipper using a `DaemonSet` instead of an automatically scaling `Deployment`. Using the `DaemonSet` ensures that every Kubernetes nodes contains a Skipper pod. This is useful when you want a predictable amount of Skipper pods. In the previous example, the cluster automatically scales the amount of Skipper pods according to the load of these pods. When properly configured, this ensures that Skipper has enough resources to
133+
do its work, while not wasting resources.
134134

135135
- *3-clustered-hpa*:
136136
- Operator-mode: `clustered`
@@ -143,7 +143,7 @@ The Operator is designed to be flexible and fit many type of deployments. This r
143143
- `https://shinyproxy-demo.local`
144144
- `https://shinyproxy-demo2.local`
145145

146-
In this example, the operator runs in `clustered` mode. Therefore the operator will look into all namespaces for `ShinyProxy` resources and deploy these resources in their respective namespace. This also requires Skipper to be run in clustered mode (in the previous examples it would only look at `Ingress`
146+
In this example, the operator runs in `clustered` mode. Therefore, the operator will look into all namespaces for `ShinyProxy` resources and deploy these resources in their respective namespace. This also requires Skipper to be run in clustered mode (in the previous examples it would only look at `Ingress`
147147
definitions in the `shinyproxy` namespace.) This example also demonstrates how the Operator can be used in a multi-tenancy or multi-realm way. Each ShinyProxy server runs in its own namespace, isolated from the other servers. However, they are managed by a single operator.
148148

149149
- *4-clustered-ds*:
@@ -168,7 +168,7 @@ The Operator is designed to be flexible and fit many type of deployments. This r
168168
- ShinyProxy-namespace: `shinyproxy`
169169
- URLs: `https://shinyproxy-demo.local`
170170

171-
Similar to example example 1, however, the `01_hello` app will now run in the
171+
Similar to example 1, however, the `01_hello` app will now run in the
172172
`my-namespace` namespace instead of the `shinyproxy` namespace. In addition to the change in the `shinyproxy.yaml`, this configuration requires the definition of the extra namespace and the modification of the `ServiceAccount`
173173
of the ShinyProxy server.
174174

@@ -185,9 +185,9 @@ The Operator is designed to be flexible and fit many type of deployments. This r
185185
- `https://shinyproxy-demo.local/shinyproxy3/`
186186

187187
Based on example 2, this example shows how multi-tenancy can be achieved using
188-
sub-paths instead of multiple domainnames. Each ShinyProxy server is made
189-
available at the same domainname but at a different path under that
190-
domainname.
188+
sub-paths instead of multiple domain names. Each ShinyProxy server is made
189+
available at the same domain name but at a different path under that
190+
domain name.
191191

192192
## ShinyProxy CRD
193193

docs/prometheus.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ This configuration automatically discovers all ShinyProxy servers.
5252
5353
The above screenshot shows the `absolute_users_active` metric int the Prometheus
5454
UI. The `shinyproxy_realm` label is automatically added by ShinyProxy to every
55-
metric. The tag contains the resource name of the ShinyProxy server. Therefore
55+
metric. The tag contains the resource name of the ShinyProxy server. Therefore,
5656
this tag is not added to the metrics when ShinyProxy is not being run using the
5757
Operator. In the screenshot there are three ShinyProxy servers being managed by
5858
the ShinyProxy server and two servers using a traditional deployment. The
59-
`shinyproxy` realm has has two severs (instances) running (see the
59+
`shinyproxy` realm has two severs (instances) running (see the
6060
`shinyproxy_instance` label). The dashboard provided on the [ShinyProxy website](https://shinyproxy.io/documentation/usage-statistics/#micrometer)
6161
is designed to work with multiple realms and multiple servers inside each realm.
6262
For example, when displaying the Active Users, the dashboard differentiates
@@ -65,5 +65,5 @@ between the different realms:
6565
![Grafana UI](../.github/screenshots/grafana_active_users.png)
6666

6767
The dashboard contains two variables which allow you to filter the panels by
68-
realm or app name. By default these are hidden, check the [ShinyProxy website](https://shinyproxy.io/documentation/usage-statistics/#variable-filters)
68+
realm or app name. By default, these are hidden, check the [ShinyProxy website](https://shinyproxy.io/documentation/usage-statistics/#variable-filters)
6969
to makes these visible.

docs/shinyproxy.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ connection and session of currently running apps. Every time the configuration
1313
of ShinyProxy is updated, the operator creates a new ShinyProxy server. The
1414
previous running server will not be removed by the operator immediately.
1515
Instead, it is kept around as long as users are running apps on that server.
16-
Theses users will stay on the old server, until they are transferred to the new
16+
These users will stay on the old server, until they are transferred to the new
1717
server. In contrast, new users will automatically get routed to the latest
1818
server and run their apps on that server.
1919

2020
## Transferring users to the latest ShinyProxy Server
2121

22-
This sections describe the scenarios in which a user is transferred to the
22+
These sections describe the scenarios in which a user is transferred to the
2323
latest server.
2424

2525
### Scenario 1: user action
@@ -46,7 +46,7 @@ the latest version.
4646
**Note:** both messages can be disabled by setting the
4747
`proxy.operator.show-transfer-message-main-page` and
4848
`proxy.operator.show-transfer-message-app-page` options to `false` (in the
49-
ShinyProxy configuration). By default these messages are enabled.
49+
ShinyProxy configuration). By default, these messages are enabled.
5050

5151
### Scenario 2: After logout
5252

@@ -97,7 +97,7 @@ server. This server will then redirect to the OpenID provider.
9797
the latest ShinyProxy server
9898

9999
**Note:** this only works when the `proxy.operator.force-transfer` option is set
100-
to `true` (in the ShinyProxy configuration). By default this option is disabled.
100+
to `true` (in the ShinyProxy configuration). By default, this option is disabled.
101101

102102
### Scenario 5: Starting an app
103103

@@ -111,8 +111,8 @@ to `true` (in the ShinyProxy configuration). By default this option is disabled.
111111

112112
**Behavior:**
113113

114-
- before ShinyProxy starts the request app, the user is transferred to the
114+
- before ShinyProxy starts the requested app, the user is transferred to the
115115
latest ShinyProxy server
116116

117117
**Note:** this only works when the `proxy.operator.force-transfer` option is set
118-
to `true` (in the ShinyProxy configuration). By default this option is disabled.
118+
to `true` (in the ShinyProxy configuration). By default, this option is disabled.

0 commit comments

Comments
 (0)