Skip to content

feat(admission-controller): separate CPU/Memory requests and limits for Auto-Instrumentation Init Containers #41048

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

Open
puretension wants to merge 4 commits into
base: main
Choose a base branch
from
Open

feat(admission-controller): separate CPU/Memory requests and limits for Auto-Instrumentation Init Containers #41048

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b66f82c
feat(admission-controller): separate CPU/Memory requests and limits f…
puretension Sep 18, 2025
04c93ed
fix: use BindEnvAndSetDefault for init container resource configs
puretension Oct 24, 2025
ac8cd17
fix: separate requests and limits auto-calculation logic
puretension Oct 28, 2025
aef56c2
Merge branch 'main' into feat/separate-init-container-requests-limits…
puretension Nov 4, 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
Merge branch 'main' into feat/separate-init-container-requests-limits… 
…-38831
  • Loading branch information
@puretension
puretension authored Nov 4, 2025
commit aef56c270cabbb9376cd7d9cdffdbe99231bed38
18 changes: 9 additions & 9 deletions pkg/config/setup/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -884,18 +884,18 @@ func InitConfig(config pkgconfigmodel.Setup) {
config.BindEnvAndSetDefault("admission_controller.auto_instrumentation.patcher.enabled", false)
config.BindEnvAndSetDefault("admission_controller.auto_instrumentation.patcher.fallback_to_file_provider", false) // to be enabled only in e2e tests
config.BindEnvAndSetDefault("admission_controller.auto_instrumentation.patcher.file_provider_path", "/etc/datadog-agent/patch/auto-instru.json") // to be used only in e2e tests
config.BindEnvAndSetDefault("admission_controller.auto_instrumentation.inject_auto_detected_libraries", true) // allows injecting libraries for languages detected by automatic language detection feature
config.BindEnv("admission_controller.auto_instrumentation.init_resources.cpu")
config.BindEnv("admission_controller.auto_instrumentation.init_resources.memory")
config.BindEnvAndSetDefault("admission_controller.auto_instrumentation.init_requests.cpu", "")
config.BindEnvAndSetDefault("admission_controller.auto_instrumentation.inject_auto_detected_libraries", true)
config.BindEnv("admission_controller.auto_instrumentation.init_resources.cpu") //nolint:forbidigo // TODO: replace by 'SetDefaultAndBindEnv'
config.BindEnv("admission_controller.auto_instrumentation.init_resources.memory") //nolint:forbidigo // TODO: replace by 'SetDefaultAndBindEnv'
config.BindEnv("admission_controller.auto_instrumentation.init_security_context") //nolint:forbidigo // TODO: replace by 'SetDefaultAndBindEnv'
config.BindEnv("admission_controller.auto_instrumentation.asm.enabled", "DD_ADMISSION_CONTROLLER_AUTO_INSTRUMENTATION_APPSEC_ENABLED") //nolint:forbidigo // TODO: replace by 'SetDefaultAndBindEnv' // config for ASM which is implemented in the client libraries
config.BindEnv("admission_controller.auto_instrumentation.iast.enabled", "DD_ADMISSION_CONTROLLER_AUTO_INSTRUMENTATION_IAST_ENABLED") //nolint:forbidigo // TODO: replace by 'SetDefaultAndBindEnv' // config for IAST which is implemented in the client libraries
config.BindEnv("admission_controller.auto_instrumentation.asm_sca.enabled", "DD_ADMISSION_CONTROLLER_AUTO_INSTRUMENTATION_APPSEC_SCA_ENABLED") //nolint:forbidigo // TODO: replace by 'SetDefaultAndBindEnv' // config for SCA
config.BindEnv("admission_controller.auto_instrumentation.profiling.enabled", "DD_ADMISSION_CONTROLLER_AUTO_INSTRUMENTATION_PROFILING_ENABLED") //nolint:forbidigo // TODO: replace by 'SetDefaultAndBindEnv' // config for profiling
config.BindEnvAndSetDefault("admission_controller.auto_instrumentation.init_requests.cpu", "")
config.BindEnvAndSetDefault("admission_controller.auto_instrumentation.init_requests.memory", "")
config.BindEnvAndSetDefault("admission_controller.auto_instrumentation.init_limits.cpu", "")
config.BindEnvAndSetDefault("admission_controller.auto_instrumentation.init_limits.memory", "")
config.BindEnv("admission_controller.auto_instrumentation.init_security_context")
config.BindEnv("admission_controller.auto_instrumentation.asm.enabled", "DD_ADMISSION_CONTROLLER_AUTO_INSTRUMENTATION_APPSEC_ENABLED") // config for ASM which is implemented in the client libraries
config.BindEnv("admission_controller.auto_instrumentation.iast.enabled", "DD_ADMISSION_CONTROLLER_AUTO_INSTRUMENTATION_IAST_ENABLED") // config for IAST which is implemented in the client libraries
config.BindEnv("admission_controller.auto_instrumentation.asm_sca.enabled", "DD_ADMISSION_CONTROLLER_AUTO_INSTRUMENTATION_APPSEC_SCA_ENABLED") // config for SCA
config.BindEnv("admission_controller.auto_instrumentation.profiling.enabled", "DD_ADMISSION_CONTROLLER_AUTO_INSTRUMENTATION_PROFILING_ENABLED") // config for profiling
config.BindEnvAndSetDefault("admission_controller.cws_instrumentation.enabled", false)
config.BindEnvAndSetDefault("admission_controller.cws_instrumentation.pod_endpoint", "/inject-pod-cws")
config.BindEnvAndSetDefault("admission_controller.cws_instrumentation.command_endpoint", "/inject-command-cws")
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.