Skip to content

Commit 16f6650

Browse files
aslilacaslilac
committed
Merge branch 'main' into lilac/anger
2 parents 3af9601 + 04af56d commit 16f6650

File tree

14 files changed

+457
-1419
lines changed

14 files changed

+457
-1419
lines changed

‎codersdk/deployment.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -804,8 +804,12 @@ func DefaultSupportLinks(docsURL string) []LinkConfig {
804804
}
805805
}
806806

807+
func removeTrailingVersionInfo(v string) string {
808+
return strings.Split(strings.Split(v, "-")[0], "+")[0]
809+
}
810+
807811
func DefaultDocsURL() string {
808-
version := strings.Split(buildinfo.Version(), "-")[0]
812+
version := removeTrailingVersionInfo(buildinfo.Version())
809813
if version == "v0.0.0" {
810814
return "https://coder.com/docs"
811815
}

‎codersdk/deployment_internal_test.go

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
package codersdk
2+
3+
import (
4+
"testing"
5+
6+
"github.com/stretchr/testify/require"
7+
)
8+
9+
func TestRemoveTrailingVersionInfo(t *testing.T) {
10+
t.Parallel()
11+
12+
testCases := []struct {
13+
Version string
14+
ExpectedAfterStrippingInfo string
15+
}{
16+
{
17+
Version: "v2.16.0+683a720",
18+
ExpectedAfterStrippingInfo: "v2.16.0",
19+
},
20+
{
21+
Version: "v2.16.0-devel+683a720",
22+
ExpectedAfterStrippingInfo: "v2.16.0",
23+
},
24+
{
25+
Version: "v2.16.0+683a720-devel",
26+
ExpectedAfterStrippingInfo: "v2.16.0",
27+
},
28+
}
29+
30+
for _, tc := range testCases {
31+
tc := tc
32+
33+
stripped := removeTrailingVersionInfo(tc.Version)
34+
require.Equal(t, tc.ExpectedAfterStrippingInfo, stripped)
35+
}
36+
}

‎docs/admin/provisioners.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ will use in concert with the Helm chart for deploying the Coder server.
267267
1. Modify your Coder `values.yaml` to include
268268

269269
```yaml
270-
provisioneraemon:
270+
provisionerDaemon:
271271
pskSecretName: "coder-provisioner-psk"
272272
```
273273
@@ -290,7 +290,7 @@ will use in concert with the Helm chart for deploying the Coder server.
290290
- name: CODER_URL
291291
value: "https://coder.example.com"
292292
replicaCount: 10
293-
provisioneraemon:
293+
provisionerDaemon:
294294
pskSecretName: "coder-provisioner-psk"
295295
tags:
296296
location: auh

‎docs/contributing/feature-stages.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ coder server --experiments=feature1,feature2
4545
<!-- Code generated by scripts/release/docs_update_experiments.sh. DO NOT EDIT. -->
4646
<!-- BEGIN: available-experimental-features -->
4747

48-
| Feature | Description | Available in |
49-
| --------------- | ------------------------------------------------------------------- | ---------------- |
50-
| `notifications` | Sends notifications via SMTP and webhooks following certain events. | mainline, stable |
48+
| Feature | Description | Available in |
49+
| --------------- | ------------------------------------------------------------------- | ------------ |
50+
| `notifications` | Sends notifications via SMTP and webhooks following certain events. | stable |
5151

5252
<!-- END: available-experimental-features -->
5353

‎docs/install/kubernetes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ locally in order to log in and manage templates.
145145
helm install coder coder-v2/coder \
146146
--namespace coder \
147147
--values values.yaml \
148-
--version 2.15.0
148+
--version 2.15.1
149149
```
150150

151151
You can watch Coder start up by running `kubectl get pods -n coder`. Once

‎docs/install/releases.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ return from the Holiday season.
5555
| ------------ | ------------------ | ---------------- |
5656
| 2.11.x | May 07, 2024 | Not Supported |
5757
| 2.12.x | June 04, 2024 | Not Supported |
58-
| 2.13.x | July 02, 2024 | Security Support |
58+
| 2.13.x | July 02, 2024 | Not Supported |
5959
| 2.14.x | August 06, 2024 | Security Support |
6060
| 2.15.x | September 03, 2024 | Stable |
6161
| 2.16.x | October 01, 2024 | Mainline |

‎docs/networking/index.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,14 @@ In order for clients and workspaces to be able to connect:
2222
- Any reverse proxy or ingress between the Coder control plane and
2323
clients/agents must support WebSockets.
2424

25+
> **Note:** We strongly recommend that clients connect to Coder and their
26+
> workspaces over a good quality, broadband network connection. The following
27+
> are minimum requirements:
28+
>
29+
> - better than 400ms round-trip latency to the Coder server and to their
30+
> workspace
31+
> - better than 0.5% random packet loss
32+
2533
In order for clients to be able to establish direct connections:
2634

2735
> **Note:** Direct connections via the web browser are not supported. To improve

‎offlinedocs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"format:check": "prettier --cache --check './**/*.{css,html,js,json,jsx,md,ts,tsx,yaml,yml}'"
1414
},
1515
"dependencies": {
16-
"@chakra-ui/react": "2.8.2",
16+
"@chakra-ui/react": "2.9.3",
1717
"@emotion/react": "11.13.3",
1818
"@emotion/styled": "11.13.0",
1919
"archiver": "6.0.2",

0 commit comments

Comments
 (0)