vendor latest c/common

Includes the healthcheck_events field.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
2024-04-19 17:28:30 +02:00
parent b026e1d635
commit 33def2eea7
7 changed files with 30 additions and 6 deletions

View File

@ -253,8 +253,6 @@ type EngineConfig struct {
// and "systemd".
CgroupManager string `toml:"cgroup_manager,omitempty"`
// NOTE: when changing this struct, make sure to update (*Config).Merge().
// ConmonEnvVars are environment variables to pass to the Conmon binary
// when it is launched.
ConmonEnvVars attributedstring.Slice `toml:"conmon_env_vars,omitempty"`
@ -320,6 +318,13 @@ type EngineConfig struct {
// graphRoot internal stores the location of the graphroot
graphRoot string
// HealthcheckEvents is set to indicate whenever podman should log healthcheck events.
// With many running healthcheck on short interval Podman will spam the event log a lot.
// Because this event is optional and only useful to external consumers that may want to
// know when a healthcheck is run or failed allow users to turn it off by setting it to false.
// Default is true.
HealthcheckEvents bool `toml:"healthcheck_events,omitempty"`
// HelperBinariesDir is a list of directories which are used to search for
// helper binaries.
HelperBinariesDir attributedstring.Slice `toml:"helper_binaries_dir,omitempty"`

View File

@ -529,6 +529,15 @@ default_sysctls = [
# with detailed information about the container.
#events_container_create_inspect_data = false
# Whenever Podman should log healthcheck events.
# With many running healthcheck on short interval Podman will spam the event
# log a lot as it generates a event for each single healthcheck run. Because
# this event is optional and only useful to external consumers that may want
# to know when a healthcheck is run or failed allow users to turn it off by
# setting it to false. The default is true.
#
#healthcheck_events = true
# A is a list of directories which are used to search for helper binaries.
#
#helper_binaries_dir = [

View File

@ -399,6 +399,15 @@ default_sysctls = [
#
#events_logger = "file"
# Whenever Podman should log healthcheck events.
# With many running healthcheck on short interval Podman will spam the event
# log a lot as it generates a event for each single healthcheck run. Because
# this event is optional and only useful to external consumers that may want
# to know when a healthcheck is run or failed allow users to turn it off by
# setting it to false. The default is true.
#
#healthcheck_events = true
# A is a list of directories which are used to search for helper binaries.
#
#helper_binaries_dir = [

View File

@ -344,6 +344,7 @@ func defaultEngineConfig() (*EngineConfig, error) {
c.VolumePluginTimeout = DefaultVolumePluginTimeout
c.CompressionFormat = "gzip"
c.HealthcheckEvents = true
c.HelperBinariesDir.Set(defaultHelperBinariesDir)
if additionalHelperBinariesDir != "" {
// Prioritize additionalHelperBinariesDir over defaults.