Skip to content

[Backport 7.65.x] [clusteragent] Fix wrong computation of the init container resources #36756

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.

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 1 commit into from
May 9, 2025

Conversation

agent-platform-auto-pr[bot]
Copy link
Contributor

Backport 3729a76 from #35588.


What does this PR do?

Fix wrong computation of the init container resources, introduced in #30266

If a request was set but not the limit, the computed request for the init containers could be higher than the computed limit. This is invalid and causes the deployment to fail.

To fix that, in case there is a request but no limit, we use the request as the limit.

Motivation

Fix #35170 / https://datadoghq.atlassian.net/browse/CONS-7154 / https://datadoghq.atlassian.net/browse/INPLAT-529

Describe how you validated your changes

Unit test
+
manually using

# values.yaml
datadog:
  logLevel: DEBUG
  clusterName: my-test-cluster
  apiKeyExistingSecret: datadog-secret
  appKeyExistingSecret: datadog-secret
  logs:
    enabled: true
    containerCollectAll: true
    containerCollectUsingFiles: true
  kubelet:
    tlsVerify: false
  apm:
    instrumentation:
      enabled: true
clusterAgent:
  admissionController:
    enabled: true


# deploy.yaml
apiVersion: apps/v1
kind: Deployment
metadata:
  name: demo
  namespace: init
  labels:
    app: init-container-test
spec:
  replicas: 1
  selector:
    matchLabels:
      app: init-container-test
  template:
    metadata:
      labels:
        app: init-container-test
    spec:
      containers:
        - name: container1
          image: busybox
          command: ["sleep", "3600"]
          resources:
            limits:
              cpu: 100m
              memory: 128Mi
            requests:
              cpu: 100m
              memory: 128Mi
        - name: container2
          image: busybox
          command: ["sleep", "3600"]
          resources:
            limits:
              # cpu: 50m    <- uncommenting this allows the pod to be created
              memory: 128Mi
            requests:
              cpu: 50m
              memory: 128Mi

With cluster agent 7.64, the deployment of the app results in a failure:

Pod "demo-57667dd664-q8h7z" is invalid: [spec.initContainers[0].resources.requests: Invalid value: "150m": must be less than or equal to cpu limit of 100m, spec.initContainers[1].resources.requests: Invalid value: "150m": must be less than or equal to cpu limit of 100m,

With this PR, the deployment is successful.

Possible Drawbacks / Trade-offs

Additional Notes

<!--

  • Anything else we should know when reviewing?
  • Include benchmarking information here whenever possible.
  • Include info about alternatives that were considered and why the proposed
    version was chosen.
    -->

@agent-platform-auto-pr agent-platform-auto-pr bot requested review from a team as code owners May 7, 2025 15:17
@agent-platform-auto-pr agent-platform-auto-pr bot requested a review from a team as a code owner May 7, 2025 15:17
@agent-platform-auto-pr agent-platform-auto-pr bot added bot medium review PR review might take time team/injection-platform qa/rc-required Only for a PR that requires validation on the Release Candidate labels May 7, 2025
@agent-platform-auto-pr agent-platform-auto-pr bot requested a review from stanistan May 7, 2025 15:17
@agent-platform-auto-pr
Copy link
Contributor Author

[Fast Unit Tests Report]

On pipeline 64417411 (CI Visibility). The following jobs did not run any unit tests:

Jobs:
  • tests_flavor_dogstatsd_deb-x64
  • tests_flavor_heroku_deb-x64
  • tests_flavor_iot_deb-x64

If you modified Go files and expected unit tests to run in these jobs, please double check the job logs. If you think tests should have been executed reach out to #agent-devx-help

@agent-platform-auto-pr
Copy link
Contributor Author

Test changes on VM

Use this command from test-infra-definitions to manually test this PR changes on a VM:

dda inv aws.create-vm --pipeline-id=64417411 --os-family=ubuntu

Note: This applies to commit 148d652

@agent-platform-auto-pr
Copy link
Contributor Author

Uncompressed package size comparison

Comparison with ancestor 59c87a0602587d6b02fbbcab5532699462369dfe

Size reduction summary
package diff status size ancestor threshold
datadog-agent-x86_64-rpm -0.68MB 815.57MB 816.25MB 0.50MB
datadog-agent-x86_64-suse -0.68MB 815.57MB 816.25MB 0.50MB
datadog-agent-aarch64-rpm -0.75MB 806.55MB 807.29MB 0.50MB
Diff per package
package diff status size ancestor threshold
datadog-agent-amd64-deb 0.23MB ⚠️ 806.67MB 806.44MB 0.50MB
datadog-agent-arm64-deb 0.16MB ⚠️ 797.66MB 797.51MB 0.50MB
datadog-heroku-agent-amd64-deb 0.13MB ⚠️ 442.01MB 441.88MB 0.50MB
datadog-iot-agent-x86_64-rpm 0.01MB ⚠️ 61.07MB 61.06MB 0.50MB
datadog-iot-agent-x86_64-suse 0.01MB ⚠️ 61.07MB 61.06MB 0.50MB
datadog-iot-agent-aarch64-rpm 0.01MB ⚠️ 58.37MB 58.35MB 0.50MB
datadog-iot-agent-amd64-deb 0.01MB ⚠️ 61.00MB 60.99MB 0.50MB
datadog-iot-agent-arm64-deb 0.01MB ⚠️ 58.29MB 58.28MB 0.50MB
datadog-dogstatsd-x86_64-rpm 0.01MB ⚠️ 39.44MB 39.43MB 0.50MB
datadog-dogstatsd-x86_64-suse 0.01MB ⚠️ 39.44MB 39.43MB 0.50MB
datadog-dogstatsd-amd64-deb 0.01MB ⚠️ 39.36MB 39.35MB 0.50MB
datadog-dogstatsd-arm64-deb 0.01MB ⚠️ 37.89MB 37.88MB 0.50MB

Decision

⚠️ Warning

@agent-platform-auto-pr
Copy link
Contributor Author

Static quality checks ✅

Please find below the results from static quality gates

Successful checks

Info

Result Quality gate On disk size On disk size limit On wire size On wire size limit
static_quality_gate_agent_deb_amd64 779.48 MiB 801.8 MiB 189.77 MiB 202.62 MiB
static_quality_gate_agent_deb_arm64 770.87 MiB 793.14 MiB 172.49 MiB 184.51 MiB
static_quality_gate_agent_rpm_amd64 779.47 MiB 801.79 MiB 192.39 MiB 205.03 MiB
static_quality_gate_agent_rpm_arm64 770.85 MiB 793.09 MiB 173.43 MiB 186.44 MiB
static_quality_gate_agent_suse_amd64 779.47 MiB 801.81 MiB 192.39 MiB 205.03 MiB
static_quality_gate_agent_suse_arm64 770.85 MiB 793.14 MiB 173.43 MiB 186.44 MiB
static_quality_gate_dogstatsd_deb_amd64 37.61 MiB 47.67 MiB 9.75 MiB 19.78 MiB
static_quality_gate_dogstatsd_deb_arm64 36.21 MiB 46.27 MiB 8.46 MiB 18.49 MiB
static_quality_gate_dogstatsd_rpm_amd64 37.61 MiB 47.67 MiB 9.76 MiB 19.79 MiB
static_quality_gate_dogstatsd_suse_amd64 37.61 MiB 47.67 MiB 9.76 MiB 19.79 MiB
static_quality_gate_iot_agent_deb_amd64 58.25 MiB 69.0 MiB 14.72 MiB 24.8 MiB
static_quality_gate_iot_agent_deb_arm64 55.67 MiB 66.4 MiB 12.72 MiB 22.8 MiB
static_quality_gate_iot_agent_rpm_amd64 58.25 MiB 69.0 MiB 14.74 MiB 24.8 MiB
static_quality_gate_iot_agent_rpm_arm64 55.67 MiB 66.4 MiB 12.75 MiB 22.8 MiB
static_quality_gate_iot_agent_suse_amd64 58.25 MiB 69.0 MiB 14.74 MiB 24.8 MiB
static_quality_gate_docker_agent_amd64 864.58 MiB 886.12 MiB 290.39 MiB 304.21 MiB
static_quality_gate_docker_agent_arm64 879.25 MiB 900.79 MiB 276.83 MiB 290.47 MiB
static_quality_gate_docker_agent_jmx_amd64 1.04 GiB 1.06 GiB 365.49 MiB 379.33 MiB
static_quality_gate_docker_agent_jmx_arm64 1.04 GiB 1.06 GiB 347.92 MiB 361.55 MiB
static_quality_gate_docker_dogstatsd_amd64 45.75 MiB 55.78 MiB 17.26 MiB 27.28 MiB
static_quality_gate_docker_dogstatsd_arm64 44.38 MiB 54.45 MiB 16.13 MiB 26.16 MiB
static_quality_gate_docker_cluster_agent_amd64 262.17 MiB 274.78 MiB 104.79 MiB 116.28 MiB
static_quality_gate_docker_cluster_agent_arm64 278.12 MiB 290.82 MiB 99.65 MiB 111.12 MiB

Copy link

Regression Detector

Regression Detector Results

Metrics dashboard
Target profiles
Run ID: 9a098247-9188-4f7f-9e1f-528dc2de789d

Baseline: 88ff632
Comparison: 148d652
Diff

Optimization Goals: ✅ No significant changes detected

Fine details of change detection per experiment

perf experiment goal Δ mean % Δ mean % CI trials links
quality_gate_logs % cpu utilization +2.36 [-0.53, +5.25] 1 Logs
uds_dogstatsd_20mb_12k_contexts_20_senders memory utilization +0.27 [+0.23, +0.31] 1 Logs
file_to_blackhole_1000ms_latency egress throughput +0.08 [-0.69, +0.85] 1 Logs
file_to_blackhole_300ms_latency egress throughput +0.02 [-0.61, +0.65] 1 Logs
file_to_blackhole_0ms_latency egress throughput +0.01 [-0.87, +0.89] 1 Logs
uds_dogstatsd_to_api ingress throughput +0.01 [-0.27, +0.28] 1 Logs
tcp_dd_logs_filter_exclude ingress throughput +0.00 [-0.02, +0.03] 1 Logs
file_to_blackhole_500ms_latency egress throughput -0.02 [-0.80, +0.76] 1 Logs
file_to_blackhole_0ms_latency_http1 egress throughput -0.02 [-0.84, +0.79] 1 Logs
file_to_blackhole_100ms_latency egress throughput -0.03 [-0.73, +0.67] 1 Logs
tcp_syslog_to_blackhole ingress throughput -0.04 [-0.11, +0.02] 1 Logs
file_to_blackhole_0ms_latency_http2 egress throughput -0.04 [-0.90, +0.82] 1 Logs
quality_gate_idle memory utilization -0.08 [-0.16, -0.01] 1 Logs bounds checks dashboard
file_to_blackhole_1000ms_latency_linear_load egress throughput -0.20 [-0.67, +0.26] 1 Logs
uds_dogstatsd_to_api_cpu % cpu utilization -0.24 [-1.06, +0.58] 1 Logs
file_tree memory utilization -0.60 [-0.81, -0.39] 1 Logs
quality_gate_idle_all_features memory utilization -1.50 [-1.64, -1.37] 1 Logs bounds checks dashboard

Bounds Checks: ✅ Passed

perf experiment bounds_check_name replicates_passed links
file_to_blackhole_0ms_latency lost_bytes 10/10
file_to_blackhole_0ms_latency memory_usage 10/10
file_to_blackhole_0ms_latency_http1 lost_bytes 10/10
file_to_blackhole_0ms_latency_http1 memory_usage 10/10
file_to_blackhole_0ms_latency_http2 lost_bytes 10/10
file_to_blackhole_0ms_latency_http2 memory_usage 10/10
file_to_blackhole_1000ms_latency memory_usage 10/10
file_to_blackhole_1000ms_latency_linear_load memory_usage 10/10
file_to_blackhole_100ms_latency lost_bytes 10/10
file_to_blackhole_100ms_latency memory_usage 10/10
file_to_blackhole_300ms_latency lost_bytes 10/10
file_to_blackhole_300ms_latency memory_usage 10/10
file_to_blackhole_500ms_latency lost_bytes 10/10
file_to_blackhole_500ms_latency memory_usage 10/10
quality_gate_idle intake_connections 10/10 bounds checks dashboard
quality_gate_idle memory_usage 10/10 bounds checks dashboard
quality_gate_idle_all_features intake_connections 10/10 bounds checks dashboard
quality_gate_idle_all_features memory_usage 10/10 bounds checks dashboard
quality_gate_logs intake_connections 10/10
quality_gate_logs lost_bytes 10/10
quality_gate_logs memory_usage 10/10

Explanation

Confidence level: 90.00%
Effect size tolerance: |Δ mean %| ≥ 5.00%

Performance changes are noted in the perf column of each table:

  • ✅ = significantly better comparison variant performance
  • ❌ = significantly worse comparison variant performance
  • ➖ = no significant change in performance

A regression test is an A/B test of target performance in a repeatable rig, where "performance" is measured as "comparison variant minus baseline variant" for an optimization goal (e.g., ingress throughput). Due to intrinsic variability in measuring that goal, we can only estimate its mean value for each experiment; we report uncertainty in that value as a 90.00% confidence interval denoted "Δ mean % CI".

For each experiment, we decide whether a change in performance is a "regression" -- a change worth investigating further -- if all of the following criteria are true:

  1. Its estimated |Δ mean %| ≥ 5.00%, indicating the change is big enough to merit a closer look.

  2. Its 90.00% confidence interval "Δ mean % CI" does not contain zero, indicating that if our statistical model is accurate, there is at least a 90.00% chance there is a difference in performance between baseline and comparison variants.

  3. Its configuration does not mark it "erratic".

CI Pass/Fail Decision

Passed. All Quality Gates passed.

  • quality_gate_logs, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check lost_bytes: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_idle, bounds check intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_idle, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_idle_all_features, bounds check intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_idle_all_features, bounds check memory_usage: 10/10 replicas passed. Gate passed.

@buraizu buraizu self-assigned this May 7, 2025
@FlorentClarret FlorentClarret merged commit cca933d into 7.65.x May 9, 2025
292 of 294 checks passed
@FlorentClarret FlorentClarret deleted the backport-35588-to-7.65.x branch May 9, 2025 06:35
@github-actions github-actions bot added this to the 7.65.2 milestone May 9, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport bot medium review PR review might take time qa/rc-required Only for a PR that requires validation on the Release Candidate team/injection-platform
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants