Skip to content

fix(devfile): align with OCP 4.20+ / Dev Spaces 3.25+ container-in-container#540

Merged
cidrblock merged 2 commits intoansible:mainfrom
cidrblock:devfile-ocp-4.20
Mar 18, 2026
Merged

fix(devfile): align with OCP 4.20+ / Dev Spaces 3.25+ container-in-container#540
cidrblock merged 2 commits intoansible:mainfrom
cidrblock:devfile-ocp-4.20

Conversation

@cidrblock
Copy link
Copy Markdown
Collaborator

Summary

Updates the scaffolded devfile so it matches the current ansible-devspaces image and OCP 4.20+ / Dev Spaces 3.25+ behavior (native container-in-container; no kubedock).

Changes

  • Remove KUBEDOCK_ENABLED — Not needed when using native container-in-container; the Dev Spaces operator injects the correct context on 3.25+/4.20+.
  • Remove container args — The ghcr.io/ansible/ansible-devspaces image defines ENTRYPOINT and CMD; overrides are unnecessary.

Alignment

  • Matches the simplified devfile in ansible-dev-tools#709 (no pod-overrides/container-overrides, no args, no kubedock env).
  • New projects created with ansible-creator init or ansible-creator add resource devfile get a devfile that works with the same image and cluster target.

Test

  • Template and playbook/collection fixtures updated and consistent.
  • Manual: ansible-creator init (playbook or collection) and confirm devfile.yaml has no KUBEDOCK_ENABLED or args.

Made with Cursor

…ntainer

- Remove KUBEDOCK_ENABLED env; no longer needed with native
  container-in-container (Dev Spaces operator injects context).
- Remove container args; ansible-devspaces image uses ENTRYPOINT/CMD.

Aligns scaffolded devfile with ansible/ansible-dev-tools#709.

Made-with: Cursor
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Removes legacy container overrides from the devfile scaffolding template and updates fixture devfiles accordingly, aligning generated devfiles with the default behavior of the ansible-devspaces image.

Changes:

  • Removed the container args: ["tail", "-f", "/dev/null"] override from devfile template and fixtures.
  • Removed the KUBEDOCK_ENABLED environment variable from devfile template and fixtures.
  • Removed KUBEDOCK from the repository dictionary list.

Reviewed changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated no comments.

File Description
tests/fixtures/project/playbook_project/devfile.yaml Updates expected scaffolded devfile fixture to match new template output.
tests/fixtures/collection/testorg/testcol/devfile.yaml Updates expected scaffolded devfile fixture to match new template output.
src/ansible_creator/resources/common/devfile/devfile.yaml.j2 Removes KUBEDOCK env var and tail -f /dev/null args from generated devfile.
.config/dictionary.txt Removes now-unused KUBEDOCK dictionary entry.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

You can also share your feedback on Copilot code review. Take the survey.

@cidrblock cidrblock merged commit 9c55d5c into ansible:main Mar 18, 2026
21 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

3 participants