Skip to content

chore: cherry pick for release 2.22 #17842

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
May 15, 2025
Merged

chore: cherry pick for release 2.22 #17842

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ba2dfd2
feat(cli): use coder connect in `coder ssh --stdio`, if available (#1…
ethanndickson Apr 30, 2025
813e631
fix: create directory before writing coder connect network info file …
ethanndickson May 1, 2025
0d4b15e
feat: improve coder connect tunnel handling on reconnect (#17598)
ibetitsmike May 6, 2025
f51e027
fix: fix prebuild omissions (#17579)
dannykopping Apr 30, 2025
795fba9
fix: fix bug with deletion of prebuilt workspaces (#17652)
evgeniy-scherbina May 1, 2025
b4edac1
fix: fix for prebuilds claiming and deletion (#17624)
evgeniy-scherbina May 1, 2025
3fd9c1a
feat: collect database metrics (#17635)
dannykopping May 2, 2025
ed37b02
fix: move pubsub publishing out of database transactions to avoid con…
dannykopping May 5, 2025
f3bbbef
feat: fetch prebuilds metrics state in background (#17792)
dannykopping May 13, 2025
0d5d268
chore: optimize workspace_latest_builds view query (#17789)
deansheather May 13, 2025
27a1aa0
chore: upgrade `terraform-provider-coder` & `preview` libs (#17738)
dannykopping May 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: fix prebuild omissions (#17579) 
Fixes accidental omission from #17527

---------

Signed-off-by: Danny Kopping <dannykopping@gmail.com>
(cherry picked from commit 6936a7b)
  • Loading branch information
@dannykopping @stirby
dannykopping authored and stirby committed May 14, 2025
commit f51e0277017bc296be0432d7c762e4e0e5f4440a
2 changes: 1 addition & 1 deletion enterprise/coderd/coderd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1166,5 +1166,5 @@ func (api *API) setupPrebuilds(featureEnabled bool) (agplprebuilds.Reconciliatio

reconciler := prebuilds.NewStoreReconciler(api.Database, api.Pubsub, api.DeploymentValues.Prebuilds,
api.Logger.Named("prebuilds"), quartz.NewReal(), api.PrometheusRegistry)
return reconciler, prebuilds.EnterpriseClaimer{}
return reconciler, prebuilds.NewEnterpriseClaimer(api.Database)
}
2 changes: 1 addition & 1 deletion enterprise/coderd/coderd_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ func TestEntitlements_Prebuilds(t *testing.T) {

if tc.expectedEnabled {
require.IsType(t, &prebuilds.StoreReconciler{}, *reconciler)
require.IsType(t, prebuilds.EnterpriseClaimer{}, *claimer)
require.IsType(t, &prebuilds.EnterpriseClaimer{}, *claimer)
} else {
require.Equal(t, &agplprebuilds.DefaultReconciler, reconciler)
require.Equal(t, &agplprebuilds.DefaultClaimer, claimer)
Expand Down