Skip to content

Commit c2bed72

Browse files
committed
migrations: add the memory-swap-behavior k8s setting
1 parent b10787f commit c2bed72

File tree

5 files changed

+41
-0
lines changed

5 files changed

+41
-0
lines changed

Release.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -426,4 +426,5 @@ version = "1.42.0"
426426
"migrate_v1.41.0_kubernetes-ecr-credential-providers-correction.lz4",
427427
]
428428
"(1.41.0, 1.42.0)" = [
429+
"migrate_v1.42.0_kubernetes-memory-swap-behavior-setting.lz4",
429430
]

sources/Cargo.lock

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sources/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ members = [
3737
"settings-migrations/v1.39.0/kubelet-setting-container-log-single-process-oom-kill",
3838
"settings-migrations/v1.40.0/kubelet-device-plugins-cdi-settings",
3939
"settings-migrations/v1.41.0/kubernetes-ecr-credential-providers-correction",
40+
"settings-migrations/v1.42.0/kubernetes-memory-swap-behavior-setting",
4041

4142
"settings-plugins/aws-dev",
4243
"settings-plugins/aws-ecs-1",
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
[package]
2+
name = "kubernetes-memory-swap-behavior-setting"
3+
version = "0.1.0"
4+
authors = ["Jan Teske <[email protected]>"]
5+
license = "Apache-2.0 OR MIT"
6+
edition = "2021"
7+
publish = false
8+
# Don't rebuild crate just because of changes to README.
9+
exclude = ["README.md"]
10+
11+
[dependencies]
12+
migration-helpers.workspace = true
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
use migration_helpers::common_migrations::AddSettingsMigration;
2+
use migration_helpers::{migrate, Result};
3+
use std::process;
4+
5+
// We added a new kubernetes setting controlling the memory swap behavior.
6+
fn run() -> Result<()> {
7+
migrate(AddSettingsMigration(&[
8+
"settings.kubernetes.memory-swap-behavior",
9+
]))
10+
}
11+
12+
// Returning a Result from main makes it print a Debug representation of the error, but with Snafu
13+
// we have nice Display representations of the error, so we wrap "main" (run) and print any error.
14+
// https://github.com/shepmaster/snafu/issues/110
15+
fn main() {
16+
if let Err(e) = run() {
17+
eprintln!("{}", e);
18+
process::exit(1);
19+
}
20+
}

0 commit comments

Comments
 (0)