Skip to content

disable in-place updates for dev variants #4765

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

Open
bcressey wants to merge 2 commits into
base: develop
Choose a base branch
from
+54 −33
Open

disable in-place updates for dev variants #4765

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
9286368
defaults: split out update-related defaults
bcressey Dec 5, 2025
250b0ca
*-dev: disable in-place-updates
bcressey Dec 5, 2025
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
1 change: 0 additions & 1 deletion sources/settings-defaults/aws-dev/defaults.d/15-aws-tuf.toml
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions sources/settings-defaults/aws-ecs-2-nvidia/defaults.d/11-updates.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/updates.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-ecs-2/defaults.d/11-updates.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/updates.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-ecs-3-nvidia/defaults.d/11-updates.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/updates.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-ecs-3/defaults.d/11-updates.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/updates.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-k8s-1.31-nvidia/defaults.d/11-updates.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/updates.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-k8s-1.31/defaults.d/11-updates.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/updates.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-k8s-1.32-nvidia/defaults.d/11-updates.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/updates.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-k8s-1.32/defaults.d/11-updates.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/updates.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-k8s-1.33-nvidia/defaults.d/11-updates.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/updates.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-k8s-1.33/defaults.d/11-updates.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/updates.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-k8s-1.34-nvidia/defaults.d/11-updates.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/updates.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-k8s-1.34/defaults.d/11-updates.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/updates.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-k8s-1.35-nvidia/defaults.d/11-updates.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/updates.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/aws-k8s-1.35/defaults.d/11-updates.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/updates.toml
1 change: 0 additions & 1 deletion sources/settings-defaults/metal-dev/defaults.d/15-public-tuf.toml
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions sources/settings-defaults/metal-k8s-1.30/defaults.d/11-updates.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/updates.toml
1 change: 0 additions & 1 deletion sources/settings-defaults/vmware-dev/defaults.d/15-public-tuf.toml
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions sources/settings-defaults/vmware-k8s-1.32/defaults.d/11-updates.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/updates.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/vmware-k8s-1.33/defaults.d/11-updates.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/updates.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/vmware-k8s-1.34/defaults.d/11-updates.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/updates.toml
1 change: 1 addition & 0 deletions sources/settings-defaults/vmware-k8s-1.35/defaults.d/11-updates.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../shared-defaults/updates.toml
1 change: 0 additions & 1 deletion sources/settings-plugins/aws-dev/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ use bottlerocket_settings_plugin::SettingsPlugin;
#[model(rename = "settings", impl_default = true)]
struct AwsDevSettings {
motd: bottlerocket_settings_models::MotdV1,
updates: bottlerocket_settings_models::UpdatesSettingsV1,
host_containers: bottlerocket_settings_models::HostContainersSettingsV1,
bootstrap_commands: bottlerocket_settings_models::BootstrapCommandsSettingsV1,
bootstrap_containers: bottlerocket_settings_models::BootstrapContainersSettingsV1,
Expand Down
1 change: 0 additions & 1 deletion sources/settings-plugins/metal-dev/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ use bottlerocket_settings_plugin::SettingsPlugin;
#[model(rename = "settings", impl_default = true)]
struct MetalDevSettings {
motd: bottlerocket_settings_models::MotdV1,
updates: bottlerocket_settings_models::UpdatesSettingsV1,
host_containers: bottlerocket_settings_models::HostContainersSettingsV1,
bootstrap_commands: bottlerocket_settings_models::BootstrapCommandsSettingsV1,
bootstrap_containers: bottlerocket_settings_models::BootstrapContainersSettingsV1,
Expand Down
1 change: 0 additions & 1 deletion sources/settings-plugins/vmware-dev/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ use bottlerocket_settings_plugin::SettingsPlugin;
#[model(rename = "settings", impl_default = true)]
struct VmwareDevSettings {
motd: bottlerocket_settings_models::MotdV1,
updates: bottlerocket_settings_models::UpdatesSettingsV1,
host_containers: bottlerocket_settings_models::HostContainersSettingsV1,
bootstrap_commands: bottlerocket_settings_models::BootstrapCommandsSettingsV1,
bootstrap_containers: bottlerocket_settings_models::BootstrapContainersSettingsV1,
Expand Down
28 changes: 1 addition & 27 deletions sources/shared-defaults/defaults.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,32 +40,6 @@ affected-services = ["containerd"]
configuration-files = ["proxy-env"]
restart-commands = ["/bin/systemctl try-restart host-containerd.service"]

# Updates.

[settings.updates]
version-lock = "latest"
ignore-waves = false

[services.thar-be-updates]
configuration-files = ["thar-be-updates-toml"]
restart-commands = []

[services.updog]
configuration-files = ["updog-toml"]
restart-commands = []

[configuration-files.thar-be-updates-toml]
path = "/etc/thar-be-updates.toml"
template-path = "/usr/share/templates/thar-be-updates-toml"

[configuration-files.updog-toml]
path = "/etc/updog.toml"
template-path = "/usr/share/templates/updog-toml"

[metadata.settings.updates]
affected-services = ["updog", "thar-be-updates"]
seed.setting-generator = "bork seed"

# HostContainers

[services.host-containers]
Expand All @@ -90,7 +64,7 @@ path = "/etc/network/proxy.env"
template-path = "/usr/share/templates/proxy-env"

[metadata.settings.network]
affected-services = ["containerd", "host-containerd", "host-containers", "updog"]
affected-services = ["containerd", "host-containerd", "host-containers"]

[metadata.settings.network.hostname]
affected-services = ["hostname", "hosts"]
Expand Down
31 changes: 31 additions & 0 deletions sources/shared-defaults/updates.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# Updates settings.

[settings.updates]
version-lock = "latest"
ignore-waves = false

[services.thar-be-updates]
configuration-files = ["thar-be-updates-toml"]
restart-commands = []

[services.updog]
configuration-files = ["updog-toml"]
restart-commands = []

[configuration-files.thar-be-updates-toml]
path = "/etc/thar-be-updates.toml"
template-path = "/usr/share/templates/thar-be-updates-toml"

[configuration-files.updog-toml]
path = "/etc/updog.toml"
template-path = "/usr/share/templates/updog-toml"

[metadata.settings.updates]
affected-services = ["updog", "thar-be-updates"]
seed.setting-generator = "bork seed"

# Updog config has proxy servers and needs to be regenerated if those network
# settings change.

[metadata.settings.network]
affected-services = ["containerd", "host-containerd", "host-containers", "updog"]
1 change: 1 addition & 0 deletions variants/aws-dev/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ systemd-networkd = true
erofs-root-partition = true
external-kmod-development = false
encrypted-storage = true
in-place-updates = false

[package.metadata.build-variant]
kernel-parameters = [
Expand Down
1 change: 1 addition & 0 deletions variants/metal-dev/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ xfs-data-partition = true
erofs-root-partition = true
uefi-secure-boot = true
systemd-networkd = true
in-place-updates = false

[package.metadata.build-variant]
image-format = "raw"
Expand Down
1 change: 1 addition & 0 deletions variants/vmware-dev/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ systemd-networkd = true
erofs-root-partition = true
external-kmod-development = false
encrypted-storage = true
in-place-updates = false

[package.metadata.build-variant]
image-format = "vmdk"
Expand Down