Skip to content

daemon: strongly type containerd log.OutputFormat#46525

Merged
thaJeztah merged 1 commit intomoby:masterfrom
thaJeztah:daemon_typed_logformat
Sep 21, 2023
Merged

daemon: strongly type containerd log.OutputFormat#46525
thaJeztah merged 1 commit intomoby:masterfrom
thaJeztah:daemon_typed_logformat

Conversation

@thaJeztah
Copy link
Member

For context: in #46489 I didn't want to change the type of CommonConfig.LogFormat (daemon/config/config.go). And in #45966 (comment) I suggested to move this to a separate PR; both for visibility and for discussion (whether we want our daemon's Config struct to have a direct dependency on containerd/log's types.

This type was introduced in
containerd/containerd@0a79e67

- A picture of a cute animal (not mandatory but encouraged)

@thaJeztah thaJeztah added this to the 25.0.0 milestone Sep 21, 2023
@neersighted neersighted changed the title daemon: update for typed containerd log.OutputFormat daemon: strongly type log.OutputFormat Sep 21, 2023
This type was introduced in
containerd/containerd@0a79e67

Make use of it throughout our log-format handling code, and convert back
to a string before we pass it to the containerd client.

Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
@neersighted neersighted changed the title daemon: strongly type log.OutputFormat daemon: strongly type containerd log.OutputFormat Sep 21, 2023
@neersighted neersighted force-pushed the daemon_typed_logformat branch from 25b4b52 to 0e80073 Compare September 21, 2023 11:41
@thaJeztah
Copy link
Member Author

FWIW, I'm good with this change, but not strongly attached either way; leaving the opportunity for @corhere to give his 👍 or 👎

(don't think this change is time sensitive either, so no rush)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants