Skip to content

feat(featureflags): add build-kernel-version flag for new builds #2592

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
ValentaTomas merged 5 commits into from
May 8, 2026
Merged

feat(featureflags): add build-kernel-version flag for new builds #2592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c68ff37
feat(featureflags): add build-kernel-version flag for new builds
ValentaTomas May 8, 2026
c051086
fix(featureflags): fall back to DefaultKernelVersion when LD flag is …
ValentaTomas May 8, 2026
34c8134
refactor(featureflags): bake empty-fallback into StringFlag opt-in
ValentaTomas May 8, 2026
c9309f1
revert(featureflags): drop StringFlag empty-fallback opt-in
ValentaTomas May 8, 2026
127ca29
chore(api): drop dead Config.DefaultKernelVersion field
ValentaTomas May 8, 2026
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
9 changes: 0 additions & 9 deletions packages/api/internal/cfg/model.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ import (

"github.com/caarlos0/env/v11"
"github.com/golang-jwt/jwt/v5"

"github.com/e2b-dev/infra/packages/shared/pkg/featureflags"
)

const (
Expand Down Expand Up @@ -67,9 +65,6 @@ type Config struct {
// tokens signed with the old secret for some time.
SupabaseJWTSecrets []string `env:"SUPABASE_JWT_SECRETS"`

// Deprecated: Template manager should use its own
DefaultKernelVersion string `env:"DEFAULT_KERNEL_VERSION"`

DefaultPersistentVolumeType string `env:"DEFAULT_PERSISTENT_VOLUME_TYPE"`

// SandboxStorageBackend selects the sandbox storage implementation.
Expand Down Expand Up @@ -138,10 +133,6 @@ func Parse() (Config, error) {
return Config{}, err
}

if config.DefaultKernelVersion == "" {
config.DefaultKernelVersion = featureflags.DefaultKernelVersion
}

if config.AuthDBConnectionString == "" {
config.AuthDBConnectionString = config.PostgresConnectionString
}
Expand Down
9 changes: 5 additions & 4 deletions packages/api/internal/handlers/deprecated_template_request_build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,10 +160,11 @@ func (a *APIStore) buildTemplate(
templateID api.TemplateID,
body api.TemplateBuildRequest,
) (*template.RegisterBuildResponse, *api.APIError) {
// TODO(ENG-3852): Stop sending the firecracker version from the API. The orchestrator
// now resolves its own FC version via the FirecrackerVersions feature flag
// (see packages/orchestrator/pkg/template/build/builder.go)
// TODO(ENG-3852): Stop sending the firecracker/kernel versions from the API.
// The orchestrator resolves them itself via the BuildFirecrackerVersion /
// BuildKernelVersion feature flags (see packages/orchestrator/pkg/template/server/create_template.go).
firecrackerVersion := a.featureFlags.StringFlag(ctx, featureflags.BuildFirecrackerVersion)
kernelVersion := a.featureFlags.StringFlag(ctx, featureflags.BuildKernelVersion)

var alias *string
var tags []string
Expand Down Expand Up @@ -206,7 +207,7 @@ func (a *APIStore) buildTemplate(
CpuCount: body.CpuCount,
MemoryMB: body.MemoryMB,
Version: templates.TemplateV1Version,
KernelVersion: a.config.DefaultKernelVersion,
KernelVersion: kernelVersion,
Comment thread
ValentaTomas marked this conversation as resolved.
FirecrackerVersion: firecrackerVersion,
}

Expand Down
9 changes: 5 additions & 4 deletions packages/api/internal/handlers/template_request_build_v3.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,11 @@ func requestTemplateBuild(ctx context.Context, c *gin.Context, a *APIStore, body
}
span.End()

// TODO(ENG-3852): Stop sending the firecracker version from the API. The orchestrator
// now resolves its own FC version via the FirecrackerVersions feature flag
// (see packages/orchestrator/pkg/template/build/builder.go)
// TODO(ENG-3852): Stop sending the firecracker/kernel versions from the API.
// The orchestrator resolves them itself via the BuildFirecrackerVersion /
// BuildKernelVersion feature flags (see packages/orchestrator/pkg/template/server/create_template.go).
firecrackerVersion := a.featureFlags.StringFlag(ctx, featureflags.BuildFirecrackerVersion)
kernelVersion := a.featureFlags.StringFlag(ctx, featureflags.BuildKernelVersion)
buildReq := template.RegisterBuildData{
ClusterID: clusters.WithClusterFallback(team.ClusterID),
TemplateID: templateID,
Expand All @@ -129,7 +130,7 @@ func requestTemplateBuild(ctx context.Context, c *gin.Context, a *APIStore, body
CpuCount: body.CpuCount,
MemoryMB: body.MemoryMB,
Version: templates.TemplateV2LatestVersion,
KernelVersion: a.config.DefaultKernelVersion,
KernelVersion: kernelVersion,
FirecrackerVersion: firecrackerVersion,
}

Expand Down
2 changes: 1 addition & 1 deletion packages/orchestrator/pkg/template/server/create_template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func (s *ServerStore) TemplateCreate(ctx context.Context, templateRequest *templ
featureflags.TeamContext(cfg.GetTeamID()),
)

kernelVersion := featureflags.DefaultKernelVersion
kernelVersion := s.featureFlags.StringFlag(ctx, featureflags.BuildKernelVersion)
firecrackerVersion := s.featureFlags.StringFlag(ctx, featureflags.BuildFirecrackerVersion)

fcInfo, err := fcversion.New(firecrackerVersion)
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/pkg/featureflags/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,6 @@ func NewStringFlag(name string, fallback string) StringFlag {
return flag
}

// This is currently not configurable via feature flags.
const (
DefaultKernelVersion = "vmlinux-6.1.158"
)
Expand All @@ -261,6 +260,7 @@ var FirecrackerVersionMap = map[string]string{
// BuildIoEngine Sync is used by default as there seems to be a bad interaction between Async and a lot of io operations.
var (
BuildFirecrackerVersion = NewStringFlag("build-firecracker-version", env.GetEnv("DEFAULT_FIRECRACKER_VERSION", DefaultFirecrackerVersion))
BuildKernelVersion = NewStringFlag("build-kernel-version", env.GetEnv("DEFAULT_KERNEL_VERSION", DefaultKernelVersion))
BuildIoEngine = NewStringFlag("build-io-engine", "Sync")
DefaultPersistentVolumeType = NewStringFlag("default-persistent-volume-type", "")
BuildNodeInfo = NewJSONFlag("preferred-build-node", ldvalue.Null())
Expand Down
Loading