Skip to content
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

[CI:DOCS] Pass secrets from the host down to internal podman containers #5154

Merged
merged 1 commit into from Nov 17, 2023

Conversation

rhatdan
Copy link
Member

@rhatdan rhatdan commented Nov 11, 2023

What type of PR is this?

/kind api-change
/kind bug
/kind cleanup
/kind deprecation
/kind design
/kind documentation
/kind failing-test
/kind feature
/kind flake
/kind other

What this PR does / why we need it:

How to verify it

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Subscriptions from the host now pass through to internal containers on contrib buildah images.

@TomSweeneyRedHat
Copy link
Member

The commit messages don't jive with the description. Did you mean to glom all this together here?

@rhatdan rhatdan changed the title Subscriptions [CI:DOCS] Pass secrets from the host down to internal podman containers Nov 12, 2023
@rhatdan
Copy link
Member Author

rhatdan commented Nov 12, 2023

Nope

Copy link
Collaborator

@flouthoc flouthoc left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

openshift-ci bot commented Nov 13, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: flouthoc, rhatdan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@flouthoc
Copy link
Collaborator

PR mentions this as [CI:DOCS] however this is changing the buildah image so [CI:DOCS] tag looks incorrect.

@rhatdan
Copy link
Member Author

rhatdan commented Nov 13, 2023

I don't believe there are any tests that test the buildahimages so I treated it as a Docs update, to save the planet.

This change will allow RHEL subscriptions from the host to flow to internal containers.

Fixes: containers/common#1735

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
@rhatdan
Copy link
Member Author

rhatdan commented Nov 13, 2023

@Luap99 PTAL

@@ -65,6 +65,9 @@ RUN dnf -y makecache && \

ADD ./containers.conf /etc/containers/

# Setup internal Buildah to pass secrets/subscriptions down from host to internal container
RUN printf '/run/secrets/etc-pki-entitlement:/run/secrets/etc-pki-entitlement\n/run/secrets/rhsm:/run/secrets/rhsm\n' > /etc/containers/mounts.conf
Copy link
Collaborator

Choose a reason for hiding this comment

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

Not a blocker, but is there any reason for doing it this way instead of creating a mounts.conf file in this subdirectory and adding it to the ADD on line 66?

Copy link
Member Author

Choose a reason for hiding this comment

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

Nope, but not sure that would be much better.

@TomSweeneyRedHat
Copy link
Member

LGTM
I'll let @Luap99 push the merge button.

@rhatdan rhatdan added the lgtm label Nov 17, 2023
@rhatdan rhatdan merged commit 8dc66bb into containers:main Nov 17, 2023
21 checks passed
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 16, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants