Skip to content

Fix for Dockerfile conflict with sonar + agent and tools missing distros propagation #328

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

Jump to bottom
Merged
merged 2 commits into from
Aug 11, 2025
Merged

Fix for Dockerfile conflict with sonar + agent and tools missing distros propagation #328

merged 2 commits into from
Aug 11, 2025

Conversation

MaciejKaras
Copy link
Collaborator

@MaciejKaras MaciejKaras commented Aug 8, 2025 •
edited
Loading

Summary

Fixes issue with conflicting Dockerfile files on master. Sonar is creating Dockerfiles in the directory where new Dockerfile existed already. They were added here -> #289.

Additionally another PR #267 made changes to how the agent images were built and especially to agent Dockerfile ARGs:

mongodb-kubernetes/docker/mongodb-agent/Dockerfile

Lines 3 to 6 in 89866b7

ARG agent_version
ARG agent_distro
ARG tools_version
ARG tools_distro

This conflicted with #303 where new atomic_pipeline.py was still depending on the old Dockerfile structure:

mongodb-kubernetes/docker/mongodb-agent/Dockerfile

Lines 25 to 26 in 774bbac

ARG mongodb_tools_url_ubi
ARG mongodb_agent_url_ubi

Proof of Work

Passing CI (especially agent build task)

Checklist

  • Have you linked a jira ticket and/or is the ticket in the title?
  • Have you checked whether your jira ticket required DOCSP changes?
  • Have you added changelog file?

@github-actions GitHub Actions
Copy link

github-actions bot commented Aug 8, 2025

⚠️ (this preview might not be accurate if the PR is not rebased on current master branch)

MCK 1.3.0 Release Notes

Bug Fixes

  • This change fixes the current complex and difficult-to-maintain architecture for stateful set containers, which relies on an "agent matrix" to map operator and agent versions which led to a sheer amount of images.
  • We solve this by shifting to a 3-container setup. This new design eliminates the need for the operator-version/agent-version matrix by adding one additional container containing all required binaries. This architecture maps to what we already do with the mongodb-database container.

Other Changes

  • Optional permissions for PersistentVolumeClaim moved to a separate role. When managing the operator with Helm it is possible to disable permissions for PersistentVolumeClaim resources by setting operator.enablePVCResize value to false (true by default). When enabled, previously these permissions were part of the primary operator role. With this change, permissions have a separate role.
  • subresourceEnabled Helm value was removed. This setting used to be true by default and made it possible to exclude subresource permissions from the operator role by specifying false as the value. We are removing this configuration option, making the operator roles always have subresource permissions. This setting was introduced as a temporary solution for this OpenShift issue. The issue has since been resolved and the setting is no longer needed.

@MaciejKaras MaciejKaras added the skip-changelog Use this label in Pull Request to not require new changelog entry file label Aug 8, 2025
@MaciejKaras MaciejKaras changed the title Quick fix for Dockerfile conflict with sonar Quick fix for Dockerfile conflict with sonar + agent and tools missing distros propagation Aug 8, 2025
@MaciejKaras MaciejKaras changed the title Quick fix for Dockerfile conflict with sonar + agent and tools missing distros propagation Fix for Dockerfile conflict with sonar + agent and tools missing distros propagation Aug 8, 2025
@MaciejKaras MaciejKaras marked this pull request as ready for review August 11, 2025 08:21
@MaciejKaras MaciejKaras requested a review from a team as a code owner August 11, 2025 08:21
@codeowners-service-app codeowners-service-app
Copy link

Assigned viveksinghggits for team kubernetes-hosted because fealebenpae is out of office.

@nammn nammn self-requested a review August 11, 2025 08:24
@MaciejKaras MaciejKaras requested review from mircea-cosbuc and Julien-Ben and removed request for fealebenpae August 11, 2025 08:34
Julien-Ben
Julien-Ben approved these changes Aug 11, 2025
View reviewed changes
Copy link
Collaborator

@Julien-Ben Julien-Ben left a comment

Choose a reason for hiding this comment

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

LGTM
I added a followup in https://jira.mongodb.org/browse/CLOUDP-335471
To rename Dockerfile.atomic -> Dockerfile, after we remove Sonar

@MaciejKaras MaciejKaras merged commit 1bf761b into master Aug 11, 2025
34 of 38 checks passed
@MaciejKaras MaciejKaras deleted the maciejk/master-fix branch August 11, 2025 08:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nammn nammn nammn approved these changes

@Julien-Ben Julien-Ben Julien-Ben approved these changes

@lucian-tosa lucian-tosa Awaiting requested review from lucian-tosa lucian-tosa is a code owner automatically assigned from mongodb/kubernetes-hosted

@viveksinghggits viveksinghggits Awaiting requested review from viveksinghggits

@mircea-cosbuc mircea-cosbuc Awaiting requested review from mircea-cosbuc

Assignees
No one assigned
Labels
skip-changelog Use this label in Pull Request to not require new changelog entry file
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@MaciejKaras @nammn @Julien-Ben