Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitbf94ab0

Browse files
committed
Merge branch 'main' into dk/bridge-docs
2 parents584c52c +be22c38 commitbf94ab0

File tree

11 files changed

+712
-19
lines changed

11 files changed

+712
-19
lines changed

‎cli/exp_scaletest.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ func (r *RootCmd) scaletestCmd() *serpent.Command {
6060
Children: []*serpent.Command{
6161
r.scaletestCleanup(),
6262
r.scaletestDashboard(),
63+
r.scaletestDynamicParameters(),
6364
r.scaletestCreateWorkspaces(),
6465
r.scaletestWorkspaceUpdates(),
6566
r.scaletestWorkspaceTraffic(),
Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
//go:build !slim
2+
3+
package cli
4+
5+
import (
6+
"fmt"
7+
8+
"github.com/prometheus/client_golang/prometheus"
9+
"golang.org/x/xerrors"
10+
11+
"cdr.dev/slog"
12+
"cdr.dev/slog/sloggers/sloghuman"
13+
14+
"github.com/coder/coder/v2/scaletest/dynamicparameters"
15+
"github.com/coder/coder/v2/scaletest/harness"
16+
"github.com/coder/serpent"
17+
)
18+
19+
const (
20+
dynamicParametersTestName="dynamic-parameters"
21+
)
22+
23+
func (r*RootCmd)scaletestDynamicParameters()*serpent.Command {
24+
vartemplateNamestring
25+
varnumEvalsint64
26+
orgContext:=NewOrganizationContext()
27+
output:=&scaletestOutputFlags{}
28+
29+
cmd:=&serpent.Command{
30+
Use:"dynamic-parameters",
31+
Short:"Generates load on the Coder server evaluating dynamic parameters",
32+
Long:`It is recommended that all rate limits are disabled on the server before running this scaletest. This test generates many login events which will be rate limited against the (most likely single) IP.`,
33+
Handler:func(inv*serpent.Invocation)error {
34+
ctx:=inv.Context()
35+
36+
outputs,err:=output.parse()
37+
iferr!=nil {
38+
returnxerrors.Errorf("could not parse --output flags")
39+
}
40+
41+
client,err:=r.InitClient(inv)
42+
iferr!=nil {
43+
returnerr
44+
}
45+
iftemplateName=="" {
46+
returnxerrors.Errorf("template cannot be empty")
47+
}
48+
49+
org,err:=orgContext.Selected(inv,client)
50+
iferr!=nil {
51+
returnerr
52+
}
53+
54+
logger:=slog.Make(sloghuman.Sink(inv.Stdout)).Leveled(slog.LevelDebug)
55+
partitions,err:=dynamicparameters.SetupPartitions(ctx,client,org.ID,templateName,numEvals,logger)
56+
iferr!=nil {
57+
returnxerrors.Errorf("setup dynamic parameters partitions: %w",err)
58+
}
59+
60+
th:=harness.NewTestHarness(harness.ConcurrentExecutionStrategy{}, harness.ConcurrentExecutionStrategy{})
61+
reg:=prometheus.NewRegistry()
62+
metrics:=dynamicparameters.NewMetrics(reg,"concurrent_evaluations")
63+
64+
fori,part:=rangepartitions {
65+
forj:=rangepart.ConcurrentEvaluations {
66+
cfg:= dynamicparameters.Config{
67+
TemplateVersion:part.TemplateVersion.ID,
68+
Metrics:metrics,
69+
MetricLabelValues: []string{fmt.Sprintf("%d",part.ConcurrentEvaluations)},
70+
}
71+
runner:=dynamicparameters.NewRunner(client,cfg)
72+
th.AddRun(dynamicParametersTestName,fmt.Sprintf("%d/%d",j,i),runner)
73+
}
74+
}
75+
76+
err=th.Run(ctx)
77+
iferr!=nil {
78+
returnxerrors.Errorf("run test harness: %w",err)
79+
}
80+
81+
res:=th.Results()
82+
for_,o:=rangeoutputs {
83+
err=o.write(res,inv.Stdout)
84+
iferr!=nil {
85+
returnxerrors.Errorf("write output %q to %q: %w",o.format,o.path,err)
86+
}
87+
}
88+
89+
returnnil
90+
},
91+
}
92+
93+
cmd.Options= serpent.OptionSet{
94+
{
95+
Flag:"template",
96+
Description:"Name of the template to use. If it does not exist, it will be created.",
97+
Default:"scaletest-dynamic-parameters",
98+
Value:serpent.StringOf(&templateName),
99+
},
100+
{
101+
Flag:"concurrent-evaluations",
102+
Description:"Number of concurrent dynamic parameter evaluations to perform.",
103+
Default:"100",
104+
Value:serpent.Int64Of(&numEvals),
105+
},
106+
}
107+
orgContext.AttachOptions(cmd)
108+
output.attach(&cmd.Options)
109+
returncmd
110+
}

‎codersdk/client.go‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -519,6 +519,16 @@ func (e *Error) Error() string {
519519
returnbuilder.String()
520520
}
521521

522+
// NewTestError is a helper function to create a Error, setting the internal fields. It's generally only useful for
523+
// testing.
524+
funcNewTestError(statusCodeint,methodstring,ustring)*Error {
525+
return&Error{
526+
statusCode:statusCode,
527+
method:method,
528+
url:u,
529+
}
530+
}
531+
522532
typecloseFuncfunc()error
523533

524534
func (ccloseFunc)Close()error {

‎docs/install/kubernetes.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ We support two release channels: mainline and stable - read the
136136
helm install coder coder-v2/coder \
137137
--namespace coder \
138138
--values values.yaml \
139-
--version 2.26.0
139+
--version 2.27.0
140140
```
141141

142142
-**OCI Registry**
@@ -147,7 +147,7 @@ We support two release channels: mainline and stable - read the
147147
helm install coder oci://ghcr.io/coder/chart/coder \
148148
--namespace coder \
149149
--values values.yaml \
150-
--version 2.26.0
150+
--version 2.27.0
151151
```
152152

153153
-**Stable** Coder release:
@@ -160,7 +160,7 @@ We support two release channels: mainline and stable - read the
160160
helm install coder coder-v2/coder \
161161
--namespace coder \
162162
--values values.yaml \
163-
--version 2.25.2
163+
--version 2.26.1
164164
```
165165

166166
-**OCI Registry**
@@ -171,7 +171,7 @@ We support two release channels: mainline and stable - read the
171171
helm install coder oci://ghcr.io/coder/chart/coder \
172172
--namespace coder \
173173
--values values.yaml \
174-
--version 2.25.2
174+
--version 2.26.1
175175
```
176176

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

‎docs/install/rancher.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ kubectl create secret generic coder-db-url -n coder \
134134

135135
1. Select a Coder version:
136136

137-
-**Mainline**:`2.20.x`
138-
-**Stable**:`2.19.x`
137+
-**Mainline**:`2.27.0`
138+
-**Stable**:`2.26.1`
139139

140140
Learn more about release channels in the[Releases documentation](./releases/index.md).
141141

‎docs/install/releases/index.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,13 @@ pages.
5757
<!-- RELEASE_CALENDAR_START-->
5858
| Release name| Release Date| Status| Latest Release|
5959
|------------------------------------------------|--------------------|------------------|----------------------------------------------------------------|
60-
|[2.21](https://coder.com/changelog/coder-2-21)| April 02, 2025| Not Supported|[v2.21.3](https://github.com/coder/coder/releases/tag/v2.21.3)|
6160
|[2.22](https://coder.com/changelog/coder-2-22)| May 16, 2025| Not Supported|[v2.22.1](https://github.com/coder/coder/releases/tag/v2.22.1)|
62-
|[2.23](https://coder.com/changelog/coder-2-23)| June 03, 2025| Security Support|[v2.23.2](https://github.com/coder/coder/releases/tag/v2.23.4)|
63-
|[2.24](https://coder.com/changelog/coder-2-24)| August 07, 2025| Security Support|[v2.24.3](https://github.com/coder/coder/releases/tag/v2.24.3)|
64-
|[2.25](https://coder.com/changelog/coder-2-25)| September 04, 2025| Stable|[v2.25.2](https://github.com/coder/coder/releases/tag/v2.25.2)|
65-
|[2.26](https://coder.com/changelog/coder-2-26)| September 02, 2025| Mainline|[v2.26.0](https://github.com/coder/coder/releases/tag/v2.26.0)|
66-
| 2.27| October 07, 2025| Not Released| N/A|
61+
|[2.23](https://coder.com/changelog/coder-2-23)| June 03, 2025| Not Supported|[v2.23.5](https://github.com/coder/coder/releases/tag/v2.23.5)|
62+
|[2.24](https://coder.com/changelog/coder-2-24)| July 01, 2025| Not Supported|[v2.24.4](https://github.com/coder/coder/releases/tag/v2.24.4)|
63+
|[2.25](https://coder.com/changelog/coder-2-25)| August 05, 2025| Security Support|[v2.25.3](https://github.com/coder/coder/releases/tag/v2.25.3)|
64+
|[2.26](https://coder.com/changelog/coder-2-26)| September 03, 2025| Stable|[v2.26.1](https://github.com/coder/coder/releases/tag/v2.26.1)|
65+
|[2.27](https://coder.com/changelog/coder-2-27)| October 02, 2025| Mainline|[v2.27.0](https://github.com/coder/coder/releases/tag/v2.27.0)|
66+
| 2.28|| Not Released| N/A|
6767
<!-- RELEASE_CALENDAR_END-->
6868

6969
>[!TIP]

‎scaletest/dynamicparameters/config.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import "github.com/google/uuid"
44

55
typeConfigstruct {
66
TemplateVersion uuid.UUID`json:"template_version"`
7-
SessionTokenstring`json:"session_token"`
87
Metrics*Metrics`json:"-"`
98
MetricLabelValues []string`json:"metric_label_values"`
109
}

‎scaletest/dynamicparameters/run.go‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,8 @@ type Runner struct {
2222
var_ harness.Runnable=&Runner{}
2323

2424
funcNewRunner(client*codersdk.Client,cfgConfig)*Runner {
25-
clone:=codersdk.New(client.URL)
26-
clone.HTTPClient=client.HTTPClient
27-
clone.SetLogger(client.Logger())
28-
clone.SetSessionToken(cfg.SessionToken)
2925
return&Runner{
30-
client:clone,
26+
client:client,
3127
cfg:cfg,
3228
}
3329
}

‎scaletest/dynamicparameters/run_test.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ func TestRun(t *testing.T) {
3737
reg:=prometheus.NewRegistry()
3838
cfg:= dynamicparameters.Config{
3939
TemplateVersion:version.ID,
40-
SessionToken:userClient.SessionToken(),
4140
Metrics:dynamicparameters.NewMetrics(reg,"template","test_label_name"),
4241
MetricLabelValues: []string{template.Name,"test_label_value"},
4342
}

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp