Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: crate-ci/typos@9d890159570d5018df91fedfa40b4730cd4a81b1 # v1.28.4
- uses: crate-ci/typos@b1ae8d918b6e85bd611117d3d9a3be4f903ee5e4 # v1.33.1
with:
config: .typos.toml

Expand Down
1 change: 1 addition & 0 deletions .typos.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ extend-ignore-re = [
"ClosID",
"stopp",
"f0ZSIOvlD7vv5lOifRFivd680XjxIATWqwJARJ35QFUl9DiRuhPnDYok8Cj9PT8A",
"CONTAINER_INCLUDED_POD_METRCIS",
]

[type.sh]
Expand Down
11 changes: 7 additions & 4 deletions internal/criocli/criocli.go
Original file line number Diff line number Diff line change
Expand Up @@ -1325,10 +1325,13 @@ func getCrioFlags(defConf *libconfig.Config) []cli.Flag {
EnvVars: []string{"COLLECTION_PERIOD"},
},
&cli.StringSliceFlag{
Name: "included-pod-metrics",
Usage: "A list of pod metrics to include. Specify the names of the metrics to include in this list.",
EnvVars: []string{"CONTAINER_INCLUDED_POD_METRCIS"},
Value: cli.NewStringSlice(defConf.IncludedPodMetrics...),
Name: "included-pod-metrics",
Usage: "A list of pod metrics to include. Specify the names of the metrics to include in this list.",
EnvVars: []string{
"CONTAINER_INCLUDED_POD_METRCIS", // TODO: This typo'ed variable is deprecated and can be removed in a future release.
"CONTAINER_INCLUDED_POD_METRICS",
},
Value: cli.NewStringSlice(defConf.IncludedPodMetrics...),
},
&cli.BoolFlag{
Name: "enable-criu-support",
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/reload.go
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@
}

if err := c.ValidateRuntimes(); err != nil {
return fmt.Errorf("unabled to reload runtimes: %w", err)
return fmt.Errorf("unable to reload runtimes: %w", err)

Check warning on line 331 in pkg/config/reload.go

View check run for this annotation

Codecov / codecov/patch

pkg/config/reload.go#L331

Added line #L331 was not covered by tests
}

return nil
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/template.go
Original file line number Diff line number Diff line change
Expand Up @@ -1287,7 +1287,7 @@ const templateStringCrioRuntimeRuntimesRuntimeHandler = `# The "crio.runtime.run
# Replaces deprecated option "conmon_cgroup".
# - monitor_exec_cgroup (optional, string): If set to "container", indicates exec probes
# should be moved to the container's cgroup
# - monitor_env (optional, array of strings): Environment variables to pass to the montior.
# - monitor_env (optional, array of strings): Environment variables to pass to the monitor.
# Replaces deprecated option "conmon_env".
# - platform_runtime_paths (optional, map): A mapping of platforms to the corresponding
# runtime executable paths for the runtime handler.
Expand Down
2 changes: 1 addition & 1 deletion scripts/release-notes/release_notes.go
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ To verify the bill of materials (SBOM) in [SPDX](https://spdx.org) format using
bundleVersion, bundleVersion, bundleVersion,
startTag,
); err != nil {
return fmt.Errorf("writing tmplate to file: %w", err)
return fmt.Errorf("writing template to file: %w", err)
}

logrus.Infof("Generating release notes")
Expand Down
Loading