Skip to content

Commit 37d06e3

Browse files
authored
Merge branch 'main' into mafredri/feat-add-app-usage-to-template-insights
2 parents be67aef + 95d66ac commit 37d06e3

File tree

38 files changed

+844
-260
lines changed

38 files changed

+844
-260
lines changed

.github/actions/setup-sqlc/action.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ runs:
77
- name: Setup sqlc
88
uses: sqlc-dev/setup-sqlc@v3
99
with:
10-
sqlc-version: "1.19.1"
10+
sqlc-version: "1.20.0"

.github/workflows/ci.yaml

+2-4
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ jobs:
137137
138138
# Check for any typos
139139
- name: Check for typos
140-
uses: crate-ci/typos@v1.16.2
140+
uses: crate-ci/typos@v1.16.4
141141
with:
142142
config: .github/workflows/typos.toml
143143

@@ -640,9 +640,7 @@ jobs:
640640
go install github.com/golang/mock/mockgen@v1.6.0
641641
642642
- name: Setup sqlc
643-
uses: sqlc-dev/setup-sqlc@v3
644-
with:
645-
sqlc-version: "1.19.1"
643+
uses: ./.github/actions/setup-sqlc
646644

647645
- name: Format
648646
run: |

coderd/apidoc/docs.go

+48-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

coderd/apidoc/swagger.json

+46-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

coderd/database/models.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

coderd/database/querier.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

coderd/database/queries.sql.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

codersdk/deployment.go

+4
Original file line numberDiff line numberDiff line change
@@ -1931,6 +1931,9 @@ const (
19311931
// Template parameters insights
19321932
ExperimentTemplateParametersInsights Experiment = "template_parameters_insights"
19331933

1934+
// Workspaces batch actions
1935+
ExperimentWorkspacesBatchActions Experiment = "workspaces_batch_actions"
1936+
19341937
// Add new experiments here!
19351938
// ExperimentExample Experiment = "example"
19361939
)
@@ -1942,6 +1945,7 @@ const (
19421945
var ExperimentsAll = Experiments{
19431946
ExperimentDeploymentHealthPage,
19441947
ExperimentTemplateParametersInsights,
1948+
ExperimentWorkspacesBatchActions,
19451949
}
19461950

19471951
// Experiments is a list of experiments that are enabled for the deployment.

docs/admin/high-availability.md

+14-6
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,27 @@ endpoint. [GCP](https://cloud.google.com/sql/docs/postgres/high-availability), [
66
and other cloud vendors offer fully-managed HA Postgres services that pair
77
nicely with Coder.
88

9-
For Coder to operate correctly, every node must be within 10ms of each other
10-
and Postgres. We make a best-effort attempt to warn the user when inter-Coder
11-
latency is too high, but if requests start dropping, this is one metric to investigate.
9+
For Coder to operate correctly, Coderd instances should have low-latency connections
10+
to each other so that they can effectively relay traffic between users and workspaces no
11+
matter which Coderd instance users or workspaces connect to. We make a best-effort attempt
12+
to warn the user when inter-Coderd latency is too high, but if requests start dropping, this
13+
is one metric to investigate.
14+
15+
We also recommend that you deploy all Coderd instances such that they have low-latency
16+
connections to Postgres. Coderd often makes several database round-trips while processing
17+
a single API request, so prioritizing low-latency between Coderd and Postgres is more important
18+
than low-latency between users and Coderd.
19+
1220
Note that this latency requirement applies _only_ to Coder services. Coder will
13-
operate correctly even with few seconds of latency on
14-
workspace <-> Coder and user <-> Coder connections.
21+
operate correctly even with few seconds of latency on workspace <-> Coder and user <-> Coder
22+
connections.
1523

1624
## Setup
1725

1826
Coder automatically enters HA mode when multiple instances simultaneously connect
1927
to the same Postgres endpoint.
2028

21-
HA brings one configuration variable to set in each Coder
29+
HA brings one configuration variable to set in each Coderd
2230
node: `CODER_DERP_SERVER_RELAY_URL`. The HA nodes use these URLs to communicate
2331
with each other. Inter-node communication is only required while using the
2432
embedded relay (default). If you're using [custom relays](../networking/index.md#custom-relays), Coder ignores `CODER_DERP_SERVER_RELAY_URL` since Postgres is the sole rendezvous for the Coder nodes.

docs/api/enterprise.md

+20-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/api/schemas.md

+25
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)