Skip to content
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.

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

host-containers: update admin to v0.7.3, update control to v0.5.3 #1852

Merged
merged 2 commits into from
Dec 2, 2021
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
4 changes: 4 additions & 0 deletions Release.toml
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,7 @@ version = "1.4.1"
"migrate_v1.4.0_registry-mirror-representation.lz4",
]
"(1.4.0, 1.4.1)" = []
"(1.4.1, 1.4.2)" = [
"migrate_v1.4.2_admin-container-v0-7-3.lz4",
"migrate_v1.4.2_control-container-v0-5-3.lz4",
]
14 changes: 14 additions & 0 deletions sources/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions sources/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ members = [
"api/migration/migrations/v1.3.0/hostname-affects-etc-hosts",
"api/migration/migrations/v1.3.0/control-container-v0-5-2",
"api/migration/migrations/v1.4.0/registry-mirror-representation",
"api/migration/migrations/v1.4.2/admin-container-v0-7-3",
"api/migration/migrations/v1.4.2/control-container-v0-5-3",

"bottlerocket-release",

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[package]
name = "admin-container-v0-7-3"
version = "0.1.0"
authors = ["Erikson Tung <[email protected]>"]
license = "Apache-2.0 OR MIT"
edition = "2018"
publish = false
# Don't rebuild crate just because of changes to README.
exclude = ["README.md"]

[dependencies]
migration-helpers = { path = "../../../migration-helpers", version = "0.1.0"}
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
#![deny(rust_2018_idioms)]

use migration_helpers::common_migrations::ReplaceTemplateMigration;
use migration_helpers::{migrate, Result};
use std::process;

const OLD_ADMIN_CTR_TEMPLATE: &str =
"{{ ecr-prefix settings.aws.region }}/bottlerocket-admin:v0.7.2";
const NEW_ADMIN_CTR_TEMPLATE: &str =
"{{ ecr-prefix settings.aws.region }}/bottlerocket-admin:v0.7.3";

/// We bumped the version of the default admin container from v0.7.2 to v0.7.3
fn run() -> Result<()> {
migrate(ReplaceTemplateMigration {
setting: "settings.host-containers.admin.source",
old_template: OLD_ADMIN_CTR_TEMPLATE,
new_template: NEW_ADMIN_CTR_TEMPLATE,
})
}

// Returning a Result from main makes it print a Debug representation of the error, but with Snafu
// we have nice Display representations of the error, so we wrap "main" (run) and print any error.
// https://github.com/shepmaster/snafu/issues/110
fn main() {
if let Err(e) = run() {
eprintln!("{}", e);
process::exit(1);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[package]
name = "control-container-v0-5-3"
version = "0.1.0"
authors = ["Erikson Tung <[email protected]>"]
license = "Apache-2.0 OR MIT"
edition = "2018"
publish = false
# Don't rebuild crate just because of changes to README.
exclude = ["README.md"]

[dependencies]
migration-helpers = { path = "../../../migration-helpers", version = "0.1.0"}
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
#![deny(rust_2018_idioms)]

use migration_helpers::common_migrations::ReplaceTemplateMigration;
use migration_helpers::{migrate, Result};
use std::process;

const OLD_CONTROL_CTR_TEMPLATE: &str =
"{{ ecr-prefix settings.aws.region }}/bottlerocket-control:v0.5.2";
const NEW_CONTROL_CTR_TEMPLATE: &str =
"{{ ecr-prefix settings.aws.region }}/bottlerocket-control:v0.5.3";

/// We bumped the version of the default control container from v0.5.2 to v0.5.3
fn run() -> Result<()> {
migrate(ReplaceTemplateMigration {
setting: "settings.host-containers.control.source",
old_template: OLD_CONTROL_CTR_TEMPLATE,
new_template: NEW_CONTROL_CTR_TEMPLATE,
})
}

// Returning a Result from main makes it print a Debug representation of the error, but with Snafu
// we have nice Display representations of the error, so we wrap "main" (run) and print any error.
// https://github.com/shepmaster/snafu/issues/110
fn main() {
if let Err(e) = run() {
eprintln!("{}", e);
process::exit(1);
}
}
4 changes: 2 additions & 2 deletions sources/models/shared-defaults/aws-host-containers.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ superpowered = true

[metadata.settings.host-containers.admin.source]
setting-generator = "schnauzer settings.host-containers.admin.source"
template = "{{ ecr-prefix settings.aws.region }}/bottlerocket-admin:v0.7.2"
template = "{{ ecr-prefix settings.aws.region }}/bottlerocket-admin:v0.7.3"

[metadata.settings.host-containers.admin.user-data]
setting-generator = "shibaken"
Expand All @@ -15,4 +15,4 @@ superpowered = false

[metadata.settings.host-containers.control.source]
setting-generator = "schnauzer settings.host-containers.control.source"
template = "{{ ecr-prefix settings.aws.region }}/bottlerocket-control:v0.5.2"
template = "{{ ecr-prefix settings.aws.region }}/bottlerocket-control:v0.5.3"