Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Allow runtime configs to be updated completely #6248

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.

Sign up for GitHub

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

Merged
openshift-merge-robot merged 2 commits into from
Oct 4, 2022
Merged

Allow runtime configs to be updated completely #6248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d20c76
Allow complete Runtimes config to change
elezar Sep 22, 2022
32e6520
Update config readme
elezar Sep 22, 2022
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 docs/crio.conf.5.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ the container runtime configuration.
Enable CRIU integration, requires that the criu binary is available in $PATH. (default: false)

### CRIO.RUNTIME.RUNTIMES TABLE
The "crio.runtime.runtimes" table defines a list of OCI compatible runtimes. The runtime to use is picked based on the runtime handler provided by the CRI. If no runtime handler is provided, the runtime will be picked based on the level of trust of the workload. This option supports live configuration reload. Note that on reload runtimes can only be added to this table but not modified or removed.
The "crio.runtime.runtimes" table defines a list of OCI compatible runtimes. The runtime to use is picked based on the runtime handler provided by the CRI. If no runtime handler is provided, the runtime will be picked based on the level of trust of the workload. This option supports live configuration reload. This option supports live configuration reload.

**runtime_path**=""
Path to the OCI compatible runtime used for this runtime handler.
Expand Down
10 changes: 3 additions & 7 deletions pkg/config/reload.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,13 +244,9 @@ func (c *Config) ReloadRdtConfig(newConfig *Config) error {
// ReloadRuntimes reloads the runtimes configuration if changed
func (c *Config) ReloadRuntimes(newConfig *Config) error {
var updated bool
for runtime := range newConfig.Runtimes {
if _, ok := c.Runtimes[runtime]; ok {
logrus.Warnf("Skipping existing runtime %q", runtime)
continue
}
c.Runtimes[runtime] = newConfig.Runtimes[runtime]
logrus.Infof("Registered new runtime %q", runtime)
if !RuntimesEqual(c.Runtimes, newConfig.Runtimes) {
logrus.Infof("Updating runtime configuration")
c.Runtimes = newConfig.Runtimes
updated = true
}

Expand Down
15 changes: 9 additions & 6 deletions pkg/config/reload_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,7 @@ var _ = t.Describe("Config", func() {
RuntimePath: "/usr/bin/runc",
}
newConfig := &config.Config{}
newConfig.Runtimes = sut.Runtimes
newConfig.DefaultRuntime = "existing"

// When
Expand All @@ -383,26 +384,28 @@ var _ = t.Describe("Config", func() {
Expect(sut.DefaultRuntime).To(Equal("existing"))
})

It("should not add existing runtime", func() {
It("should overwrite existing runtime", func() {
// Given
existingRuntime := &config.RuntimeHandler{
RuntimePath: "/usr/bin/runc",
}
sut.Runtimes["existing"] = existingRuntime
newConfig := &config.Config{}
newConfig.Runtimes = make(config.Runtimes)
newConfig.Runtimes["existing"] = &config.RuntimeHandler{

newRuntime := &config.RuntimeHandler{
RuntimePath: "/usr/bin/runc",
PrivilegedWithoutHostDevices: true,
}
newConfig := &config.Config{}
newConfig.Runtimes = make(config.Runtimes)
newConfig.Runtimes["existing"] = newRuntime

// When
err := sut.ReloadRuntimes(newConfig)

// Then
Expect(err).To(BeNil())
Expect(sut.Runtimes).To(HaveKeyWithValue("existing", existingRuntime))
Expect(sut.Runtimes["existing"].PrivilegedWithoutHostDevices).To(BeFalse())
Expect(sut.Runtimes).To(HaveKeyWithValue("existing", newRuntime))
Expect(sut.Runtimes["existing"].PrivilegedWithoutHostDevices).To(BeTrue())
})
})
})
2 changes: 1 addition & 1 deletion test/reload_config.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,5 +228,5 @@ EOF
reload_crio

#then
wait_for_log '"registered new runtime \\"new\\""'
wait_for_log '"updating runtime configuration"'
}