Skip to content

Add fields for TLS material to destination config#340

Merged
mtrmac merged 2 commits into
podman-container-tools:mainfrom
meln5674:feature/remote-tls
Sep 25, 2025
Merged

Add fields for TLS material to destination config#340
mtrmac merged 2 commits into
podman-container-tools:mainfrom
meln5674:feature/remote-tls

Conversation

@meln5674
Copy link
Copy Markdown
Contributor

Adds optional fields tls_cert_file, tls_key_file, and tls_cafile to the configuration TOML to support connecting to TLS and mTLS podman API sockets.

This is in support of podman-container-tools/podman#24601 to fix podman-container-tools/podman#24583 .

This PR is a carry-over from containers/common#2249

(Resuming from containers/common#2249)

Signed-off-by: Andrew Melnick <meln5674.5674@gmail.com>
@github-actions github-actions Bot added the common Related to "common" package label Sep 12, 2025
@mtrmac
Copy link
Copy Markdown
Contributor

mtrmac commented Sep 12, 2025

Cc: @ashley-cui , I’m not sure where the review conversations should be happening.

@ashley-cui
Copy link
Copy Markdown
Contributor

ashley-cui commented Sep 12, 2025

LGTM, waiting on the Podman PR to pass.

@ashley-cui
Copy link
Copy Markdown
Contributor

LGTM

@containers/container-libs-maintainers PTAL and merge

Copy link
Copy Markdown
Contributor

@ashley-cui ashley-cui left a comment

Choose a reason for hiding this comment

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

Last comment, apologies.

Comment thread common/pkg/config/config.go Outdated
Comment on lines +711 to +715
TLSCertFile string `json:",omitempty" toml:"tls_cert_file,omitempty"`
// Path to TLS client certificate private key PEM file, optional
TLSKeyFile string `json:",omitempty" toml:"tls_key_file,omitempty"`
// Path to TLS certificate authority PEM file, optional
TLSCAFile string `json:",omitempty" toml:"tls_ca_file,omitempty"`
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Sorry, one last nit, can we change these to just TLSCert TLSKey TLSCA? The file part seems redundant and changing them would match the flags in podman.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Done

Comment thread common/docs/containers.conf.5.md Outdated

Path to file containing ssh identity key

**tls_cert_file="/path/to/certs/podman/tls.crt"**
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Same for here.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Done

Signed-off-by: Andrew Melnick <meln5674.5674@gmail.com>
@packit-as-a-service
Copy link
Copy Markdown

Packit jobs failed. @containers/packit-build please check.

Copy link
Copy Markdown
Contributor

@mtrmac mtrmac left a comment

Choose a reason for hiding this comment

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

Merging based on @ashley-cui ’s approval.

@mtrmac mtrmac merged commit 4cf0ff7 into podman-container-tools:main Sep 25, 2025
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

common Related to "common" package

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Support (m)TLS API socket

3 participants