Skip to content

fix(test): preserve sidecars and fix pod deletion timeout in tests#274

Merged
fdelbrayelle merged 2 commits intomainfrom
fix/sidecar-test-pod-deletion-timeout
Mar 30, 2026
Merged

fix(test): preserve sidecars and fix pod deletion timeout in tests#274
fdelbrayelle merged 2 commits intomainfrom
fix/sidecar-test-pod-deletion-timeout

Conversation

@fdelbrayelle
Copy link
Copy Markdown
Member

Summary

Port of kestra-io/plugin-ee-kubernetes#104 to this repository.

  • Add podSpecSidecarsPreserved test: verifies that user-defined sidecar containers (not using reserved names) are preserved alongside Kestra's file-transfer containers when outputFiles is configured.
  • Add containerDefaultSpecEnvMerging test: verifies that env vars from containerDefaultSpec are correctly merged with container-specific vars (container wins on collision).
  • Fix sidecar command from sleep 300 to echo sidecar-done so the pod can be deleted promptly after assertions, avoiding CI timeout.

Test plan

  • podSpecSidecarsPreserved passes
  • containerDefaultSpecEnvMerging passes

Mirror of kestra-io/plugin-ee-kubernetes#104: the sidecar used `sleep 300`
which kept the pod alive and caused the deletion wait to time out in CI.
Replaced with `echo sidecar-done` so the sidecar exits immediately after
the assertions are done.
…ision

Port of kestra-io/plugin-ee-kubernetes#104:
- AbstractPod: fix env var merging in containerDefaultSpec — container-specific
  values now correctly win over defaults on name collision (previously defaults
  were prepended, which could cause duplicate env var names)
- AbstractPod: extract mergeEnvVars() helper used in both mergeContainerDefaults
  and applySidecarDefaultSpec
- PodCreate: add removeReservedContainers() to strip any user-provided containers
  named init-files/out-files before Kestra injects its own file-transfer containers
- PodCreate: improve spec description to document sidecar preservation behaviour
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Mar 30, 2026

📦 Artifacts

Name Size Updated Expiration
jar 21.59 MB Mar 30, 26, 8:52:19 AM UTC Apr 6, 26, 8:52:18 AM UTC

🧪 Java Unit Tests

TestsPassed ✅SkippedFailedTime ⏱
Java Tests Report48 ran48 ✅0 ⚠️0 ❌2m 22s 418ms

🛡 Trivy

Vulnerability in: Java

Vulnerability Severity Package Installed Version Fixed Version
GHSA-72hv-8253-57qq HIGH com.fasterxml.jackson.core:jackson-core 2.20.1 2.18.6, 2.21.1, 3.1.0
CVE-2025-67735 MEDIUM io.netty:netty-codec-http 4.2.5.Final 4.2.8.Final, 4.1.129.Final

🔁 Unreleased Commits

3 commits since v1.6.3

SHA Title Author Date
4740a8b chore(deps): bump io.kestra.gradle.inject-bom-versions (#272) dependabot[bot] Mar 30, 26, 6:44:37 AM UTC
f9b65fe chore(deps): bump com.gradleup.shadow from 9.4.0 to 9.4.1 (#270) dependabot[bot] Mar 30, 26, 6:44:44 AM UTC
8ff01d3 chore(deps): bump io.kestra.gradle.spotless-conventions (#271) dependabot[bot] Mar 30, 26, 6:45:41 AM UTC

@fdelbrayelle fdelbrayelle merged commit dc56183 into main Mar 30, 2026
6 checks passed
@fdelbrayelle fdelbrayelle deleted the fix/sidecar-test-pod-deletion-timeout branch March 30, 2026 15:52
@github-project-automation github-project-automation Bot moved this from To review to Done in Pull Requests Mar 30, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

2 participants